From 9fce1136197e67e051aabbe26c790b69dd4a1f90 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Tue, 20 Jun 2023 18:58:04 -0700
Subject: [PATCH] tests

---
 d2oracle/edit_test.go                         | 40 +++++++++++++
 .../d2oracle/TestCreate/layers-basic.exp.json | 38 ++++++------
 .../TestCreate/layers-edge-duplicate.exp.json | 58 +++++++++----------
 .../d2oracle/TestCreate/layers-edge.exp.json  | 48 +++++++--------
 .../TestCreate/scenarios-basic.exp.json       | 38 ++++++------
 .../scenarios-edge-inherited.exp.json         | 48 +++++++--------
 .../TestCreate/scenarios-edge.exp.json        | 48 +++++++--------
 .../d2oracle/TestCreate/steps-basic.exp.json  | 38 ++++++------
 .../TestCreate/steps-conflict.exp.json        | 38 ++++++------
 .../d2oracle/TestCreate/steps-edge.exp.json   | 48 +++++++--------
 .../d2oracle/TestDelete/layers-basic.exp.json | 28 ++++-----
 .../TestDelete/scenarios-basic.exp.json       | 28 ++++-----
 .../d2oracle/TestMove/layers-basic.exp.json   | 40 ++++++-------
 .../layers-unusable-ref-style.exp.json        | 50 ++++++++--------
 .../TestSet/layers-usable-ref-style.exp.json  | 42 +++++++-------
 .../scenarios-label-primary-missing.exp.json  | 42 +++++++-------
 .../TestSet/scenarios-label-primary.exp.json  | 46 +++++++--------
 ...scenarios-nested-usable-ref-style.exp.json | 58 +++++++++----------
 .../scenarios-unusable-ref-style.exp.json     | 50 ++++++++--------
 .../scenarios-usable-ref-style.exp.json       | 46 +++++++--------
 20 files changed, 456 insertions(+), 416 deletions(-)

diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
index 2128480db..472e07d0c 100644
--- a/d2oracle/edit_test.go
+++ b/d2oracle/edit_test.go
@@ -462,6 +462,7 @@ after
 			name: "layers-basic",
 
 			text: `a
+
 layers: {
   x: {
     a
@@ -473,6 +474,7 @@ layers: {
 
 			expKey: `b`,
 			exp: `a
