Merge pull request #1755 from alixander/glob-imp

globs: fix imported case

ci/release/changelogs/next.md

@@ -33,3 +33,4 @@
 - Fixes incorrect grid cell positioning when the grid has a shape set and fixes content sometimes escaping circle shapes. [#1734](https://github.com/terrastruct/d2/pull/1734)
 - Fixes content sometimes escaping cloud shapes. [#1736](https://github.com/terrastruct/d2/pull/1736)
 - Fixes panic using a glob filter (e.g. `&a`) outside globs. [#1748](https://github.com/terrastruct/d2/pull/1748)
+- Fixes glob keys with import values (e.g. `user*: @lib/user`). [#1755](https://github.com/terrastruct/d2/pull/1755)

d2ir/compile.go

@@ -419,8 +419,10 @@ func (c *compiler) ampersandFilterMap(dst *Map, ast, scopeAST *d2ast.Map) bool {
 func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) {
 	var globs []*globContext
 	if len(c.globContextStack) > 0 {
-		previousGlobs := c.globContextStack[len(c.globContextStack)-1]
-		if NodeBoardKind(dst) == BoardLayer {
+		previousGlobs := c.globContexts()
+		// A root layer with existing glob context stack implies it's an import
+		// In which case, the previous globs should be inherited (the else block)
+		if NodeBoardKind(dst) == BoardLayer && !dst.Root() {
 			for _, g := range previousGlobs {
 				if g.refctx.Key.HasTripleGlob() {
 					globs = append(globs, g.prefixed(dst))

d2ir/import_test.go

@@ -184,6 +184,21 @@ label: meow`,
 				assertQuery(t, m, 0, 0, 1, "hi")
 			},
 		},
+		{
+			name: "pattern-value",
+			run: func(t testing.TB) {
+				_, err := compileFS(t, "index.d2", map[string]string{
+					"index.d2": `userWebsite
+userMobile
+
+user*: @x
+`,
+					"x.d2": `shape: person
+label: meow`,
+				})
+				assert.Success(t, err)
+			},
+		},
 	}
 
 	runa(t, tca)