Merge pull request #1525 from nhooyr/utf16

d2parser: Support reading utf16 files

d2compiler/compile.go

@@ -21,27 +21,27 @@ import (
 )
 
 type CompileOptions struct {
-	UTF16 bool
+	UTF16Pos bool
 	// FS is the file system used for resolving imports in the d2 text.
 	// It should correspond to the root path.
 	FS fs.FS
 }
 
-func Compile(p string, r io.RuneReader, opts *CompileOptions) (*d2graph.Graph, *d2target.Config, error) {
+func Compile(p string, r io.Reader, opts *CompileOptions) (*d2graph.Graph, *d2target.Config, error) {
 	if opts == nil {
 		opts = &CompileOptions{}
 	}
 
 	ast, err := d2parser.Parse(p, r, &d2parser.ParseOptions{
-		UTF16: opts.UTF16,
+		UTF16Pos: opts.UTF16Pos,
 	})
 	if err != nil {
 		return nil, nil, err
 	}
 
 	ir, err := d2ir.Compile(ast, &d2ir.CompileOptions{
-		UTF16: opts.UTF16,
-		FS:    opts.FS,
+		UTF16Pos: opts.UTF16Pos,
+		FS:       opts.FS,
 	})
 	if err != nil {
 		return nil, nil, err

d2exporter/export_test.go

@@ -223,7 +223,7 @@ func run(t *testing.T, tc testCase) {
 	ctx = log.Leveled(ctx, slog.LevelDebug)
 
 	g, config, err := d2compiler.Compile("", strings.NewReader(tc.dsl), &d2compiler.CompileOptions{
-		UTF16: true,
+		UTF16Pos: true,
 	})
 	if err != nil {
 		t.Fatal(err)

d2ir/compile.go

@@ -21,13 +21,13 @@ type compiler struct {
 	importStack []string
 	// importCache enables reuse of files imported multiple times.
 	importCache map[string]*Map
-	utf16       bool
+	utf16Pos    bool
 
 	globStack []bool
 }
 
 type CompileOptions struct {
-	UTF16 bool
+	UTF16Pos bool
 	// Pass nil to disable imports.
 	FS fs.FS
 }
@@ -45,7 +45,7 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) {
 		fs:  opts.FS,
 
 		importCache: make(map[string]*Map),
-		utf16:       opts.UTF16,
+		utf16Pos:    opts.UTF16Pos,
 	}
 	m := &Map{}
 	m.initRoot()

d2ir/import.go

@@ -1,7 +1,6 @@
 package d2ir
 
 import (
-	"bufio"
 	"io/fs"
 	"os"
 	"path"
@@ -99,8 +98,8 @@ func (c *compiler) __import(imp *d2ast.Import) (*Map, bool) {
 	}
 	defer f.Close()
 
-	ast, err := d2parser.Parse(impPath, bufio.NewReader(f), &d2parser.ParseOptions{
-		UTF16:      c.utf16,
+	ast, err := d2parser.Parse(impPath, f, &d2parser.ParseOptions{
+		UTF16Pos:   c.utf16Pos,
 		ParseError: c.err,
 	})
 	if err != nil {

d2lib/d2.go

@@ -23,7 +23,7 @@ import (
 )
 
 type CompileOptions struct {
-	UTF16          bool
+	UTF16Pos       bool
 	FS             fs.FS
 	MeasuredTexts  []*d2target.MText
 	Ruler          *textmeasure.Ruler
@@ -50,8 +50,8 @@ func Compile(ctx context.Context, input string, compileOpts *CompileOptions, ren
 	}
 
 	g, config, err := d2compiler.Compile(compileOpts.InputPath, strings.NewReader(input), &d2compiler.CompileOptions{
-		UTF16: compileOpts.UTF16,
-		FS:    compileOpts.FS,
+		UTF16Pos: compileOpts.UTF16Pos,
+		FS:       compileOpts.FS,
 	})
 	if err != nil {
 		return nil, nil, err

d2parser/.gitignore

@@ -0,0 +1 @@
+utf16.d2