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

fix importUsed

Browse source
This commit is contained in:
Alexander Wang 2023-08-04 10:54:33 -07:00
parent 087bb5639d
commit b5179d989f
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
d2js/js.go
View file

@ -38,7 +38,7 @@ 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, UTF16Pos: true,
}) })
if err != nil { if err != nil {
ret := jsObjOrder{Error: err.Error()} 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{ g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{
UTF16: true, UTF16Pos: true,
}) })
var pe *d2parser.ParseError var pe *d2parser.ParseError
if err != nil { if err != nil {
@ -159,7 +159,7 @@ type detectFS struct {
importUsed bool importUsed bool
} }
func (detectFS detectFS) Open(name string) (fs.File, error) { func (detectFS *detectFS) Open(name string) (fs.File, error) {
detectFS.importUsed = true detectFS.importUsed = true
return &emptyFile{}, nil return &emptyFile{}, nil
} }
@ -171,8 +171,8 @@ 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, UTF16Pos: true,
FS: detectFS, FS: &detectFS,
}) })
// If an import was used, client side D2 cannot reliably compile // If an import was used, client side D2 cannot reliably compile
// Defer to backend compilation // Defer to backend compilation
@ -228,7 +228,7 @@ 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, UTF16Pos: true,
}) })
var pe *d2parser.ParseError var pe *d2parser.ParseError
if err != nil { if err != nil {