d2ir: Implement double globs

d2ir/d2ir.go

@@ -672,12 +672,39 @@ func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext) ([]*Field, erro
 func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, fa *[]*Field) error {
 	us, ok := kp.Path[i].Unbox().(*d2ast.UnquotedString)
 	if ok && us.Pattern != nil {
+		fa2, ok := m.doubleGlob(us.Pattern)
+		if ok {
+			if i == len(kp.Path)-1 {
+				*fa = append(*fa, fa2...)
+			} else {
+				for _, f := range fa2 {
+					if f.Map() == nil {
+						f.Composite = &Map{
+							parent: f,
+						}
+					}
+					err := f.Map().ensureField(i+1, kp, refctx, fa)
+					if err != nil {
+						return err
+					}
+				}
+			}
+			return nil
+		}
 		for _, f := range m.Fields {
 			if matchPattern(f.Name, us.Pattern) {
 				if i == len(kp.Path)-1 {
 					*fa = append(*fa, f)
-				} else if f.Map() != nil {
-					f.Map().ensureField(i+1, kp, refctx, fa)
+				} else {
+					if f.Map() == nil {
+						f.Composite = &Map{
+							parent: f,
+						}
+					}
+					err := f.Map().ensureField(i+1, kp, refctx, fa)
+					if err != nil {
+						return err
+					}
 				}
 			}
 		}

d2ir/pattern.go

@@ -2,8 +2,31 @@ package d2ir
 
 import (
 	"strings"
+
+	"oss.terrastruct.com/d2/d2graph"
 )
 
+func (m *Map) doubleGlob(pattern []string) ([]*Field, bool) {
+	if !(len(pattern) == 3 && pattern[0] == "*" && pattern[1] == "" && pattern[2] == "*") {
+		return nil, false
+	}
+	var fa []*Field
+	m._doubleGlob(&fa)
+	return fa, true
+}
+
+func (m *Map) _doubleGlob(fa *[]*Field) {
+	for _, f := range m.Fields {
+		if _, ok := d2graph.ReservedKeywords[f.Name]; ok {
+			continue
+		}
+		*fa = append(*fa, f)
+		if f.Map() != nil {
+			f.Map()._doubleGlob(fa)
+		}
+	}
+}
+
 func matchPattern(s string, pattern []string) bool {
 	if len(pattern) == 0 {
 		return true

d2ir/pattern_test.go

@@ -134,17 +134,19 @@ sh*.an* -> sh*.an*`)
 			},
 		},
 		{
-			name: "double-glob",
+			name: "double-glob/1",
 			run: func(t testing.TB) {
 				m, err := compile(t, `shared.animate
 shared.animal
 **.style.fill: red`)
 				assert.Success(t, err)
 				assertQuery(t, m, 9, 0, nil, "")
 				assertQuery(t, m, 8, 0, nil, "shared")
-				assertQuery(t, m, 2, 0, nil, "shared.style")
+				assertQuery(t, m, 1, 0, nil, "shared.style")
 				assertQuery(t, m, 2, 0, nil, "shared.animate")
+				assertQuery(t, m, 1, 0, nil, "shared.animate.style")
 				assertQuery(t, m, 2, 0, nil, "shared.animal")
+				assertQuery(t, m, 1, 0, nil, "shared.animal.style")
 			},
 		},
 	}