From b175c0370c2e2b8b62fc4dc1ee664edb79f6ce14 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 12 Mar 2025 15:29:48 -0600 Subject: [PATCH] fix edge glob ampersand filters --- d2compiler/compile_test.go | 15 + d2ir/compile.go | 14 + .../edge-glob-ampersand-filter/1.exp.json | 144 --- .../edge-glob-ampersand-filter/2.exp.json | 144 --- .../globs/unsuspend-edge-filter.exp.json | 284 ++++++ .../d2ir/TestCompile/filters/edge.exp.json | 823 +++++++--------- .../filters/label-filter/2.exp.json | 920 ------------------ .../filters/label-filter/3.exp.json | 184 ---- 8 files changed, 657 insertions(+), 1871 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 39c0bb454..009e7885e 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -5633,6 +5633,21 @@ c assert.Equal(t, "hello", g.Edges[0].Label.Value) }, }, + { + name: "unsuspend-edge-filter", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a -> b +**: suspend +(** -> **)[*]: suspend +(* -> *)[*]: unsuspend { + &dst: a +} +`, ``) + assert.Equal(t, 0, len(g.Objects)) + assert.Equal(t, 0, len(g.Edges)) + }, + }, { name: "unsuspend-shape-label", run: func(t *testing.T) { diff --git a/d2ir/compile.go b/d2ir/compile.go index db4984cd5..5799b2ae5 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -1273,6 +1273,20 @@ func (c *compiler) _compileEdges(refctx *RefContext) { continue } + if refctx.Key.Value.Map != nil && refctx.Key.Value.Map.HasFilter() { + if e.Map_ == nil { + e.Map_ = &Map{ + parent: e, + } + } + c.mapRefContextStack = append(c.mapRefContextStack, refctx) + ok := c.ampersandFilterMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1] + if !ok { + continue + } + } + if refctx.Key.Primary.Suspension != nil || refctx.Key.Value.Suspension != nil { if !c.lazyGlobBeingApplied { var suspensionValue bool diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json index b6304d711..6c2ac09a5 100644 --- a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json @@ -628,102 +628,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, @@ -761,36 +665,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, @@ -834,24 +708,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json index 19f5ece5a..26a0db37c 100644 --- a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json @@ -1149,102 +1149,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, @@ -1282,36 +1186,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, @@ -1355,24 +1229,6 @@ "src_arrow": false, "dst_arrow": true, "references": [ - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, - { - "map_key_edge_index": 0 - }, { "map_key_edge_index": 0 }, diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json new file mode 100644 index 000000000..aaf8ce50e --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json @@ -0,0 +1,284 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,0:0:0-7:0:80", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:11:19", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:2:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:2:10", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:4:12-2:11:19", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:0:20-3:22:42", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:9:29", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:3:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:3:23", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:7:27-3:9:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:7:27-3:9:29", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:10:30-3:13:33", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:15:35-3:22:42", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:0:43-6:1:79", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:7:50", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:2:45", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:2:45", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:6:49-4:7:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:6:49-4:7:50", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:8:51-4:11:54", + "int": null, + "glob": true + }, + "primary": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:13:56-4:22:65", + "value": false + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:23:66-6:1:79", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:2:70-5:9:77", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:3:71-5:6:74", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:3:71-5:6:74", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:8:76-5:9:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null + }, + "err": null +} diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json index 5622ca570..89c6f9104 100644 --- a/testdata/d2ir/TestCompile/filters/edge.exp.json +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -580,258 +580,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": false - }, - { - "string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", - "edges": [ - { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", - "value": [ - { - "string": "source-arrowhead", - "raw_string": "source-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", - "key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", - "value": [ - { - "string": "diamond shape arrowheads", - "raw_string": "diamond shape arrowheads" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": false } ] }, @@ -1318,6 +1066,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", @@ -1495,6 +1329,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", @@ -1702,6 +1622,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", @@ -1879,6 +1885,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", @@ -2588,233 +2680,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", - "edges": [ - { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", - "value": [ - { - "string": "source-arrowhead", - "raw_string": "source-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", - "key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", - "value": [ - { - "string": "diamond shape arrowheads", - "raw_string": "diamond shape arrowheads" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json index c8901f508..a6814b031 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json @@ -1505,374 +1505,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, @@ -2518,558 +2150,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json index 987ebd9e8..65f2526bd 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json @@ -798,190 +798,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:7:8", - "src": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/3.d2,1:0:1-4:1:51", - "edges": [ - { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:7:8", - "src": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/3.d2,1:8:9-1:11:12", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/3.d2,1:13:14-4:1:51", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/3.d2,2:2:18-2:12:28", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/3.d2,2:3:19-2:8:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,2:3:19-2:8:24", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,2:10:26-2:12:28", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:20:49", - "key": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:7:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,3:8:37-3:15:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/3.d2,3:17:46-3:20:49", - "raw": "0.1", - "value": "1/10" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }