Merge pull request #2195 from alixander/style-board-bug

fix double globs in multiple scenarios
terrastruct · Nov 5, 2024 · 51a2b7b · 51a2b7b
2 parents a814db6 + db83fb8
commit 51a2b7b
Show file tree

Hide file tree

Showing 8 changed files with 1,568 additions and 537 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -14,3 +14,4 @@
 
 - Render: fixes edge case of a 3d shape with outside label being cut off [#2132](https://github.com/terrastruct/d2/pull/2132)
 - Composition: labels for boards set with shorthand `x: y` was not applied [#2182](https://github.com/terrastruct/d2/pull/2182)
+- Globs: double globs (`**`) were erroring when used with multiple scenario boards [#2195](https://github.com/terrastruct/d2/pull/2195)
diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go
@@ -1006,6 +1006,21 @@ func (mk *Key) HasTripleGlob() bool {
 	return false
 }
 
+func (mk *Key) HasMultiGlob() bool {
+	if mk.Key.HasMultiGlob() {
+		return true
+	}
+	for _, e := range mk.Edges {
+		if e.Src.HasMultiGlob() || e.Dst.HasMultiGlob() {
+			return true
+		}
+	}
+	if mk.EdgeKey.HasMultiGlob() {
+		return true
+	}
+	return false
+}
+
 func (mk *Key) SupportsGlobFilters() bool {
 	if mk.Key.HasGlob() && len(mk.Edges) == 0 {
 		return true

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -3576,6 +3576,40 @@ steps: {
 `, `d2/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.d2:9:2: board name one already used by another board`)
 			},
 		},
+		{
+			name: "style-nested-boards",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `**.style.stroke: black
+
+scenarios: {
+  a: {
+    x
+  }
+  b: {
+    x
+  }
+}
+steps: {
+  c: {
+    x
+  }
+  d: {
+    x
+  }
+}
+layers: {
+  e: {
+    x
+  }
+}
+`, ``)
+				assert.Equal(t, "black", g.Scenarios[0].Objects[0].Style.Stroke.Value)
+				assert.Equal(t, "black", g.Scenarios[1].Objects[0].Style.Stroke.Value)
+				assert.Equal(t, "black", g.Steps[0].Objects[0].Style.Stroke.Value)
+				assert.Equal(t, "black", g.Steps[1].Objects[0].Style.Stroke.Value)
+				assert.Equal(t, (*d2graph.Scalar)(nil), g.Layers[0].Objects[0].Style.Stroke)
+			},
+		},
 	}
 
 	for _, tc := range tca {

diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -456,7 +456,7 @@ func (c *compiler) ampersandFilterMap(dst *Map, ast, scopeAST *d2ast.Map) bool {
 					return false
 				}
 				var ks string
-				if gctx.refctx.Key.HasTripleGlob() {
+				if gctx.refctx.Key.HasMultiGlob() {
 					ks = d2format.Format(d2ast.MakeKeyPath(IDA(dst)))
 				} else {
 					ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(dst)))
@@ -488,7 +488,7 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) {
 				// We don't want globs applied in a given scenario to affect future boards
 				// Copying the applied fields and edges keeps the applications scoped to this board
 				// Note that this is different from steps, where applications carry over
-				if !g.refctx.Key.HasTripleGlob() {
+				if !g.refctx.Key.HasMultiGlob() {
 					// Triple globs already apply independently to each board
 					g2.copyApplied(g)
 				}

diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go
@@ -784,7 +784,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b
 	filter := func(f *Field, passthrough bool) bool {
 		if gctx != nil {
 			var ks string
-			if refctx.Key.HasTripleGlob() {
+			if refctx.Key.HasMultiGlob() {
 				ks = d2format.Format(d2ast.MakeKeyPath(IDA(f)))
 			} else {
 				ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f)))
@@ -937,7 +937,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b
 		}
 		for _, grefctx := range c.globRefContextStack {
 			var ks string
-			if grefctx.Key.HasTripleGlob() {
+			if grefctx.Key.HasMultiGlob() {
 				ks = d2format.Format(d2ast.MakeKeyPath(IDA(f)))
 			} else {
 				ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f)))
@@ -1134,7 +1134,7 @@ func (m *Map) getEdges(eid *EdgeID, refctx *RefContext, gctx *globContext, ea *[
 			for _, e := range ea2 {
 				if gctx != nil {
 					var ks string
-					if refctx.Key.HasTripleGlob() {
+					if refctx.Key.HasMultiGlob() {
 						ks = d2format.Format(d2ast.MakeKeyPath(IDA(e)))
 					} else {
 						ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(e)))
@@ -1352,7 +1352,7 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, c
 		e2 := e.Copy(e.Parent()).(*Edge)
 		e2.ID = e2.ID.Copy()
 		e2.ID.Index = nil
-		if refctx.Key.HasTripleGlob() {
+		if refctx.Key.HasMultiGlob() {
 			ks = d2format.Format(d2ast.MakeKeyPath(IDA(e2)))
 		} else {
 			ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(e2)))