From 1ecadc576ccfa5621da626d71bb9e5cdf33cee0b Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Sun, 24 Nov 2024 11:03:03 -0800
Subject: [PATCH] fix tests

---
 d2ast/d2ast.go                                |   7 +++++++
 d2cli/main.go                                 |   2 +-
 d2compiler/compile.go                         |   6 +-----
 d2lsp/d2lsp.go                                |   2 +-
 .../TestCLI_E2E/internal_linked_pdf.exp.pdf   | Bin 62121 -> 62121 bytes
 .../testdata/TestCLI_E2E/no-nav-pdf.exp.pdf   | Bin 91400 -> 91400 bytes
 .../TestCLI_E2E/renamed-board.exp.pdf         | Bin 107020 -> 107020 bytes
 .../testdata/TestCLI_E2E/theme-pdf.exp.pdf    | Bin 17219 -> 17219 bytes
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go
index 464faf196..b0e9386e9 100644
--- a/d2ast/d2ast.go
+++ b/d2ast/d2ast.go
@@ -1080,6 +1080,13 @@ func (kp *KeyPath) IDA() (ida []String) {
 	return ida
 }
 
+func (kp *KeyPath) StringIDA() (ida []string) {
+	for _, el := range kp.Path {
+		ida = append(ida, el.Unbox().ScalarString())
+	}
+	return ida
+}
+
 func (kp *KeyPath) Copy() *KeyPath {
 	kp2 := *kp
 	kp2.Path = nil
diff --git a/d2cli/main.go b/d2cli/main.go
index df66926fa..eeefd6ae9 100644
--- a/d2cli/main.go
+++ b/d2cli/main.go
@@ -349,7 +349,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
 		if err != nil {
 			return xmain.UsageErrorf("invalid target: %s", *targetFlag)
 		}
-		boardPath = key.IDA()
+		boardPath = key.StringIDA()
 	}
 
 	ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2)
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
index 221bb9d67..be7150d1a 100644
--- a/d2compiler/compile.go
+++ b/d2compiler/compile.go
@@ -1230,11 +1230,7 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) {
 			continue
 		}
 
-		formattedIDA := []string{}
-		for _, id := range linkKey.IDA() {
-			formattedIDA = append(formattedIDA, id.ScalarString())
-		}
-		if slices.Equal(formattedIDA, obj.Graph.IDA()) {
+		if slices.Equal(linkKey.StringIDA(), obj.Graph.IDA()) {
 			obj.Link = nil
 			continue
 		}
diff --git a/d2lsp/d2lsp.go b/d2lsp/d2lsp.go
index fbd2c4d75..eedcd6550 100644
--- a/d2lsp/d2lsp.go
+++ b/d2lsp/d2lsp.go
@@ -28,7 +28,7 @@ func GetRefRanges(path string, fs map[string]string, boardPath []string, key str
 	var f *d2ir.Field
 	if mk.Key != nil {
 		for _, p := range mk.Key.Path {
-			f = m.GetField(p.Unbox().ScalarString())
+			f = m.GetField(p.Unbox())
 			if f == nil {
 				return nil, nil, nil
 			}
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index 76279f245789662ad78d057b2f5c3f547d0d0654..b1ef566beb81f6edb077ee18618599687d1e97ce 100644
GIT binary patch
delta 49
zcmZ4alzHV-<_&A!D;XM?TACPZa_Rf#r?@1Rq$+5*SQ!}@nHU-ZF<5T%x%ao30JUfk
Ap8x;=

delta 49
zcmZ4alzHV-<_&A!D;Zdtnj4vGa_Rf#r?@1Rq$+5*SQ!}@nHU-xnLy+=pL>6s2>`a*
B5U&6L

diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf
index 59fd3431a7928b5061ef72dfea699e06d5968444..5a6a7c3644119bd74359e897b151ea27fe06f249 100644
GIT binary patch
delta 36
mcmeA;#oBR-wP6b*cM_YSfvKg5$#lUaMlmRRyKWNWZ6*NAiV6?_

delta 36
mcmeA;#oBR-wP6b*cM_X{rK!1*>2$#)MlmRRyKWNWZ6*NBJ_;HD

diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf
index 9ab29298bab4bb4d7c9b25143547e5226d8ae2fc..c520c51ab5d2ab24a5ca3b80abd0ff2aa2e90842 100644
GIT binary patch
delta 52
zcmeA<!q#(ytzioz-+U!Q15-;A6HP9C-~1Gp#FA764HqjT10xedLm&prZ8w<Dc!vo9
Dp*9ZM

delta 52
zcmeA<!q#(ytzioz-+UzlOH*?rQ%x>?-~1Gp#FA764HqjT10xedLn9N2+;)TcjCYs-
DqB;)b

diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf
index b062ef0bf07895b4d985ffc48b4bf976b3409309..79e8b42da37221c85c4f96434958c18ac235f948 100644
GIT binary patch
delta 49
zcmX@y#(21mal<qRB|`&KOA`}KE`8tp6qm%3R0RzeD<cCV6GKBF2Fq>U;n2+l0C`mo
AIRF3v

delta 49
zcmX@y#(21mal<qRB?C)Sb0bqtE`8tp6qm%3R0RzeD<cCV6GKBI6NudA9S+@00D4aj
ALjV8(