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

update to latest

Browse source
This commit is contained in:
Alexander Wang 2024-10-19 00:09:04 -06:00
parent 47867fb858
commit 2b8c047b5b
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 8 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
d2js/js.go
View file

@ -25,7 +25,6 @@ func main() {
js.Global().Set("d2GetParentID", js.FuncOf(jsGetParentID)) js.Global().Set("d2GetParentID", js.FuncOf(jsGetParentID))
js.Global().Set("d2GetObjOrder", js.FuncOf(jsGetObjOrder)) js.Global().Set("d2GetObjOrder", js.FuncOf(jsGetObjOrder))
js.Global().Set("d2GetRefRanges", js.FuncOf(jsGetRefRanges)) js.Global().Set("d2GetRefRanges", js.FuncOf(jsGetRefRanges))
js.Global().Set("d2GetImportRanges", js.FuncOf(jsGetImportRanges))
js.Global().Set("d2Compile", js.FuncOf(jsCompile)) js.Global().Set("d2Compile", js.FuncOf(jsCompile))
js.Global().Set("d2Parse", js.FuncOf(jsParse)) js.Global().Set("d2Parse", js.FuncOf(jsParse))
js.Global().Set("d2Encode", js.FuncOf(jsEncode)) js.Global().Set("d2Encode", js.FuncOf(jsEncode))
@ -90,10 +89,11 @@ func jsGetParentID(this js.Value, args []js.Value) interface{} {
} }
type jsRefRanges struct { type jsRefRanges struct {
Ranges []d2ast.Range `json:"ranges"` Ranges []d2ast.Range `json:"ranges"`
ParseError string `json:"parseError"` ImportRanges []d2ast.Range `json:"importRanges"`
UserError string `json:"userError"` ParseError string `json:"parseError"`
D2Error string `json:"d2Error"` UserError string `json:"userError"`
D2Error string `json:"d2Error"`
} }
func jsGetRefRanges(this js.Value, args []js.Value) interface{} { func jsGetRefRanges(this js.Value, args []js.Value) interface{} {
@ -125,41 +125,7 @@ func jsGetRefRanges(this js.Value, args []js.Value) interface{} {
return string(str) return string(str)
} }
refs, err := d2lsp.GetRefs(file, fs, boardPath, key) ranges, importRanges, err := d2lsp.GetRefRanges(file, fs, boardPath, key)
if err != nil {
ret := jsRefRanges{D2Error: err.Error()}
str, _ := json.Marshal(ret)
return string(str)
}
var ranges []d2ast.Range
for _, ref := range refs {
ranges = append(ranges, ref.AST().GetRange())
}
resp := jsRefRanges{
Ranges: ranges,
}
str, _ := json.Marshal(resp)
return string(str)
}
func jsGetImportRanges(this js.Value, args []js.Value) interface{} {
fsRaw := args[0].String()
path := args[1].String()
importPath := args[2].String()
var fs map[string]string
err := json.Unmarshal([]byte(fsRaw), &fs)
if err != nil {
ret := jsRefRanges{D2Error: err.Error()}
str, _ := json.Marshal(ret)
return string(str)
}
ranges, err := d2lsp.GetImportRanges(path, fs, importPath)
if err != nil { if err != nil {
ret := jsRefRanges{D2Error: err.Error()} ret := jsRefRanges{D2Error: err.Error()}
str, _ := json.Marshal(ret) str, _ := json.Marshal(ret)
@ -167,7 +133,8 @@ func jsGetImportRanges(this js.Value, args []js.Value) interface{} {
} }
resp := jsRefRanges{ resp := jsRefRanges{
Ranges: ranges, Ranges: ranges,
ImportRanges: importRanges,
} }
str, _ := json.Marshal(resp) str, _ := json.Marshal(resp)