d2ir: Fix Alex's null glob problem

d2ir/compile.go

@@ -718,6 +718,8 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) {
 				// If new board type, use that as the new scope AST, otherwise, carry on
 				scopeAST = refctx.ScopeAST
 			}
+		} else {
+				scopeAST = refctx.ScopeAST
 		}
 		c.mapRefContextStack = append(c.mapRefContextStack, refctx)
 		c.compileMap(f.Map(), refctx.Key.Value.Map, scopeAST)

d2ir/d2ir.go

@@ -717,6 +717,14 @@ func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext, create bool, c
 
 	var fa []*Field
 	err := m.ensureField(i, kp, refctx, create, gctx, c, &fa)
+	if len(fa) > 0 && c != nil && len(c.globRefContextStack) == 0 {
+		for _, gctx2 := range c.globContexts() {
+			old := c.lazyGlobBeingApplied
+			c.lazyGlobBeingApplied = true
+			c.compileKey(gctx2.refctx)
+			c.lazyGlobBeingApplied = old
+		}
+	}
 	return fa, err
 }
 
@@ -1091,6 +1099,14 @@ func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext, c *compiler) ([]*Edge,
 		gctx = c.ensureGlobContext(refctx)
 	}
 	err := m.createEdge(eid, refctx, gctx, c, &ea)
+	if len(ea) > 0 && c != nil && len(c.globRefContextStack) == 0 {
+		for _, gctx2 := range c.globContexts() {
+			old := c.lazyGlobBeingApplied
+			c.lazyGlobBeingApplied = true
+			c.compileKey(gctx2.refctx)
+			c.lazyGlobBeingApplied = old
+		}
+	}
 	return ea, err
 }
 

d2ir/pattern_test.go

@@ -655,6 +655,29 @@ a.icon: null
 b.icon: https://icons.terrastruct.com/essentials%2F073-add.svg
 b.icon: null
 
+# Shape nulling works
+*.shape: circle
+a.shape: null
+b.shape: null
+`)
+				assert.Success(t, err)
+				assertQuery(t, m, 2, 0, nil, "")
+				assertQuery(t, m, 0, 0, nil, "a")
+				assertQuery(t, m, 0, 0, nil, "b")
+			},
+		},
+		{
+			name: "override/7",
+			run: func(t testing.TB) {
+				m, err := compile(t, `
+# Nulling glob doesn't work
+*a.icon: https://icons.terrastruct.com/essentials%2F073-add.svg
+a.icon: null
+
+# Regular icon nulling works
+b.icon: https://icons.terrastruct.com/essentials%2F073-add.svg
+b.icon: null
+
 # Shape nulling works
 *.shape: circle
 a.shape: null
@@ -689,7 +712,7 @@ class: {
 }
 `)
 				assert.Success(t, err)
-				assertQuery(t, m, 10, 0, nil, "")
+				assertQuery(t, m, 13, 0, nil, "")
 			},
 		},
 		{