+
 layers: {
   x: {
     a
@@ -485,6 +487,7 @@ layers: {
 			name: "layers-edge",
 
 			text: `a
+
 layers: {
   x: {
     a
@@ -496,6 +499,7 @@ layers: {
 
 			expKey: `(a -> b)[0]`,
 			exp: `a
+
 layers: {
   x: {
     a
@@ -508,6 +512,7 @@ layers: {
 			name: "layers-edge-duplicate",
 
 			text: `a -> b
+
 layers: {
   x: {
     a -> b
@@ -519,6 +524,7 @@ layers: {
 
 			expKey: `(a -> b)[1]`,
 			exp: `a -> b
+
 layers: {
   x: {
     a -> b
@@ -532,6 +538,7 @@ layers: {
 
 			text: `a
 b
+
 scenarios: {
   x: {
     a
@@ -544,6 +551,7 @@ scenarios: {
 			expKey: `c`,
 			exp: `a
 b
+
 scenarios: {
   x: {
     a
@@ -557,6 +565,7 @@ scenarios: {
 
 			text: `a
 b
+
 scenarios: {
   x: {
     a
@@ -569,6 +578,7 @@ scenarios: {
 			expKey: `(a -> b)[0]`,
 			exp: `a
 b
+
 scenarios: {
   x: {
     a
@@ -581,6 +591,7 @@ scenarios: {
 			name: "scenarios-edge-inherited",
 
 			text: `a -> b
+
 scenarios: {
   x: {
     a
@@ -592,6 +603,7 @@ scenarios: {
 
 			expKey: `(a -> b)[1]`,
 			exp: `a -> b
+
 scenarios: {
   x: {
     a
@@ -605,6 +617,7 @@ scenarios: {
 
 			text: `a
 d
+
 steps: {
   x: {
     b
@@ -617,6 +630,7 @@ steps: {
 			expKey: `c`,
 			exp: `a
 d
+
 steps: {
   x: {
     b
@@ -630,6 +644,7 @@ steps: {
 
 			text: `a
 d
+
 steps: {
   x: {
     b
@@ -642,6 +657,7 @@ steps: {
 			expKey: `(d -> b)[0]`,
 			exp: `a
 d
+
 steps: {
   x: {
     b
@@ -655,6 +671,7 @@ steps: {
 
 			text: `a
 d
+
 steps: {
   x: {
     b
@@ -667,6 +684,7 @@ steps: {
 			expKey: `d 2`,
 			exp: `a
 d
+
 steps: {
   x: {
     b
@@ -1694,6 +1712,7 @@ six
 			name: "layers-usable-ref-style",
 
 			text: `a
+
 layers: {
   x: {
     a
@@ -1705,6 +1724,7 @@ layers: {
 			boardPath: []string{"root", "layers", "x"},
 
 			exp: `a
+
 layers: {
   x: {
     a: {style.opacity: 0.2}
@@ -1716,6 +1736,7 @@ layers: {
 			name: "layers-unusable-ref-style",
 
 			text: `a
+
 layers: {
   x: {
     b
@@ -1727,6 +1748,7 @@ layers: {
 			boardPath: []string{"root", "layers", "x"},
 
 			exp: `a
+
 layers: {
   x: {
     b
@@ -1739,6 +1761,7 @@ layers: {
 			name: "scenarios-usable-ref-style",
 
 			text: `a: outer
+
 scenarios: {
   x: {
 		a: inner
@@ -1750,6 +1773,7 @@ scenarios: {
 			boardPath: []string{"root", "scenarios", "x"},
 
 			exp: `a: outer
+
 scenarios: {
   x: {
     a: inner {style.opacity: 0.2}
@@ -1763,6 +1787,7 @@ scenarios: {
 			text: `a: {
   b: outer
 }
+
 scenarios: {
   x: {
     a: {
@@ -1778,6 +1803,7 @@ scenarios: {
 			exp: `a: {
   b: outer
 }
+
 scenarios: {
   x: {
     a: {
@@ -1791,6 +1817,7 @@ scenarios: {
 			name: "scenarios-unusable-ref-style",
 
 			text: `a
+
 scenarios: {
   x: {
     b
@@ -1802,6 +1829,7 @@ scenarios: {
 			boardPath: []string{"root", "scenarios", "x"},
 
 			exp: `a
+
 scenarios: {
   x: {
     b
@@ -1816,6 +1844,7 @@ scenarios: {
 			text: `a: {
   style.opacity: 0.2
 }
+
 scenarios: {
   x: {
 		a: {
@@ -1831,6 +1860,7 @@ scenarios: {
 			exp: `a: {
   style.opacity: 0.2
 }
+
 scenarios: {
   x: {
     a: b {
@@ -1846,6 +1876,7 @@ scenarios: {
 			text: `a: {
   style.opacity: 0.2
 }
+
 scenarios: {
   x: {
 		b
@@ -1859,6 +1890,7 @@ scenarios: {
 			exp: `a: {
   style.opacity: 0.2
 }
+
 scenarios: {
   x: {
     b
@@ -4838,6 +4870,7 @@ a
 			name: "layers-basic",
 
 			text: `a
+
 layers: {
   x: {
     b
@@ -4850,6 +4883,7 @@ layers: {
 			boardPath: []string{"root", "layers", "x"},
 
 			exp: `a
+
 layers: {
   x: {
     b: {
@@ -4863,6 +4897,7 @@ layers: {
 			name: "scenarios-out-of-scope",
 
 			text: `a
+
 scenarios: {
   x: {
     b
@@ -6568,6 +6603,7 @@ cm
 			name: "layers-basic",
 
 			text: `a
+
 layers: {
   x: {
     b
@@ -6579,6 +6615,7 @@ layers: {
 			boardPath: []string{"root", "layers", "x"},
 
 			exp: `a
+
 layers: {
   x: {
     b
@@ -6590,6 +6627,7 @@ layers: {
 			name: "scenarios-basic",
 
 			text: `a
+
 scenarios: {
   x: {
     b
@@ -6601,6 +6639,7 @@ scenarios: {
 			boardPath: []string{"root", "scenarios", "x"},
 
 			exp: `a
+
 scenarios: {
   x: {
     b
@@ -6612,6 +6651,7 @@ scenarios: {
 			name: "scenarios-inherited",
 
 			text: `a
+
 scenarios: {
   x: {
     b
diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json
index f8d267be3..202a1fdf8 100644
--- a/testdata/d2oracle/TestCreate/layers-basic.exp.json
+++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,0:0:0-7:0:37",
+      "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,0:0:0-8:0:38",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,1:0:2-6:1:36",
+            "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:0:3-7:1:37",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,1:8:10-6:1:36",
+                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:8:11-7:1:37",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:2:14-5:3:34",
+                      "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:2:15-6:3:35",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,2:5:17-5:3:34",
+                          "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:5:18-6:3:35",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "a",
@@ -101,13 +101,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30",
+                                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30",
+                                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31",
                                         "value": [
                                           {
                                             "string": "b",
@@ -289,11 +289,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "a",
@@ -334,11 +334,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:29-4:5:30",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json
index 078e5df02..6ed250186 100644
--- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json
+++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,0:0:0-7:0:52",
+      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,0:0:0-8:0:53",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,1:0:7-6:1:51",
+            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:0:8-7:1:52",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,1:0:7-1:6:13",
+              "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:0:8-2:6:14",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,1:0:7-1:6:13",
+                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:0:8-2:6:14",
                     "value": [
                       {
                         "string": "layers",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,1:8:15-6:1:51",
+                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:8:16-7:1:52",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:2:19-5:3:49",
+                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:2:20-6:3:50",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:2:19-2:3:20",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:2:20-3:3:21",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:2:19-2:3:20",
+                              "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:2:20-3:3:21",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,20 +97,20 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,2:5:22-5:3:49",
+                          "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:5:23-6:3:50",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:10:34",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:10:35",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:10:34",
+                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:10:35",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30",
                                             "value": [
                                               {
                                                 "string": "a",
@@ -123,11 +123,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -147,16 +147,16 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:10:45",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:10:46",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:10:45",
+                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:10:46",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:5:41",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:5:41",
                                             "value": [
                                               {
                                                 "string": "a",
@@ -169,11 +169,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:9:45-5:10:46",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:9:45-5:10:46",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -583,11 +583,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:4:28-3:5:29",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30",
                         "value": [
                           {
                             "string": "a",
@@ -603,11 +603,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:5:41",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:39-4:5:40",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:4:40-5:5:41",
                         "value": [
                           {
                             "string": "a",
@@ -648,11 +648,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,3:9:33-3:10:34",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35",
                         "value": [
                           {
                             "string": "b",
@@ -668,11 +668,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:9:45-5:10:46",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:44-4:10:45",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,5:9:45-5:10:46",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json
index d812756a0..71fd6031a 100644
--- a/testdata/d2oracle/TestCreate/layers-edge.exp.json
+++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,0:0:0-7:0:42",
+      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,0:0:0-8:0:43",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,1:0:2-6:1:41",
+            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:0:3-7:1:42",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,1:8:10-6:1:41",
+                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:8:11-7:1:42",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:2:14-5:3:39",
+                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:2:15-6:3:40",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,2:5:17-5:3:39",
+                          "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:5:18-6:3:40",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "a",
@@ -101,16 +101,16 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:10:35",
+                                "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:10:36",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:10:35",
+                                    "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:10:36",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:5:31",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:5:31",
                                             "value": [
                                               {
                                                 "string": "a",
@@ -123,11 +123,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35",
+                                      "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35",
+                                            "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -387,11 +387,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "a",
@@ -407,11 +407,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:5:31",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:29-4:5:30",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:4:30-5:5:31",
                         "value": [
                           {
                             "string": "a",
@@ -452,11 +452,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35",
+                  "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:9:34-4:10:35",
+                        "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json
index ab31d79a1..44f44d42a 100644
--- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json
+++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,0:0:0-8:0:42",
+      "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,0:0:0-9:0:43",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,2:0:4-7:1:41",
+            "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:0:5-8:1:42",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,2:0:4-2:9:13",
+              "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:0:5-3:9:14",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,2:0:4-2:9:13",
+                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:0:5-3:9:14",
                     "value": [
                       {
                         "string": "scenarios",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,2:11:15-7:1:41",
+                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:11:16-8:1:42",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:2:19-6:3:39",
+                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:2:20-7:3:40",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:2:19-3:3:20",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:2:20-4:3:21",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:2:19-3:3:20",
+                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:2:20-4:3:21",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,3:5:22-6:3:39",
+                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:5:23-7:3:40",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:29-5:5:30",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29",
+                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:29-5:5:30",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29",
+                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:29-5:5:30",
                                         "value": [
                                           {
                                             "string": "a",
@@ -124,13 +124,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35",
+                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35",
+                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36",
                                         "value": [
                                           {
                                             "string": "c",
@@ -399,11 +399,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:29-5:5:30",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,4:4:28-4:5:29",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:29-5:5:30",
                         "value": [
                           {
                             "string": "a",
@@ -489,11 +489,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,5:4:34-5:5:35",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36",
                         "value": [
                           {
                             "string": "c",
diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json
index 091affa29..7d4a47a62 100644
--- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json
+++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:0:0-7:0:50",
+      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:0:0-8:0:51",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,1:0:7-6:1:49",
+            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:0:8-7:1:50",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,1:0:7-1:9:16",
+              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:0:8-2:9:17",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,1:0:7-1:9:16",
+                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:0:8-2:9:17",
                     "value": [
                       {
                         "string": "scenarios",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,1:11:18-6:1:49",
+                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:11:19-7:1:50",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:2:22-5:3:47",
+                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:2:23-6:3:48",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:2:22-2:3:23",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:2:23-3:3:24",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:2:22-2:3:23",
+                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:2:23-3:3:24",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,2:5:25-5:3:47",
+                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:5:26-6:3:48",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:32-4:5:33",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32",
+                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:32-4:5:33",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32",
+                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:32-4:5:33",
                                         "value": [
                                           {
                                             "string": "a",
@@ -124,16 +124,16 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:10:43",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:10:44",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:10:43",
+                                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:10:44",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38",
+                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:5:39",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38",
+                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:5:39",
                                             "value": [
                                               {
                                                 "string": "a",
@@ -146,11 +146,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43",
+                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:9:43-5:10:44",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43",
+                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:9:43-5:10:44",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -580,11 +580,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:32-4:5:33",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,3:4:31-3:5:32",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:32-4:5:33",
                         "value": [
                           {
                             "string": "a",
@@ -600,11 +600,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:5:39",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:4:37-4:5:38",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:4:38-5:5:39",
                         "value": [
                           {
                             "string": "a",
@@ -665,11 +665,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:9:43-5:10:44",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,4:9:42-4:10:43",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,5:9:43-5:10:44",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json
index 5a8bc5b31..ed4cf7c75 100644
--- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json
+++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,0:0:0-8:0:47",
+      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,0:0:0-9:0:48",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,2:0:4-7:1:46",
+            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:0:5-8:1:47",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,2:0:4-2:9:13",
+              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:0:5-3:9:14",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,2:0:4-2:9:13",
+                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:0:5-3:9:14",
                     "value": [
                       {
                         "string": "scenarios",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,2:11:15-7:1:46",
+                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:11:16-8:1:47",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:2:19-6:3:44",
+                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:2:20-7:3:45",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:2:19-3:3:20",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:2:20-4:3:21",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:2:19-3:3:20",
+                              "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:2:20-4:3:21",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,3:5:22-6:3:44",
+                          "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:5:23-7:3:45",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:29-5:5:30",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29",
+                                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:29-5:5:30",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29",
+                                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:29-5:5:30",
                                         "value": [
                                           {
                                             "string": "a",
@@ -124,16 +124,16 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:10:40",
+                                "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:10:41",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:10:40",
+                                    "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:10:41",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35",
+                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:5:36",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35",
+                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:5:36",
                                             "value": [
                                               {
                                                 "string": "a",
@@ -146,11 +146,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40",
+                                      "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:9:40-6:10:41",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40",
+                                            "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:9:40-6:10:41",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -475,11 +475,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:29-5:5:30",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,4:4:28-4:5:29",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:29-5:5:30",
                         "value": [
                           {
                             "string": "a",
@@ -495,11 +495,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:5:36",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:4:34-5:5:35",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:4:35-6:5:36",
                         "value": [
                           {
                             "string": "a",
@@ -560,11 +560,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40",
+                  "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:9:40-6:10:41",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,5:9:39-5:10:40",
+                        "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,6:9:40-6:10:41",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json
index ed22ad91a..1d1ef21ff 100644
--- a/testdata/d2oracle/TestCreate/steps-basic.exp.json
+++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,0:0:0-8:0:38",
+      "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,0:0:0-9:0:39",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,2:0:4-7:1:37",
+            "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:0:5-8:1:38",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,2:0:4-2:5:9",
+              "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:0:5-3:5:10",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,2:0:4-2:5:9",
+                    "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:0:5-3:5:10",
                     "value": [
                       {
                         "string": "steps",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,2:7:11-7:1:37",
+                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:7:12-8:1:38",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:2:15-6:3:35",
+                      "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:2:16-7:3:36",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:2:15-3:3:16",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:2:16-4:3:17",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:2:15-3:3:16",
+                              "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:2:16-4:3:17",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,3:5:18-6:3:35",
+                          "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:5:19-7:3:36",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25",
+                                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25",
+                                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26",
                                         "value": [
                                           {
                                             "string": "b",
@@ -124,13 +124,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31",
+                                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31",
+                                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32",
                                         "value": [
                                           {
                                             "string": "c",
@@ -491,11 +491,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,4:4:24-4:5:25",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26",
                         "value": [
                           {
                             "string": "b",
@@ -536,11 +536,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:30-5:5:31",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32",
                         "value": [
                           {
                             "string": "c",
diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json
index 1bfd3dc6c..5f561da19 100644
--- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json
+++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,0:0:0-8:0:40",
+      "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,0:0:0-9:0:41",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,2:0:4-7:1:39",
+            "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:0:5-8:1:40",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,2:0:4-2:5:9",
+              "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:0:5-3:5:10",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,2:0:4-2:5:9",
+                    "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:0:5-3:5:10",
                     "value": [
                       {
                         "string": "steps",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,2:7:11-7:1:39",
+                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:7:12-8:1:40",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:2:15-6:3:37",
+                      "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:2:16-7:3:38",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:2:15-3:3:16",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:2:16-4:3:17",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:2:15-3:3:16",
+                              "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:2:16-4:3:17",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,3:5:18-6:3:37",
+                          "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:5:19-7:3:38",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25",
+                                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25",
+                                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26",
                                         "value": [
                                           {
                                             "string": "b",
@@ -124,13 +124,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33",
+                                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33",
+                                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34",
                                         "value": [
                                           {
                                             "string": "d 2",
@@ -491,11 +491,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,4:4:24-4:5:25",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26",
                         "value": [
                           {
                             "string": "b",
@@ -536,11 +536,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:30-5:7:33",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34",
                         "value": [
                           {
                             "string": "d 2",
diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json
index b718cca29..d97d8265a 100644
--- a/testdata/d2oracle/TestCreate/steps-edge.exp.json
+++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,0:0:0-8:0:43",
+      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,0:0:0-9:0:44",
       "nodes": [
         {
           "map_key": {
@@ -53,13 +53,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,2:0:4-7:1:42",
+            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:0:5-8:1:43",
             "key": {
-              "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,2:0:4-2:5:9",
+              "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:0:5-3:5:10",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,2:0:4-2:5:9",
+                    "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:0:5-3:5:10",
                     "value": [
                       {
                         "string": "steps",
@@ -73,17 +73,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,2:7:11-7:1:42",
+                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:7:12-8:1:43",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:2:15-6:3:40",
+                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:2:16-7:3:41",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:2:15-3:3:16",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:2:16-4:3:17",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:2:15-3:3:16",
+                              "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:2:16-4:3:17",
                               "value": [
                                 {
                                   "string": "x",
@@ -97,17 +97,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,3:5:18-6:3:40",
+                          "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:5:19-7:3:41",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25",
+                                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25",
+                                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26",
                                         "value": [
                                           {
                                             "string": "b",
@@ -124,16 +124,16 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:10:36",
+                                "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:10:37",
                                 "edges": [
                                   {
-                                    "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:10:36",
+                                    "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:10:37",
                                     "src": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31",
+                                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:5:32",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31",
+                                            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:5:32",
                                             "value": [
                                               {
                                                 "string": "d",
@@ -146,11 +146,11 @@
                                     },
                                     "src_arrow": "",
                                     "dst": {
-                                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36",
+                                      "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:9:36-6:10:37",
                                       "path": [
                                         {
                                           "unquoted_string": {
-                                            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36",
+                                            "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:9:36-6:10:37",
                                             "value": [
                                               {
                                                 "string": "b",
@@ -542,11 +542,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:5:32",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:30-5:5:31",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:4:31-6:5:32",
                         "value": [
                           {
                             "string": "d",
@@ -587,11 +587,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,4:4:24-4:5:25",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26",
                         "value": [
                           {
                             "string": "b",
@@ -607,11 +607,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36",
+                  "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:9:36-6:10:37",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:9:35-5:10:36",
+                        "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,6:9:36-6:10:37",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json
index b255ecdde..9278c3367 100644
--- a/testdata/d2oracle/TestDelete/layers-basic.exp.json
+++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,0:0:0-6:0:31",
+      "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,0:0:0-7:0:32",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,1:0:2-5:1:30",
+            "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:0:3-6:1:31",
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,1:8:10-5:1:30",
+                "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:8:11-6:1:31",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:2:14-4:3:28",
+                      "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:2:15-5:3:29",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,2:5:17-4:3:28",
+                          "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:5:18-5:3:29",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24",
+                                "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "b",
@@ -244,11 +244,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json
index 870c452a0..987593d7c 100644
--- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json
+++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,0:0:0-6:0:34",
+      "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,0:0:0-7:0:35",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,1:0:2-5:1:33",
+            "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:0:3-6:1:34",
             "key": {
-              "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,1:0:2-1:9:11",
+              "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:0:3-2:9:12",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,1:0:2-1:9:11",
+                    "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:0:3-2:9:12",
                     "value": [
                       {
                         "string": "scenarios",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,1:11:13-5:1:33",
+                "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:11:14-6:1:34",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:2:17-4:3:31",
+                      "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:2:18-5:3:32",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:2:17-2:3:18",
+                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:2:18-3:3:19",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:2:17-2:3:18",
+                              "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:2:18-3:3:19",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,2:5:20-4:3:31",
+                          "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:5:21-5:3:32",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27",
+                                "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27",
+                                  "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27",
+                                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28",
                                         "value": [
                                           {
                                             "string": "b",
@@ -311,11 +311,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27",
+                  "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,3:4:26-3:5:27",
+                        "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json
index 4d166d56b..bf5bea56b 100644
--- a/testdata/d2oracle/TestMove/layers-basic.exp.json
+++ b/testdata/d2oracle/TestMove/layers-basic.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,0:0:0-8:0:48",
+      "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,0:0:0-9:0:49",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,1:0:2-7:1:47",
+            "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:0:3-8:1:48",
             "key": {
-              "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,1:8:10-7:1:47",
+                "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:8:11-8:1:48",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:2:14-6:3:45",
+                      "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:2:15-7:3:46",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,2:5:17-6:3:45",
+                          "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:5:18-7:3:46",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-5:5:41",
+                                "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-6:5:42",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "b",
@@ -98,17 +98,17 @@
                                 "primary": {},
                                 "value": {
                                   "map": {
-                                    "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:7:26-5:5:41",
+                                    "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:7:27-6:5:42",
                                     "nodes": [
                                       {
                                         "map_key": {
-                                          "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35",
+                                          "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36",
                                           "key": {
-                                            "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35",
+                                            "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36",
                                             "path": [
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35",
+                                                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36",
                                                   "value": [
                                                     {
                                                       "string": "c",
@@ -301,11 +301,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "b",
@@ -346,11 +346,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35",
+                  "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:6:34-4:7:35",
+                        "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36",
                         "value": [
                           {
                             "string": "c",
diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json
index c6b4a4570..b6e8eafa6 100644
--- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,0:0:0-7:0:56",
+      "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,0:0:0-8:0:57",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,1:0:2-6:1:55",
+            "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:0:3-7:1:56",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,1:8:10-6:1:55",
+                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:8:11-7:1:56",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:2:14-5:3:53",
+                      "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:2:15-6:3:54",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,2:5:17-5:3:53",
+                          "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:5:18-6:3:54",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24",
+                                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "b",
@@ -101,13 +101,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:24:49",
+                                "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:24:50",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:19:44",
+                                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:19:45",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:5:30",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:5:31",
                                         "value": [
                                           {
                                             "string": "a",
@@ -118,7 +118,7 @@
                                     },
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:6:31-4:11:36",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:6:32-5:11:37",
                                         "value": [
                                           {
                                             "string": "style",
@@ -129,7 +129,7 @@
                                     },
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:12:37-4:19:44",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:12:38-5:19:45",
                                         "value": [
                                           {
                                             "string": "opacity",
@@ -143,7 +143,7 @@
                                 "primary": {},
                                 "value": {
                                   "number": {
-                                    "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:21:46-4:24:49",
+                                    "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:21:47-5:24:50",
                                     "raw": "0.2",
                                     "value": "1/5"
                                   }
@@ -328,7 +328,7 @@
                                     },
                                     "primary": {
                                       "number": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:21:46-4:24:49",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:21:47-5:24:50",
                                         "raw": "0.2",
                                         "value": "1/5"
                                       }
@@ -379,11 +379,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "b",
@@ -424,11 +424,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:19:44",
+                  "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:19:45",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:29-4:5:30",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:5:31",
                         "value": [
                           {
                             "string": "a",
@@ -439,7 +439,7 @@
                     },
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:6:31-4:11:36",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:6:32-5:11:37",
                         "value": [
                           {
                             "string": "style",
@@ -450,7 +450,7 @@
                     },
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:12:37-4:19:44",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:12:38-5:19:45",
                         "value": [
                           {
                             "string": "opacity",
diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json
index 4acba418d..fc68d6cdf 100644
--- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,0:0:0-6:0:53",
+      "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,0:0:0-7:0:54",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,1:0:2-5:1:52",
+            "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:0:3-6:1:53",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,1:0:2-1:6:8",
+              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:0:3-2:6:9",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,1:0:2-1:6:8",
+                    "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:0:3-2:6:9",
                     "value": [
                       {
                         "string": "layers",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,1:8:10-5:1:52",
+                "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:8:11-6:1:53",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:2:14-4:3:50",
+                      "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:2:15-5:3:51",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:2:14-2:3:15",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:2:15-3:3:16",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:2:14-2:3:15",
+                              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:2:15-3:3:16",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,2:5:17-4:3:50",
+                          "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:5:18-5:3:51",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:27:46",
+                                "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:27:47",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24",
+                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25",
                                         "value": [
                                           {
                                             "string": "a",
@@ -98,17 +98,17 @@
                                 "primary": {},
                                 "value": {
                                   "map": {
-                                    "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:7:26-3:27:46",
+                                    "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:7:27-4:27:47",
                                     "nodes": [
                                       {
                                         "map_key": {
-                                          "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:26:45",
+                                          "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:8:28-4:26:46",
                                           "key": {
-                                            "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:21:40",
+                                            "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:8:28-4:21:41",
                                             "path": [
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:8:27-3:13:32",
+                                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:8:28-4:13:33",
                                                   "value": [
                                                     {
                                                       "string": "style",
@@ -119,7 +119,7 @@
                                               },
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:14:33-3:21:40",
+                                                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:14:34-4:21:41",
                                                   "value": [
                                                     {
                                                       "string": "opacity",
@@ -133,7 +133,7 @@
                                           "primary": {},
                                           "value": {
                                             "number": {
-                                              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:23:42-3:26:45",
+                                              "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:23:43-4:26:46",
                                               "raw": "0.2",
                                               "value": "1/5"
                                             }
@@ -301,7 +301,7 @@
                                     },
                                     "primary": {
                                       "number": {
-                                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:23:42-3:26:45",
+                                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:23:43-4:26:46",
                                         "raw": "0.2",
                                         "value": "1/5"
                                       }
@@ -352,11 +352,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24",
+                  "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,3:4:23-3:5:24",
+                        "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25",
                         "value": [
                           {
                             "string": "a",
diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
index 5760a1fd4..9dd6fd8f1 100644
--- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,0:0:0-9:0:69",
+      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,0:0:0-10:0:70",
       "nodes": [
         {
           "map_key": {
@@ -76,13 +76,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,3:0:28-8:1:68",
+            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:0:29-9:1:69",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,3:0:28-3:9:37",
+              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:0:29-4:9:38",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,3:0:28-3:9:37",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:0:29-4:9:38",
                     "value": [
                       {
                         "string": "scenarios",
@@ -96,17 +96,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,3:11:39-8:1:68",
+                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:11:40-9:1:69",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:2:43-7:3:66",
+                      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:2:44-8:3:67",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:2:43-4:3:44",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:2:44-5:3:45",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:2:43-4:3:44",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:2:44-5:3:45",
                               "value": [
                                 {
                                   "string": "x",
@@ -120,17 +120,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,4:5:46-7:3:66",
+                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:5:47-8:3:67",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54",
                                         "value": [
                                           {
                                             "string": "b",
@@ -147,13 +147,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:8:62",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:4:59-7:8:63",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:4:59-7:5:60",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:4:59-7:5:60",
                                         "value": [
                                           {
                                             "string": "a",
@@ -167,7 +167,7 @@
                                 "primary": {},
                                 "value": {
                                   "unquoted_string": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:7:61-6:8:62",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63",
                                     "value": [
                                       {
                                         "string": "b",
@@ -292,7 +292,7 @@
                 },
                 "primary": {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:7:61-6:8:62",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63",
                     "value": [
                       {
                         "string": "b",
@@ -441,11 +441,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:4:59-7:5:60",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:58-6:5:59",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:4:59-7:5:60",
                         "value": [
                           {
                             "string": "a",
@@ -490,11 +490,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,5:4:52-5:5:53",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json
index 84de4b425..8399c247e 100644
--- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,0:0:0-10:0:96",
+      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,0:0:0-11:0:97",
       "nodes": [
         {
           "map_key": {
@@ -76,13 +76,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,3:0:28-9:1:95",
+            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:0:29-10:1:96",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,3:0:28-3:9:37",
+              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:0:29-4:9:38",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,3:0:28-3:9:37",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:0:29-4:9:38",
                     "value": [
                       {
                         "string": "scenarios",
@@ -96,17 +96,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,3:11:39-9:1:95",
+                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:11:40-10:1:96",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:2:43-8:3:93",
+                      "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:2:44-9:3:94",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:2:43-4:3:44",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:2:44-5:3:45",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:2:43-4:3:44",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:2:44-5:3:45",
                               "value": [
                                 {
                                   "string": "x",
@@ -120,17 +120,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,4:5:46-8:3:93",
+                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:5:47-9:3:94",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-7:5:89",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:4:53-8:5:90",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:4:53-6:5:54",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:4:53-6:5:54",
                                         "value": [
                                           {
                                             "string": "a",
@@ -143,7 +143,7 @@
                                 },
                                 "primary": {
                                   "unquoted_string": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:7:55-5:8:56",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:7:56-6:8:57",
                                     "value": [
                                       {
                                         "string": "b",
@@ -154,17 +154,17 @@
                                 },
                                 "value": {
                                   "map": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:9:57-7:5:89",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:9:58-8:5:90",
                                     "nodes": [
                                       {
                                         "map_key": {
-                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:24:83",
+                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:6:66-7:24:84",
                                           "key": {
-                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:19:78",
+                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:6:66-7:19:79",
                                             "path": [
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:6:65-6:11:70",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:6:66-7:11:71",
                                                   "value": [
                                                     {
                                                       "string": "style",
@@ -175,7 +175,7 @@
                                               },
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:12:71-6:19:78",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:12:72-7:19:79",
                                                   "value": [
                                                     {
                                                       "string": "opacity",
@@ -189,7 +189,7 @@
                                           "primary": {},
                                           "value": {
                                             "number": {
-                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:21:80-6:24:83",
+                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:21:81-7:24:84",
                                               "raw": "0.3",
                                               "value": "3/10"
                                             }
@@ -315,7 +315,7 @@
                 },
                 "primary": {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:7:55-5:8:56",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:7:56-6:8:57",
                     "value": [
                       {
                         "string": "b",
@@ -371,7 +371,7 @@
                                     },
                                     "primary": {
                                       "number": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:21:80-6:24:83",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,7:21:81-7:24:84",
                                         "raw": "0.3",
                                         "value": "3/10"
                                       }
@@ -442,11 +442,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:4:53-6:5:54",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,5:4:52-5:5:53",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,6:4:53-6:5:54",
                         "value": [
                           {
                             "string": "a",
diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json
index d8941e11b..10d0c34ab 100644
--- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,0:0:0-10:0:95",
+      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,0:0:0-11:0:96",
       "nodes": [
         {
           "map_key": {
@@ -69,13 +69,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,3:0:18-9:1:94",
+            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:0:19-10:1:95",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,3:0:18-3:9:27",
+              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:0:19-4:9:28",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,3:0:18-3:9:27",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:0:19-4:9:28",
                     "value": [
                       {
                         "string": "scenarios",
@@ -89,17 +89,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,3:11:29-9:1:94",
+                "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:11:30-10:1:95",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:2:33-8:3:92",
+                      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:2:34-9:3:93",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:2:33-4:3:34",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:2:34-5:3:35",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:2:33-4:3:34",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:2:34-5:3:35",
                               "value": [
                                 {
                                   "string": "x",
@@ -113,17 +113,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,4:5:36-8:3:92",
+                          "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:5:37-9:3:93",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-7:5:88",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:4:43-8:5:89",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:4:43-6:5:44",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:4:43-6:5:44",
                                         "value": [
                                           {
                                             "string": "a",
@@ -137,17 +137,17 @@
                                 "primary": {},
                                 "value": {
                                   "map": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:7:45-7:5:88",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:7:46-8:5:89",
                                     "nodes": [
                                       {
                                         "map_key": {
-                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:35:82",
+                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:6:54-7:35:83",
                                           "key": {
-                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54",
+                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:6:54-7:7:55",
                                             "path": [
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:6:54-7:7:55",
                                                   "value": [
                                                     {
                                                       "string": "b",
@@ -160,7 +160,7 @@
                                           },
                                           "primary": {
                                             "unquoted_string": {
-                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:9:56-6:14:61",
+                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:9:57-7:14:62",
                                               "value": [
                                                 {
                                                   "string": "inner",
@@ -171,17 +171,17 @@
                                           },
                                           "value": {
                                             "map": {
-                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:15:62-6:35:82",
+                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:15:63-7:35:83",
                                               "nodes": [
                                                 {
                                                   "map_key": {
-                                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:34:81",
+                                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:16:64-7:34:82",
                                                     "key": {
-                                                      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:29:76",
+                                                      "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:16:64-7:29:77",
                                                       "path": [
                                                         {
                                                           "unquoted_string": {
-                                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:16:63-6:21:68",
+                                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:16:64-7:21:69",
                                                             "value": [
                                                               {
                                                                 "string": "style",
@@ -192,7 +192,7 @@
                                                         },
                                                         {
                                                           "unquoted_string": {
-                                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:22:69-6:29:76",
+                                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:22:70-7:29:77",
                                                             "value": [
                                                               {
                                                                 "string": "opacity",
@@ -206,7 +206,7 @@
                                                     "primary": {},
                                                     "value": {
                                                       "number": {
-                                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:31:78-6:34:81",
+                                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:31:79-7:34:82",
                                                         "raw": "0.2",
                                                         "value": "1/5"
                                                       }
@@ -401,7 +401,7 @@
                           },
                           "primary": {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:9:56-6:14:61",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:9:57-7:14:62",
                               "value": [
                                 {
                                   "string": "inner",
@@ -457,7 +457,7 @@
                                               },
                                               "primary": {
                                                 "number": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:31:78-6:34:81",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:31:79-7:34:82",
                                                   "raw": "0.2",
                                                   "value": "1/5"
                                                 }
@@ -533,11 +533,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:4:43-6:5:44",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,5:4:42-5:5:43",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:4:43-6:5:44",
                         "value": [
                           {
                             "string": "a",
@@ -598,11 +598,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:6:54-7:7:55",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,6:6:53-6:7:54",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:6:54-7:7:55",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json
index 35d7bc74d..1b3c4bce4 100644
--- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,0:0:0-7:0:59",
+      "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,0:0:0-8:0:60",
       "nodes": [
         {
           "map_key": {
@@ -30,13 +30,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,1:0:2-6:1:58",
+            "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:0:3-7:1:59",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,1:0:2-1:9:11",
+              "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:0:3-2:9:12",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,1:0:2-1:9:11",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:0:3-2:9:12",
                     "value": [
                       {
                         "string": "scenarios",
@@ -50,17 +50,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,1:11:13-6:1:58",
+                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:11:14-7:1:59",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:2:17-5:3:56",
+                      "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:2:18-6:3:57",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:2:17-2:3:18",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:2:18-3:3:19",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:2:17-2:3:18",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:2:18-3:3:19",
                               "value": [
                                 {
                                   "string": "x",
@@ -74,17 +74,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,2:5:20-5:3:56",
+                          "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:5:21-6:3:57",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28",
                                         "value": [
                                           {
                                             "string": "b",
@@ -101,13 +101,13 @@
                             },
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:24:52",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:4:33-5:24:53",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:19:47",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:4:33-5:19:48",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:5:33",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:4:33-5:5:34",
                                         "value": [
                                           {
                                             "string": "a",
@@ -118,7 +118,7 @@
                                     },
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:6:34-4:11:39",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:6:35-5:11:40",
                                         "value": [
                                           {
                                             "string": "style",
@@ -129,7 +129,7 @@
                                     },
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:12:40-4:19:47",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:12:41-5:19:48",
                                         "value": [
                                           {
                                             "string": "opacity",
@@ -143,7 +143,7 @@
                                 "primary": {},
                                 "value": {
                                   "number": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:21:49-4:24:52",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:21:50-5:24:53",
                                     "raw": "0.2",
                                     "value": "1/5"
                                   }
@@ -306,7 +306,7 @@
                                     },
                                     "primary": {
                                       "number": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:21:49-4:24:52",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:21:50-5:24:53",
                                         "raw": "0.2",
                                         "value": "1/5"
                                       }
@@ -399,11 +399,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:19:47",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:4:33-5:19:48",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:32-4:5:33",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:4:33-5:5:34",
                         "value": [
                           {
                             "string": "a",
@@ -414,7 +414,7 @@
                     },
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:6:34-4:11:39",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:6:35-5:11:40",
                         "value": [
                           {
                             "string": "style",
@@ -425,7 +425,7 @@
                     },
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:12:40-4:19:47",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:12:41-5:19:48",
                         "value": [
                           {
                             "string": "opacity",
@@ -470,11 +470,11 @@
             "references": [
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,3:4:26-3:5:27",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28",
                         "value": [
                           {
                             "string": "b",
diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
index 3f4ab6c7a..446504d3b 100644
--- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
@@ -3,7 +3,7 @@
     "name": "",
     "isFolderOnly": false,
     "ast": {
-      "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-6:0:69",
+      "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-7:0:70",
       "nodes": [
         {
           "map_key": {
@@ -40,13 +40,13 @@
         },
         {
           "map_key": {
-            "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,1:0:9-5:1:68",
+            "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:0:10-6:1:69",
             "key": {
-              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,1:0:9-1:9:18",
+              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:0:10-2:9:19",
               "path": [
                 {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,1:0:9-1:9:18",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:0:10-2:9:19",
                     "value": [
                       {
                         "string": "scenarios",
@@ -60,17 +60,17 @@
             "primary": {},
             "value": {
               "map": {
-                "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,1:11:20-5:1:68",
+                "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:11:21-6:1:69",
                 "nodes": [
                   {
                     "map_key": {
-                      "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:2:24-4:3:66",
+                      "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:2:25-5:3:67",
                       "key": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:2:24-2:3:25",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:2:25-3:3:26",
                         "path": [
                           {
                             "unquoted_string": {
-                              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:2:24-2:3:25",
+                              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:2:25-3:3:26",
                               "value": [
                                 {
                                   "string": "x",
@@ -84,17 +84,17 @@
                       "primary": {},
                       "value": {
                         "map": {
-                          "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,2:5:27-4:3:66",
+                          "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:5:28-5:3:67",
                           "nodes": [
                             {
                               "map_key": {
-                                "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:33:62",
+                                "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:4:34-4:33:63",
                                 "key": {
-                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34",
+                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:4:34-4:5:35",
                                   "path": [
                                     {
                                       "unquoted_string": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:4:34-4:5:35",
                                         "value": [
                                           {
                                             "string": "a",
@@ -107,7 +107,7 @@
                                 },
                                 "primary": {
                                   "unquoted_string": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:7:36-3:12:41",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:7:37-4:12:42",
                                     "value": [
                                       {
                                         "string": "inner",
@@ -118,17 +118,17 @@
                                 },
                                 "value": {
                                   "map": {
-                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:13:42-3:33:62",
+                                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:13:43-4:33:63",
                                     "nodes": [
                                       {
                                         "map_key": {
-                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:32:61",
+                                          "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:14:44-4:32:62",
                                           "key": {
-                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:27:56",
+                                            "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:14:44-4:27:57",
                                             "path": [
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:14:43-3:19:48",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:14:44-4:19:49",
                                                   "value": [
                                                     {
                                                       "string": "style",
@@ -139,7 +139,7 @@
                                               },
                                               {
                                                 "unquoted_string": {
-                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:20:49-3:27:56",
+                                                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:20:50-4:27:57",
                                                   "value": [
                                                     {
                                                       "string": "opacity",
@@ -153,7 +153,7 @@
                                           "primary": {},
                                           "value": {
                                             "number": {
-                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:29:58-3:32:61",
+                                              "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:29:59-4:32:62",
                                               "raw": "0.2",
                                               "value": "1/5"
                                             }
@@ -275,7 +275,7 @@
                 },
                 "primary": {
                   "unquoted_string": {
-                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:7:36-3:12:41",
+                    "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:7:37-4:12:42",
                     "value": [
                       {
                         "string": "inner",
@@ -331,7 +331,7 @@
                                     },
                                     "primary": {
                                       "number": {
-                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:29:58-3:32:61",
+                                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:29:59-4:32:62",
                                         "raw": "0.2",
                                         "value": "1/5"
                                       }
@@ -402,11 +402,11 @@
               },
               {
                 "key": {
-                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34",
+                  "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:4:34-4:5:35",
                   "path": [
                     {
                       "unquoted_string": {
-                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,3:4:33-3:5:34",
+                        "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:4:34-4:5:35",
                         "value": [
                           {
                             "string": "a",