Merge pull request #1393 from nhooyr/import-fixes

Import fixes

d2compiler/compile.go

@@ -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,

d2format/format.go

@@ -216,6 +216,12 @@ func (p *printer) _import(i *d2ast.Import) {
 		p.sb.WriteString(pre)
 		p.sb.WriteRune('/')
 	}
+	if len(i.Path) > 0 {
+		i2 := *i
+		i2.Path = append([]*d2ast.StringBox{}, i.Path...)
+		i2.Path[0] = d2ast.RawStringBox(path.Clean(i.Path[0].Unbox().ScalarString()), true)
+		i = &i2
+	}
 	p.path(i.Path)
 }
 

d2format/format_test.go

@@ -649,6 +649,14 @@ x: @./file
 x: @../file
 `,
 			exp: `x: @../file
+`,
+		},
+		{
+			name: "import/4",
+			in: `
+x: @"x/../file"
+`,
+			exp: `x: @file
 `,
 		},
 	}

d2ir/import.go

@@ -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)
+	var f fs.File
-	if path.IsAbs(p) {
+	var err error
-		// Path cannot be absolute. DirFS does not accept absolute paths. We strip off the leading
+	if c.fs == nil {
-		// slash to make it relative to the root.
+		f, err = os.Open(impPath)
-		p = p[1:]
+	} else {
-	} else if c.fs == os.DirFS("/") {
+		f, err = c.fs.Open(impPath)
-		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:]
-		}
 	}
-
-	f, err := c.fs.Open(p)
 	if err != nil {
 		c.errorf(imp, "failed to import %q: %v", impPath, err)
 		return nil, false

d2parser/parse.go

@@ -1742,9 +1742,7 @@ func (p *parser) parseImport(spread bool) *d2ast.Import {
 	if k.Path[0].UnquotedString != nil && len(k.Path) > 1 && k.Path[1].UnquotedString != nil && k.Path[1].Unbox().ScalarString() == "d2" {
 		k.Path = append(k.Path[:1], k.Path[2:]...)
 	}
-	if k != nil {
+	imp.Path = k.Path
-		imp.Path = k.Path
-	}
 	return imp
 }