From 67a06b65579374c6e4409500394ba747afa61885 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 11 Jul 2023 18:05:03 -0700 Subject: [PATCH] var-in-var --- d2compiler/compile_test.go | 18 + d2ir/compile.go | 2 +- .../vars/override/var-in-var.exp.json | 360 ++++++++++++++++++ 3 files changed, 379 insertions(+), 1 deletion(-) create mode 100644 testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index fdaf33951..bc485af31 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3410,6 +3410,24 @@ a: { assert.Equal(t, "im nested var", g.Objects[1].Label.Value) }, }, + { + name: "var-in-var", + run: func(t *testing.T) { + g := assertCompile(t, ` +vars: { + surname: Smith +} +a: { + vars: { + trade1: Black${surname} + trade2: Metal${surname} + } + hi: ${trade1} +} +`, "") + assert.Equal(t, "BlackSmith", g.Objects[1].Label.Value) + }, + }, } for _, tc := range tca { diff --git a/d2ir/compile.go b/d2ir/compile.go index 7495ea2c4..3dbe65e0c 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -154,6 +154,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node d2ast.Node, scala } if subbed { s.Coalesce() + scalar.Value = d2ast.RawString(s.ScalarString(), false) } case *d2ast.DoubleQuotedString: for i, box := range s.Value { @@ -198,7 +199,6 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti vars = r.Map() resolved = r } - return resolved } diff --git a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json new file mode 100644 index 000000000..6f41e1fad --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json @@ -0,0 +1,360 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,0:0:0-11:0:116", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-3:1:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,1:6:7-3:1:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:15:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:8:17", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:1:10-2:8:17", + "value": [ + { + "string": "surname", + "raw_string": "surname" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,2:10:19-2:15:24", + "value": [ + { + "string": "Smith", + "raw_string": "Smith" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-10:1:115", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:3:30-10:1:115", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-8:3:97", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-5:6:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:2:34-5:6:38", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,5:8:40-8:3:97", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:25:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:8:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:2:44-6:8:50", + "value": [ + { + "string": "trade1", + "raw_string": "trade1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,6:10:52-6:16:58", + "value": [ + { + "string": "BlackSmith" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:25:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:8:76", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:2:70-7:8:76", + "value": [ + { + "string": "trade2", + "raw_string": "trade2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,7:10:78-7:16:84", + "value": [ + { + "string": "MetalSmith" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:15:113", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:7:105", + "value": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:6:104-9:15:113", + "spread": false, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:8:106-9:14:112", + "value": [ + { + "string": "trade1", + "raw_string": "trade1" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "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": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,4:0:27-4:1:28", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/override/var-in-var.d2,9:2:100-9:4:102", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "BlackSmith" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +}