From b5179d989fa5fae28d9cc6ec0c3316f77fb53e6f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 4 Aug 2023 10:54:33 -0700 Subject: [PATCH] fix importUsed --- d2js/js.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/d2js/js.go b/d2js/js.go index 4f8bd024c..0f64cc950 100644 --- a/d2js/js.go +++ b/d2js/js.go @@ -38,7 +38,7 @@ func jsGetObjOrder(this js.Value, args []js.Value) interface{} { dsl := args[0].String() g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ - UTF16: true, + UTF16Pos: true, }) if err != nil { ret := jsObjOrder{Error: err.Error()} @@ -79,7 +79,7 @@ func jsGetRefRanges(this js.Value, args []js.Value) interface{} { } g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ - UTF16: true, + UTF16Pos: true, }) var pe *d2parser.ParseError if err != nil { @@ -159,7 +159,7 @@ type detectFS struct { importUsed bool } -func (detectFS detectFS) Open(name string) (fs.File, error) { +func (detectFS *detectFS) Open(name string) (fs.File, error) { detectFS.importUsed = true return &emptyFile{}, nil } @@ -171,8 +171,8 @@ func jsParse(this js.Value, args []js.Value) interface{} { detectFS := detectFS{} g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ - UTF16: true, - FS: detectFS, + UTF16Pos: true, + FS: &detectFS, }) // If an import was used, client side D2 cannot reliably compile // Defer to backend compilation @@ -228,7 +228,7 @@ func jsCompile(this js.Value, args []js.Value) interface{} { script := args[0].String() g, _, err := d2compiler.Compile("", strings.NewReader(script), &d2compiler.CompileOptions{ - UTF16: true, + UTF16Pos: true, }) var pe *d2parser.ParseError if err != nil {