d2ir: fix glob edge with common glob

terrastruct · Nov 8, 2023 · 87736b1 · 87736b1
1 parent 7b2e4d6
commit 87736b1
Show file tree

Hide file tree

Showing 4 changed files with 454 additions and 1 deletion.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -24,3 +24,4 @@
 - Fixes panic when spread substitution referenced a nonexistant var. [#1695](https://github.com/terrastruct/d2/pull/1695)
 - Fixes incorrect appendix icon numbering. [#1704](https://github.com/terrastruct/d2/pull/1704)
 - Fixes crash when using `--watch` and navigating to an invalid board path [#1693](https://github.com/terrastruct/d2/pull/1693)
+- Fixes edge case where nested edge globs were creating excess shapes [#1713](https://github.com/terrastruct/d2/pull/1713)
diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -4297,6 +4297,23 @@ x: {
 `, `d2/testdata/d2compiler/TestCompile2/globs/double-glob-override-err-val.d2:6:2: invalid "near" field`)
 			},
 		},
+		{
+			name: "creating-node-bug",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+*.*a -> *.*b
+
+container_1: {
+	a
+}
+
+container_2: {
+	b
+}
+`, ``)
+				assert.Equal(t, 4, len(g.Objects))
+			},
+		},
 	}
 
 	for _, tc := range tca {

diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go
@@ -435,7 +435,7 @@ func (eid *EdgeID) resolve(m *Map) (_ *EdgeID, _ *Map, common []string, _ error)
 	}
 
 	for len(eid.SrcPath) > 1 && len(eid.DstPath) > 1 {
-		if !strings.EqualFold(eid.SrcPath[0], eid.DstPath[0]) {
+		if !strings.EqualFold(eid.SrcPath[0], eid.DstPath[0]) || eid.SrcPath[0] == "*" {
 			return eid, m, common, nil
 		}
 		common = append(common, eid.SrcPath[0])