d2ir: Fixup lazy globs across imports

terrastruct · Sep 4, 2023 · 5ac1db3 · 5ac1db3
1 parent b1f9083
commit 5ac1db3
Show file tree

Hide file tree

Showing 5 changed files with 1,438 additions and 5 deletions.
diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -475,9 +475,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) {
 				if !gctx.refctx.Key.HasTripleGlob() {
 					continue
 				}
-				if gctx.refctx.ScopeMap != impn.Map() {
-					continue
-				}
 				gctx2 := gctx.copy()
 				gctx2.refctx.ScopeMap = dst
 				c.compileKey(gctx2.refctx)

diff --git a/d2ir/import.go b/d2ir/import.go
@@ -61,7 +61,8 @@ func (c *compiler) _import(imp *d2ast.Import) (Node, bool) {
 	if !ok {
 		return nil, false
 	}
-	nilScopeMap(ir)
+	// Not sure why this was here...
+	// nilScopeMap(ir)
 	if len(imp.IDA()) > 0 {
 		f := ir.GetField(imp.IDA()...)
 		if f == nil {

diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go
@@ -735,7 +735,7 @@ two
 			},
 		},
 		{
-			name: "import-glob",
+			name: "import-glob/1",
 			run: func(t testing.TB) {
 				m, err := compileFS(t, "index.d2", map[string]string{
 					"index.d2": "before; ...@globs.d2; after",
@@ -750,6 +750,26 @@ two
 				assertQuery(t, m, 0, 0, "meow", "after")
 			},
 		},
+		{
+			name: "import-glob/2",
+			run: func(t testing.TB) {
+				m, err := compileFS(t, "index.d2", map[string]string{
+					"index.d2": `...@rules.d2
+hi
+`,
+					"rules.d2": `***.style.fill: red
+***: meow
+x`,
+				})
+				assert.Success(t, err)
+
+				assertQuery(t, m, 6, 0, nil, "")
+				assertQuery(t, m, 2, 0, "meow", "hi")
+				assertQuery(t, m, 2, 0, "meow", "x")
+				assertQuery(t, m, 0, 0, "red", "hi.style.fill")
+				assertQuery(t, m, 0, 0, "red", "x.style.fill")
+			},
+		},
 	}
 
 	runa(t, tca)

diff --git a/...TestCompile/patterns/import-glob.exp.json → ...stCompile/patterns/import-glob/1.exp.json b/...TestCompile/patterns/import-glob.exp.json → ...stCompile/patterns/import-glob/1.exp.json