Merge pull request #979 from nhooyr/fix-abspath-9eba

d2cli: Accept abspaths again

ci/release/changelogs/next.md

@@ -3,3 +3,5 @@
 #### Improvements 🧹
 
 #### Bugfixes ⛑️
+
+- Accept absolute paths again on the CLI. [#979](https://github.com/terrastruct/d2/pull/979)

d2cli/main.go

@@ -154,14 +154,14 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
 		}
 	}
 	if inputPath != "-" {
-		inputPath = filepath.Join(ms.PWD, inputPath)
+		inputPath = ms.AbsPath(inputPath)
 		d, err := os.Stat(inputPath)
 		if err == nil && d.IsDir() {
 			inputPath = filepath.Join(inputPath, "index.d2")
 		}
 	}
 	if outputPath != "-" {
-		outputPath = filepath.Join(ms.PWD, outputPath)
+		outputPath = ms.AbsPath(outputPath)
 	}
 
 	match := d2themescatalog.Find(*themeFlag)
@@ -308,7 +308,7 @@ func compile(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 
 	if filepath.Ext(outputPath) == ".pdf" {
 		dur := time.Since(start)
-		ms.Log.Success.Printf("successfully compiled %s to %s in %s", inputPath, outputPath, dur)
+		ms.Log.Success.Printf("successfully compiled %s to %s in %s", ms.HumanPath(inputPath), ms.HumanPath(outputPath), dur)
 	}
 
 	return svg, true, nil
@@ -383,7 +383,7 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug
 			return svg, err
 		}
 		dur := compileDur + time.Since(start)
-		ms.Log.Success.Printf("successfully compiled %s to %s in %s", inputPath, boardOutputPath, dur)
+		ms.Log.Success.Printf("successfully compiled %s to %s in %s", ms.HumanPath(inputPath), ms.HumanPath(boardOutputPath), dur)
 		return svg, nil
 	}
 

d2cli/watch.go

@@ -48,6 +48,7 @@ type watcherOpts struct {
 	port          string
 	inputPath     string
 	outputPath    string
+	pwd           string
 	bundle        bool
 	forceAppendix bool
 	pw            png.Playwright
@@ -216,7 +217,7 @@ func (w *watcher) watchLoop(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	w.ms.Log.Info.Printf("compiling %v...", w.inputPath)
+	w.ms.Log.Info.Printf("compiling %v...", w.ms.HumanPath(w.inputPath))
 	w.requestCompile()
 
 	eatBurstTimer := time.NewTimer(0)
@@ -270,7 +271,7 @@ func (w *watcher) watchLoop(ctx context.Context) error {
 			// misleading error.
 			eatBurstTimer.Reset(time.Millisecond * 16)
 		case <-eatBurstTimer.C:
-			w.ms.Log.Info.Printf("detected change in %v: recompiling...", w.inputPath)
+			w.ms.Log.Info.Printf("detected change in %v: recompiling...", w.ms.HumanPath(w.inputPath))
 			w.requestCompile()
 		case err, ok := <-w.fw.Errors:
 			if !ok {
@@ -300,7 +301,7 @@ func (w *watcher) ensureAddWatch(ctx context.Context) (time.Time, error) {
 			return mt, nil
 		}
 		if interval >= time.Second {
-			w.ms.Log.Error.Printf("failed to watch inputPath %q: %v (retrying in %v)", w.inputPath, err, interval)
+			w.ms.Log.Error.Printf("failed to watch inputPath %q: %v (retrying in %v)", w.ms.HumanPath(w.inputPath), err, interval)
 		}
 
 		tc.Reset(interval)

e2etests-cli/main_test.go

@@ -161,6 +161,16 @@ layers: {
 				assert.Testdata(t, ".svg", stdout.Bytes())
 			},
 		},
+		{
+			name: "abspath",
+			run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) {
+				writeFile(t, dir, "hello-world.d2", `x -> y`)
+				err := runTestMain(t, ctx, dir, env, filepath.Join(dir, "hello-world.d2"))
+				assert.Success(t, err)
+				svg := readFile(t, dir, "hello-world.svg")
+				assert.Testdata(t, ".svg", svg)
+			},
+		},
 	}
 
 	ctx := context.Background()