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

d2ir: Fix for windows

Browse source 
Closes #1388
This commit is contained in:
Anmol Sethi 2023-06-09 19:45:09 -07:00
parent dc1536e8fb
commit 1f891a3c9e
No known key found for this signature in database
GPG key ID: 8CEF1878FF10ADEB
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2compiler/compile.go
View file

@ -6,7 +6,6 @@ import (
"io"
"io/fs"
"net/url"
"os"
"strconv"
"strings"
@ -32,9 +31,6 @@ func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, e
if opts == nil {
opts = &CompileOptions{}
}
if opts.FS == nil {
opts.FS = os.DirFS("/")
}
ast, err := d2parser.Parse(p, r, &d2parser.ParseOptions{
UTF16: opts.UTF16,

25
d2ir/import.go
View file

@ -2,6 +2,7 @@ package d2ir
import (
"bufio"
"io/fs"
"os"
"path"
"strings"
@ -85,25 +86,13 @@ func (c *compiler) __import(imp *d2ast.Import) (*Map, bool) {
return ir, true
}
p := path.Clean(impPath)
if path.IsAbs(p) {
// Path cannot be absolute. DirFS does not accept absolute paths. We strip off the leading
// slash to make it relative to the root.
p = p[1:]
} else if c.fs == os.DirFS("/") {
wd, err := os.Getwd()
if err != nil {
c.errorf(imp, "failed to import %q: %v", impPath, err)
return nil, false
}
p = path.Join(wd, p)
// See above explanation.
if path.IsAbs(p) {
p = p[1:]
}
var f fs.File
var err error
if c.fs == nil {
f, err = os.Open(impPath)
} else {
f, err = c.fs.Open(impPath)
}
f, err := c.fs.Open(p)
if err != nil {
c.errorf(imp, "failed to import %q: %v", impPath, err)
return nil, false