luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile

Browse source
This commit is contained in:
Alexander Wang 2023-07-22 10:03:26 -07:00
parent 72790df1eb
commit 087bb5639d
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
d2js/js.go
View file

@ -37,7 +37,7 @@ type jsObjOrder struct {
func jsGetObjOrder(this js.Value, args []js.Value) interface{} { func jsGetObjOrder(this js.Value, args []js.Value) interface{} {
dsl := args[0].String() dsl := args[0].String()
g, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{
UTF16: true, UTF16: true,
}) })
if err != nil { if err != nil {
@ -46,8 +46,14 @@ func jsGetObjOrder(this js.Value, args []js.Value) interface{} {
return string(str) return string(str)
} }
objOrder, err := d2oracle.GetObjOrder(g, nil)
if err != nil {
ret := jsObjOrder{Error: err.Error()}
str, _ := json.Marshal(ret)
return string(str)
}
resp := jsObjOrder{ resp := jsObjOrder{
Order: d2oracle.GetObjOrder(g), Order: objOrder,
} }
str, _ := json.Marshal(resp) str, _ := json.Marshal(resp)
@ -72,7 +78,7 @@ func jsGetRefRanges(this js.Value, args []js.Value) interface{} {
return string(str) return string(str)
} }
g, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{
UTF16: true, UTF16: true,
}) })
var pe *d2parser.ParseError var pe *d2parser.ParseError
@ -91,7 +97,7 @@ func jsGetRefRanges(this js.Value, args []js.Value) interface{} {
var ranges []d2ast.Range var ranges []d2ast.Range
if len(mk.Edges) == 1 { if len(mk.Edges) == 1 {
edge := d2oracle.GetEdge(g, key) edge := d2oracle.GetEdge(g, nil, key)
if edge == nil { if edge == nil {
ret := jsRefRanges{D2Error: "edge not found"} ret := jsRefRanges{D2Error: "edge not found"}
str, _ := json.Marshal(ret) str, _ := json.Marshal(ret)
@ -102,7 +108,7 @@ func jsGetRefRanges(this js.Value, args []js.Value) interface{} {
ranges = append(ranges, ref.MapKey.Range) ranges = append(ranges, ref.MapKey.Range)
} }
} else { } else {
obj := d2oracle.GetObj(g, key) obj := d2oracle.GetObj(g, nil, key)
if obj == nil { if obj == nil {
ret := jsRefRanges{D2Error: "obj not found"} ret := jsRefRanges{D2Error: "obj not found"}
str, _ := json.Marshal(ret) str, _ := json.Marshal(ret)
@ -164,7 +170,7 @@ func jsParse(this js.Value, args []js.Value) interface{} {
detectFS := detectFS{} detectFS := detectFS{}
g, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{
UTF16: true, UTF16: true,
FS: detectFS, FS: detectFS,
}) })
@ -221,7 +227,7 @@ func jsParse(this js.Value, args []js.Value) interface{} {
func jsCompile(this js.Value, args []js.Value) interface{} { func jsCompile(this js.Value, args []js.Value) interface{} {
script := args[0].String() script := args[0].String()
g, err := d2compiler.Compile("", strings.NewReader(script), &d2compiler.CompileOptions{ g, _, err := d2compiler.Compile("", strings.NewReader(script), &d2compiler.CompileOptions{
UTF16: true, UTF16: true,
}) })
var pe *d2parser.ParseError var pe *d2parser.ParseError