Merge pull request #2299 from alixander/container-glob-filter

globs: add filters
terrastruct · Jan 21, 2025 · dc0e5fa · dc0e5fa
2 parents 7d4b42c + ce5df70
commit dc0e5fa
Show file tree

Hide file tree

Showing 5 changed files with 850 additions and 0 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -6,6 +6,7 @@
 - Markdown: Github-flavored tables work in `md` blocks [#2221](https://github.com/terrastruct/d2/pull/2221)
 - `d2 fmt` now supports a `--check` flag [#2253](https://github.com/terrastruct/d2/pull/2253)
 - CLI: PNG output to stdout is supported using `--stdout-format png -` [#2291](https://github.com/terrastruct/d2/pull/2291)
+- Globs: `&connected` and `&leaf` filters are implemented [#2299](https://github.com/terrastruct/d2/pull/2299)
 
 #### Improvements 🧹
 

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -5197,6 +5197,43 @@ y.link: https://google.com
 				assert.Equal(t, "true", g.Objects[1].Attributes.Style.Underline.Value)
 			},
 		},
+		{
+			name: "leaf-filter",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+**: {
+  &leaf: false
+  style.fill: red
+}
+a.b.c
+`, ``)
+				assert.Equal(t, "a", g.Objects[0].ID)
+				assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value)
+				assert.Equal(t, "b", g.Objects[1].ID)
+				assert.Equal(t, "red", g.Objects[1].Attributes.Style.Fill.Value)
+				assert.Equal(t, "c", g.Objects[2].ID)
+				assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill)
+			},
+		},
+		{
+			name: "connected-filter",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+*: {
+  &connected: true
+  style.fill: red
+}
+a -> b
+c
+`, ``)
+				assert.Equal(t, "a", g.Objects[0].ID)
+				assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value)
+				assert.Equal(t, "b", g.Objects[1].ID)
+				assert.Equal(t, "red", g.Objects[1].Attributes.Style.Fill.Value)
+				assert.Equal(t, "c", g.Objects[2].ID)
+				assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill)
+			},
+		},
 		{
 			name: "glob-filter",
 			run: func(t *testing.T) {

diff --git a/d2ir/compile.go b/d2ir/compile.go
@@ -750,6 +750,33 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool {
 				},
 			}
 			return c._ampersandFilter(f, refctx)
+		case "leaf":
+			raw := refctx.Key.Value.ScalarBox().Unbox().ScalarString()
+			boolVal, err := strconv.ParseBool(raw)
+			if err != nil {
+				c.errorf(refctx.Key, `&leaf must be "true" or "false", got %q`, raw)
+				return false
+			}
+
+			f := refctx.ScopeMap.Parent().(*Field)
+			isLeaf := f.Map() == nil || !f.Map().IsContainer()
+			return isLeaf == boolVal
+		case "connected":
+			raw := refctx.Key.Value.ScalarBox().Unbox().ScalarString()
+			boolVal, err := strconv.ParseBool(raw)
+			if err != nil {
+				c.errorf(refctx.Key, `&connected must be "true" or "false", got %q`, raw)
+				return false
+			}
+			f := refctx.ScopeMap.Parent().(*Field)
+			isConnected := false
+			for _, r := range f.References {
+				if r.InEdge() {
+					isConnected = true
+					break
+				}
+			}
+			return isConnected == boolVal
 		case "label":
 			f := &Field{}
 			n := refctx.ScopeMap.Parent()