From 78e9e4565e93ceb8aa75398fe4a70fec3f76c535 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Tue, 11 Jul 2023 13:52:29 -0700
Subject: [PATCH] only coalesce if subbed

---
 d2ir/compile.go                               |  11 +-
 .../TestCLI_E2E/internal_linked_pdf.exp.pdf   | Bin 80096 -> 80096 bytes
 .../TestCompile/array-classes.exp.json        |  15 +-
 .../TestCompile/basic_icon.exp.json           |   3 +-
 .../TestCompile/basic_sequence.exp.json       |   3 +-
 .../TestCompile/basic_shape.exp.json          |   3 +-
 .../TestCompile/class-shape-class.exp.json    |   9 +-
 .../TestCompile/class_paren.exp.json          |   9 +-
 .../TestCompile/class_style.exp.json          |   6 +-
 .../d2compiler/TestCompile/classes.exp.json   |  33 ++-
 .../dimensions_on_containers.exp.json         |  24 +-
 .../dimensions_on_nonimage.exp.json           |   3 +-
 .../edge_arrowhead_fields.exp.json            |   6 +-
 .../edge_arrowhead_primary.exp.json           |   3 +-
 .../TestCompile/edge_chain.exp.json           |   3 +-
 .../TestCompile/edge_chain_map.exp.json       |   3 +-
 .../TestCompile/edge_column_index.exp.json    |  18 +-
 .../TestCompile/edge_flat_arrowhead.exp.json  |   3 +-
 .../edge_flat_label_arrowhead.exp.json        |   3 +-
 .../TestCompile/edge_index.exp.json           |   6 +-
 .../TestCompile/edge_index_map.exp.json       |   3 +-
 .../TestCompile/edge_index_nested.exp.json    |   6 +-
 .../edge_index_nested_cross_scope.exp.json    |   6 +-
 .../d2compiler/TestCompile/edge_map.exp.json  |   3 +-
 .../TestCompile/edge_map_arrowhead.exp.json   |   3 +-
 .../TestCompile/edge_mixed_arrowhead.exp.json |   6 +-
 .../edge_non_shape_arrowhead.exp.json         |   3 +-
 .../edge_semiflat_arrowhead.exp.json          |   3 +-
 .../TestCompile/fill-pattern.exp.json         |   3 +-
 .../icon-near-composite-together.exp.json     |   3 +-
 .../TestCompile/image_style.exp.json          |   9 +-
 .../label-near-composite-separate.exp.json    |   6 +-
 .../label-near-composite-together.exp.json    |   3 +-
 .../TestCompile/label-near-parent.exp.json    |   3 +-
 .../TestCompile/link-board-mixed.exp.json     |  18 +-
 .../TestCompile/missing-class.exp.json        |   3 +-
 .../TestCompile/near_constant.exp.json        |   3 +-
 .../TestCompile/nested-array-classes.exp.json |   3 +-
 .../TestCompile/nested_sql.exp.json           |   9 +-
 .../d2compiler/TestCompile/path_link.exp.json |   3 +-
 .../TestCompile/reordered-classes.exp.json    |   9 +-
 .../reserved_icon_near_style.exp.json         |  12 +-
 .../TestCompile/root_direction.exp.json       |   3 +-
 .../TestCompile/root_sequence.exp.json        |   3 +-
 .../TestCompile/sequence-timestamp.exp.json   |   3 +-
 .../TestCompile/sequence_container.exp.json   |   3 +-
 .../TestCompile/sequence_container_2.exp.json |   3 +-
 .../sequence_grouped_note.exp.json            |   3 +-
 .../TestCompile/sequence_scoping.exp.json     |   3 +-
 .../TestCompile/set_direction.exp.json        |   3 +-
 .../single_dimension_on_circle.exp.json       |   3 +-
 .../TestCompile/sql-constraints.exp.json      |   6 +-
 .../TestCompile/sql-regression.exp.json       |   6 +-
 .../d2compiler/TestCompile/sql_paren.exp.json |   9 +-
 .../table_connection_attr.exp.json            |   6 +-
 .../TestCompile/table_style.exp.json          |   6 +-
 .../TestCompile/table_style_map.exp.json      |   9 +-
 .../TestCompile/text-transform.exp.json       |  12 +-
 .../underscore_edge_existing.exp.json         |   6 +-
 .../underscore_edge_index.exp.json            |   6 +-
 .../underscore_parent_preference_1.exp.json   |   6 +-
 .../underscore_parent_preference_2.exp.json   |   6 +-
 .../d2compiler/TestCompile/url_link.exp.json  |   3 +-
 ..._and_not_url_tooltip_concurrently.exp.json |   6 +-
 .../url_link_non_url_tooltip_ok.exp.json      |   6 +-
 .../TestCompile/url_tooltip.exp.json          |   3 +-
 .../TestCompile/wrong_column_index.exp.json   |  33 ++-
 .../TestCompile2/boards/isFolderOnly.exp.json |   9 +-
 .../TestCompile2/vars/basic/combined.exp.json |   3 +-
 .../vars/basic/double-quoted.exp.json         |   3 +-
 .../vars/basic/edge_label.exp.json            |   3 +-
 .../TestCompile2/vars/basic/label.exp.json    |   3 +-
 .../TestCompile2/vars/basic/nested.exp.json   |   3 +-
 .../vars/basic/single-quoted.exp.json         |   3 +-
 .../TestCompile2/vars/basic/style.exp.json    |   3 +-
 .../TestCompile2/vars/boards/layer.exp.json   |   6 +-
 .../TestCompile2/vars/boards/overlay.exp.json |  21 +-
 .../TestCompile2/vars/boards/replace.exp.json |   9 +-
 .../vars/boards/scenario.exp.json             |   6 +-
 .../TestCompile2/vars/override/label.exp.json |   6 +-
 .../d2ir/TestCompile/classes/basic.exp.json   |  15 +-
 .../TestCompile/classes/inherited.exp.json    | 240 ++++++++++++------
 .../TestCompile/classes/layer-modify.exp.json |  48 ++--
 .../d2ir/TestCompile/classes/merge.exp.json   |  30 ++-
 .../d2ir/TestCompile/classes/nested.exp.json  |  45 ++--
 .../d2ir/TestCompile/fields/label.exp.json    |   6 +-
 .../d2ir/TestCompile/fields/nested.exp.json   |   9 +-
 .../TestCompile/imports/nested/map.exp.json   |  12 +-
 .../imports/nested/scalar.exp.json            |   3 +-
 .../d2ir/TestCompile/imports/spread.exp.json  |   6 +-
 .../d2ir/TestCompile/imports/value.exp.json   |  12 +-
 .../d2ir/TestCompile/imports/vars/1.exp.json  |   9 +-
 .../TestCreate/make_scope_multiline.exp.json  |   3 +-
 .../make_scope_multiline_spacing_1.exp.json   |   3 +-
 .../make_scope_multiline_spacing_2.exp.json   |   3 +-
 .../TestDelete/arrowhead_label.exp.json       |   3 +-
 testdata/d2oracle/TestDelete/chaos_1.exp.json |   9 +-
 .../children_edge_conflicts.exp.json          |   3 +-
 .../children_edges_flat_conflicts.exp.json    |   6 +-
 .../children_flat_conflicts.exp.json          |   3 +-
 .../children_multiple_conflicts.exp.json      |   3 +-
 ...ldren_nested_referenced_conflicts.exp.json |   6 +-
 .../children_referenced_conflicts.exp.json    |   3 +-
 .../TestDelete/container_near.exp.json        |   6 +-
 .../delete_container_of_near.exp.json         |   6 +-
 .../d2oracle/TestDelete/delete_icon.exp.json  |   3 +-
 .../TestDelete/edge_decrement.exp.json        |  12 +-
 .../d2oracle/TestDelete/multi_near.exp.json   |   6 +-
 .../only_delete_edge_reserved.exp.json        |   3 +-
 .../only_delete_obj_reserved.exp.json         |   3 +-
 .../d2oracle/TestDelete/save_map.exp.json     |   3 +-
 .../TestDelete/save_map_with_primary.exp.json |   3 +-
 .../TestDelete/shape_sql_table.exp.json       |   6 +-
 .../d2oracle/TestDelete/table_refs.exp.json   |   3 +-
 .../TestMove/append_multiple_styles.exp.json  |   3 +-
 .../container_conflicts_generated.exp.json    |  18 +-
 .../d2oracle/TestMove/container_near.exp.json |   3 +-
 testdata/d2oracle/TestMove/duplicate.exp.json |   3 +-
 .../d2oracle/TestMove/flat_merge.exp.json     |   3 +-
 testdata/d2oracle/TestMove/flat_near.exp.json |   3 +-
 .../flat_reparent_with_map_value.exp.json     |   3 +-
 ...lat_reparent_with_mixed_map_value.exp.json |   3 +-
 .../flat_reparent_with_value.exp.json         |   3 +-
 .../d2oracle/TestMove/flat_style.exp.json     |   3 +-
 testdata/d2oracle/TestMove/gnarly_1.exp.json  |   6 +-
 .../include_descendants_near.exp.json         |   3 +-
 ...ude_descendants_nested_reserved_2.exp.json |   3 +-
 ...ude_descendants_nested_reserved_3.exp.json |   3 +-
 .../TestMove/include_descendants_sql.exp.json |   6 +-
 .../into_container_with_flat_keys.exp.json    |   6 +-
 .../d2oracle/TestMove/map_transplant.exp.json |   3 +-
 .../d2oracle/TestMove/map_with_label.exp.json |   3 +-
 .../d2oracle/TestMove/merge_reserved.exp.json |   6 +-
 testdata/d2oracle/TestMove/near.exp.json      |   3 +-
 .../TestMove/nested_reserved_2.exp.json       |   3 +-
 .../TestMove/nested_reserved_3.exp.json       |   3 +-
 .../d2oracle/TestMove/parentheses.exp.json    |   6 +-
 .../d2oracle/TestMove/slice_style.exp.json    |   3 +-
 .../TestMove/underscore_merge.exp.json        |   6 +-
 .../TestReconnectEdge/indexed_ref.exp.json    |   3 +-
 .../preserve_old_obj.exp.json                 |   3 +-
 .../TestReconnectEdge/second_index.exp.json   |   6 +-
 .../d2oracle/TestRename/container.exp.json    |   9 +-
 testdata/d2oracle/TestRename/edges.exp.json   |   3 +-
 testdata/d2oracle/TestRename/near.exp.json    |   3 +-
 .../d2oracle/TestSet/classes-style.exp.json   |   9 +-
 .../TestSet/dupe-classes-style.exp.json       |   9 +-
 testdata/d2oracle/TestSet/edge.exp.json       |   3 +-
 testdata/d2oracle/TestSet/edge_chain.exp.json |   6 +-
 .../TestSet/edge_chain_nested_set.exp.json    |   3 +-
 .../edge_flat_merge_arrowhead.exp.json        |   3 +-
 .../d2oracle/TestSet/edge_index_case.exp.json |   3 +-
 .../TestSet/edge_index_nested.exp.json        |   3 +-
 .../TestSet/edge_merge_arrowhead.exp.json     |   3 +-
 .../TestSet/edge_nested_label_set.exp.json    |   3 +-
 .../TestSet/edge_replace_arrowhead.exp.json   |   3 +-
 .../edge_replace_arrowhead_indexed.exp.json   |   3 +-
 .../TestSet/edge_set_arrowhead.exp.json       |   3 +-
 testdata/d2oracle/TestSet/icon.exp.json       |   3 +-
 .../d2oracle/TestSet/inline_style.exp.json    |   3 +-
 testdata/d2oracle/TestSet/label.exp.json      |   3 +-
 .../d2oracle/TestSet/label_replace.exp.json   |   3 +-
 .../d2oracle/TestSet/map_key_missing.exp.json |   3 +-
 .../d2oracle/TestSet/nested_alex.exp.json     |   9 +-
 .../TestSet/replace_arrowhead.exp.json        |   3 +-
 .../TestSet/replace_arrowhead_map.exp.json    |   3 +-
 .../TestSet/replace_fill_pattern.exp.json     |   3 +-
 .../d2oracle/TestSet/replace_link.exp.json    |   3 +-
 .../d2oracle/TestSet/replace_shape.exp.json   |   3 +-
 .../TestSet/replace_style_edgecase.exp.json   |   3 +-
 .../d2oracle/TestSet/replace_tooltip.exp.json |   3 +-
 .../TestSet/scenarios-arrowhead.exp.json      |   9 +-
 .../scenarios-label-primary-missing.exp.json  |   6 +-
 ...scenarios-nested-usable-ref-style.exp.json |   3 +-
 .../scenarios-usable-ref-style.exp.json       |   3 +-
 .../TestSet/set_fill_pattern.exp.json         |   3 +-
 .../d2oracle/TestSet/set_tooltip.exp.json     |   3 +-
 testdata/d2oracle/TestSet/shape.exp.json      |   3 +-
 .../unapplied-classes-style-2.exp.json        |   6 +-
 .../TestSet/unapplied-classes-style.exp.json  |   6 +-
 180 files changed, 869 insertions(+), 459 deletions(-)

diff --git a/d2ir/compile.go b/d2ir/compile.go
index 9b880b767..90c21d060 100644
--- a/d2ir/compile.go
+++ b/d2ir/compile.go
@@ -108,6 +108,7 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) {
 		varsMap = vars.Map()
 	}
 
+	subbed := false
 	switch {
 	case refctx.Key.Value.UnquotedString != nil:
 		for i, box := range refctx.Key.Value.UnquotedString.Value {
@@ -115,20 +116,26 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) {
 				resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution)
 				if resolvedField != nil {
 					refctx.Key.Value.UnquotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String())
+					subbed = true
 				}
 			}
 		}
-		refctx.Key.Value.UnquotedString.Coalesce()
+		if subbed {
+			refctx.Key.Value.UnquotedString.Coalesce()
+		}
 	case refctx.Key.Value.DoubleQuotedString != nil:
 		for i, box := range refctx.Key.Value.DoubleQuotedString.Value {
 			if box.Substitution != nil {
 				resolvedField := c.resolveSubstitution(varsMap, refctx.Key, box.Substitution)
 				if resolvedField != nil {
 					refctx.Key.Value.DoubleQuotedString.Value[i].String = go2.Pointer(resolvedField.Primary().String())
+					subbed = true
 				}
 			}
 		}
-		refctx.Key.Value.DoubleQuotedString.Coalesce()
+		if subbed {
+			refctx.Key.Value.DoubleQuotedString.Coalesce()
+		}
 	}
 }
 
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index c3f44895dd54e116e5a1400d3a6fee089be81b9d..7f3e137b3e86af39639573844a36ae259461e050 100644
GIT binary patch
delta 50
zcmaFxk>$ZhmWC~iPfZm}4NNUHx%7SWQ(O{DQWZ2@tc(ndj19~U4GoP!a@$$W7;iHH
E0LMZPN&o-=

delta 50
zcmaFxk>$ZhmWC~iPfZm}OpMGlx%7SWQ(O{DQWZ2@tc(ndj19~U4GoP!a@$$W7;iHH
E0LI7<L;wH)

diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json
index dc757ba5e..55f49e18a 100644
--- a/testdata/d2compiler/TestCompile/array-classes.exp.json
+++ b/testdata/d2compiler/TestCompile/array-classes.exp.json
@@ -76,11 +76,7 @@
                                 "value": {
                                   "double_quoted_string": {
                                     "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,2:11:39-2:13:41",
-                                    "value": [
-                                      {
-                                        "string": ""
-                                      }
-                                    ]
+                                    "value": null
                                   }
                                 }
                               }
@@ -110,7 +106,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,3:11:53-3:17:59",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
@@ -153,7 +150,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,4:16:76-4:22:82",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -214,7 +212,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/array-classes.d2,7:11:108-7:17:114",
                                     "value": [
                                       {
-                                        "string": "then"
+                                        "string": "then",
+                                        "raw_string": "then"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json
index eab1c4dec..c4e7552f6 100644
--- a/testdata/d2compiler/TestCompile/basic_icon.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json
@@ -59,7 +59,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/basic_icon.d2,1:8:18-1:64:74",
                           "value": [
                             {
-                              "string": "https://icons.terrastruct.com/essentials/004-picture.svg"
+                              "string": "https://icons.terrastruct.com/essentials/004-picture.svg",
+                              "raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
index 16840f3df..f5e4620d6 100644
--- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/basic_sequence.d2,1:9:14-1:25:30",
                           "value": [
                             {
-                              "string": "sequence_diagram"
+                              "string": "sequence_diagram",
+                              "raw_string": "sequence_diagram"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json
index d15fdb390..ff306f1c4 100644
--- a/testdata/d2compiler/TestCompile/basic_shape.exp.json
+++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/basic_shape.d2,2:9:15-2:15:21",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json
index 0e3f13227..049d4ed34 100644
--- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json
+++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,2:11:38-2:16:43",
                                     "value": [
                                       {
-                                        "string": "class"
+                                        "string": "class",
+                                        "raw_string": "class"
                                       }
                                     ]
                                   }
@@ -144,7 +145,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,7:9:70-7:19:80",
                           "value": [
                             {
-                              "string": "classClass"
+                              "string": "classClass",
+                              "raw_string": "classClass"
                             }
                           ]
                         }
@@ -176,7 +178,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class-shape-class.d2,8:12:93-8:15:96",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json
index c6965fce8..c6b641edc 100644
--- a/testdata/d2compiler/TestCompile/class_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/class_paren.exp.json
@@ -64,7 +64,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,1:9:28-1:14:33",
                           "value": [
                             {
-                              "string": "class"
+                              "string": "class",
+                              "raw_string": "class"
                             }
                           ]
                         }
@@ -119,7 +120,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,4:13:60-4:19:66",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
@@ -151,7 +153,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class_paren.d2,5:8:75-5:12:79",
                           "value": [
                             {
-                              "string": "bool"
+                              "string": "bool",
+                              "raw_string": "bool"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json
index 469bf1f8a..f139da4f2 100644
--- a/testdata/d2compiler/TestCompile/class_style.exp.json
+++ b/testdata/d2compiler/TestCompile/class_style.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,1:9:28-1:16:35",
                           "value": [
                             {
-                              "string": "class"
+                              "string": "class",
+                              "raw_string": "class"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/class_style.d2,2:14:50-2:22:58",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json
index 35438dba3..ac50b12bd 100644
--- a/testdata/d2compiler/TestCompile/classes.exp.json
+++ b/testdata/d2compiler/TestCompile/classes.exp.json
@@ -76,11 +76,7 @@
                                 "value": {
                                   "double_quoted_string": {
                                     "range": "d2/testdata/d2compiler/TestCompile/classes.d2,2:11:39-2:13:41",
-                                    "value": [
-                                      {
-                                        "string": ""
-                                      }
-                                    ]
+                                    "value": null
                                   }
                                 }
                               }
@@ -110,7 +106,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/classes.d2,3:11:53-3:17:59",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
@@ -153,7 +150,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/classes.d2,4:16:76-4:22:82",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -214,7 +212,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/classes.d2,7:11:108-7:17:114",
                                     "value": [
                                       {
-                                        "string": "then"
+                                        "string": "then",
+                                        "raw_string": "then"
                                       }
                                     ]
                                   }
@@ -320,7 +319,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,11:17:164-11:28:175",
                           "value": [
                             {
-                              "string": "dragon_ball"
+                              "string": "dragon_ball",
+                              "raw_string": "dragon_ball"
                             }
                           ]
                         }
@@ -391,7 +391,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:20:198-12:31:209",
                           "value": [
                             {
-                              "string": "dragon_ball"
+                              "string": "dragon_ball",
+                              "raw_string": "dragon_ball"
                             }
                           ]
                         }
@@ -434,7 +435,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,12:45:223-12:48:226",
                           "value": [
                             {
-                              "string": "red"
+                              "string": "red",
+                              "raw_string": "red"
                             }
                           ]
                         }
@@ -495,7 +497,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:16:245-13:20:249",
                           "value": [
                             {
-                              "string": "**"
+                              "string": "**",
+                              "raw_string": "**"
                             }
                           ]
                         }
@@ -527,7 +530,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,13:29:258-13:40:269",
                           "value": [
                             {
-                              "string": "dragon_ball"
+                              "string": "dragon_ball",
+                              "raw_string": "dragon_ball"
                             }
                           ]
                         }
@@ -611,7 +615,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/classes.d2,15:26:299-15:30:303",
                           "value": [
                             {
-                              "string": "path"
+                              "string": "path",
+                              "raw_string": "path"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
index 7be798b03..6072848cd 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,3:9:45-3:15:51",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
@@ -163,7 +164,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,7:10:89-7:17:96",
                                               "value": [
                                                 {
-                                                  "string": "diamond"
+                                                  "string": "diamond",
+                                                  "raw_string": "diamond"
                                                 }
                                               ]
                                             }
@@ -287,7 +289,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,13:9:163-13:16:170",
                                     "value": [
                                       {
-                                        "string": "diamond"
+                                        "string": "diamond",
+                                        "raw_string": "diamond"
                                       }
                                     ]
                                   }
@@ -401,7 +404,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,18:10:221-18:16:227",
                                               "value": [
                                                 {
-                                                  "string": "circle"
+                                                  "string": "circle",
+                                                  "raw_string": "circle"
                                                 }
                                               ]
                                             }
@@ -496,7 +500,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,23:9:277-23:13:281",
                                     "value": [
                                       {
-                                        "string": "oval"
+                                        "string": "oval",
+                                        "raw_string": "oval"
                                       }
                                     ]
                                   }
@@ -610,7 +615,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,28:10:333-28:17:340",
                                               "value": [
                                                 {
-                                                  "string": "hexagon"
+                                                  "string": "hexagon",
+                                                  "raw_string": "hexagon"
                                                 }
                                               ]
                                             }
@@ -734,7 +740,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,34:9:407-34:16:414",
                                     "value": [
                                       {
-                                        "string": "hexagon"
+                                        "string": "hexagon",
+                                        "raw_string": "hexagon"
                                       }
                                     ]
                                   }
@@ -848,7 +855,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_containers.d2,39:10:463-39:14:467",
                                               "value": [
                                                 {
-                                                  "string": "oval"
+                                                  "string": "oval",
+                                                  "raw_string": "oval"
                                                 }
                                               ]
                                             }
diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
index a182d32e9..2aad6eb2d 100644
--- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
+++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json
@@ -59,7 +59,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/dimensions_on_nonimage.d2,1:9:19-1:16:26",
                           "value": [
                             {
-                              "string": "hexagon"
+                              "string": "hexagon",
+                              "raw_string": "hexagon"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
index 0dc322a3f..573bd41bb 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json
@@ -111,7 +111,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,2:11:80-2:18:87",
                                     "value": [
                                       {
-                                        "string": "diamond"
+                                        "string": "diamond",
+                                        "raw_string": "diamond"
                                       }
                                     ]
                                   }
@@ -148,7 +149,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_fields.d2,4:20:112-4:24:116",
                           "value": [
                             {
-                              "string": "QOTD"
+                              "string": "QOTD",
+                              "raw_string": "QOTD"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
index b9ffad1a6..43dbe6934 100644
--- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_arrowhead_primary.d2,1:20:30-1:56:66",
                           "value": [
                             {
-                              "string": "Reisner's Rule of Conceptual Inertia"
+                              "string": "Reisner's Rule of Conceptual Inertia",
+                              "raw_string": "Reisner's Rule of Conceptual Inertia"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json
index 683290ef1..fc3cb532e 100644
--- a/testdata/d2compiler/TestCompile/edge_chain.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json
@@ -90,7 +90,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/edge_chain.d2,1:13:14-1:55:56",
                 "value": [
                   {
-                    "string": "The kids will love our inflatable slides"
+                    "string": "The kids will love our inflatable slides",
+                    "raw_string": "The kids will love our inflatable slides"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
index f6b01e3b1..7b58cb7bd 100644
--- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json
@@ -114,7 +114,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_chain_map.d2,2:9:25-2:88:104",
                           "value": [
                             {
-                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
+                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise.",
+                              "raw_string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
index c0b4d7be4..a1f43e986 100644
--- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:8:15-1:17:24",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:5:30-2:8:33",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -118,7 +120,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:9:43-3:12:46",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -179,7 +182,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:8:65-7:17:74",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -211,7 +215,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:5:80-8:8:83",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -243,7 +248,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:7:91-9:13:97",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
index 5d842efab..50be77f89 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json
@@ -131,7 +131,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/edge_flat_arrowhead.d2,1:36:43-1:43:50",
                 "value": [
                   {
-                    "string": "diamond"
+                    "string": "diamond",
+                    "raw_string": "diamond"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
index 052c0ff53..bccfb9129 100644
--- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json
@@ -94,7 +94,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.d2,2:26:48-2:28:50",
                           "value": [
                             {
-                              "string": "yo"
+                              "string": "yo",
+                              "raw_string": "yo"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json
index 95a7d7d14..dec38ad77 100644
--- a/testdata/d2compiler/TestCompile/edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index.exp.json
@@ -53,7 +53,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,1:8:9-1:11:12",
                 "value": [
                   {
-                    "string": "one"
+                    "string": "one",
+                    "raw_string": "one"
                   }
                 ]
               }
@@ -113,7 +114,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index.d2,2:13:26-2:16:29",
                 "value": [
                   {
-                    "string": "two"
+                    "string": "two",
+                    "raw_string": "two"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
index d97ce029d..14c91274e 100644
--- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json
@@ -128,7 +128,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_map.d2,3:9:32-3:88:111",
                           "value": [
                             {
-                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
+                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise.",
+                              "raw_string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
index 340db8107..6ebba4d34 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,2:9:15-2:12:18",
                           "value": [
                             {
-                              "string": "one"
+                              "string": "one",
+                              "raw_string": "one"
                             }
                           ]
                         }
@@ -137,7 +138,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested.d2,3:14:33-3:17:36",
                           "value": [
                             {
-                              "string": "two"
+                              "string": "two",
+                              "raw_string": "two"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
index a2d139a60..084167741 100644
--- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,2:9:15-2:12:18",
                           "value": [
                             {
-                              "string": "one"
+                              "string": "one",
+                              "raw_string": "one"
                             }
                           ]
                         }
@@ -158,7 +159,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.d2,4:15:36-4:18:39",
                 "value": [
                   {
-                    "string": "two"
+                    "string": "two",
+                    "raw_string": "two"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json
index 4c010a354..4e4652c77 100644
--- a/testdata/d2compiler/TestCompile/edge_map.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_map.d2,2:9:20-2:88:99",
                           "value": [
                             {
-                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
+                              "string": "Space: the final frontier.  These are the voyages of the starship Enterprise.",
+                              "raw_string": "Space: the final frontier.  These are the voyages of the starship Enterprise."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
index 3e1995bad..9874c0c27 100644
--- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json
@@ -101,7 +101,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/edge_map_arrowhead.d2,2:11:43-2:18:50",
                                     "value": [
                                       {
-                                        "string": "diamond"
+                                        "string": "diamond",
+                                        "raw_string": "diamond"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
index 617802255..c00936b2d 100644
--- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,1:26:36-1:33:43",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
@@ -193,7 +194,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.d2,4:9:87-4:16:94",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
index 08e3122d8..6f5721e7c 100644
--- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.d2,0:34:34-0:42:42",
                           "value": [
                             {
-                              "string": "triangle"
+                              "string": "triangle",
+                              "raw_string": "triangle"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
index 51c1ca72f..18c537b79 100644
--- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
+++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json
@@ -144,7 +144,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.d2,2:9:48-2:16:55",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json
index 24e740e1e..fcdeecfc7 100644
--- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json
+++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/fill-pattern.d2,2:18:33-2:22:37",
                                     "value": [
                                       {
-                                        "string": "dots"
+                                        "string": "dots",
+                                        "raw_string": "dots"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json
index 632db4569..1d0b6974e 100644
--- a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json
+++ b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json
@@ -88,7 +88,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/icon-near-composite-together.d2,2:8:41-2:24:57",
                                     "value": [
                                       {
-                                        "string": "outside-top-left"
+                                        "string": "outside-top-left",
+                                        "raw_string": "outside-top-left"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json
index 183ccb980..0f22863e9 100644
--- a/testdata/d2compiler/TestCompile/image_style.exp.json
+++ b/testdata/d2compiler/TestCompile/image_style.exp.json
@@ -59,7 +59,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,1:8:18-1:64:74",
                           "value": [
                             {
-                              "string": "https://icons.terrastruct.com/essentials/004-picture.svg"
+                              "string": "https://icons.terrastruct.com/essentials/004-picture.svg",
+                              "raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg"
                             }
                           ]
                         }
@@ -91,7 +92,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,2:9:84-2:14:89",
                           "value": [
                             {
-                              "string": "image"
+                              "string": "image",
+                              "raw_string": "image"
                             }
                           ]
                         }
@@ -134,7 +136,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/image_style.d2,3:16:106-3:25:115",
                           "value": [
                             {
-                              "string": "#0D32B2"
+                              "string": "#0D32B2",
+                              "raw_string": "#0D32B2"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json
index 22ecfc551..b73200e7a 100644
--- a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json
+++ b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,1:8:15-1:13:20",
                           "value": [
                             {
-                              "string": "sushi"
+                              "string": "sushi",
+                              "raw_string": "sushi"
                             }
                           ]
                         }
@@ -97,7 +98,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-separate.d2,2:13:34-2:29:50",
                           "value": [
                             {
-                              "string": "outside-top-left"
+                              "string": "outside-top-left",
+                              "raw_string": "outside-top-left"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json
index bedc9a9a8..ee68c9863 100644
--- a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json
+++ b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json
@@ -88,7 +88,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/label-near-composite-together.d2,2:8:32-2:24:48",
                                     "value": [
                                       {
-                                        "string": "outside-top-left"
+                                        "string": "outside-top-left",
+                                        "raw_string": "outside-top-left"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/label-near-parent.exp.json b/testdata/d2compiler/TestCompile/label-near-parent.exp.json
index 261465cf6..192949f56 100644
--- a/testdata/d2compiler/TestCompile/label-near-parent.exp.json
+++ b/testdata/d2compiler/TestCompile/label-near-parent.exp.json
@@ -75,7 +75,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/label-near-parent.d2,1:13:26-1:29:42",
                           "value": [
                             {
-                              "string": "outside-top-left"
+                              "string": "outside-top-left",
+                              "raw_string": "outside-top-left"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
index e0120bcc5..974fc5fbc 100644
--- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
+++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30",
                 "value": [
                   {
-                    "string": "How does the cat go?"
+                    "string": "How does the cat go?",
+                    "raw_string": "How does the cat go?"
                   }
                 ]
               }
@@ -176,7 +177,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107",
                                     "value": [
                                       {
-                                        "string": "goes"
+                                        "string": "goes",
+                                        "raw_string": "goes"
                                       }
                                     ]
                                   }
@@ -288,7 +290,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169",
                                     "value": [
                                       {
-                                        "string": "green"
+                                        "string": "green",
+                                        "raw_string": "green"
                                       }
                                     ]
                                   }
@@ -508,7 +511,8 @@
                     "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107",
                     "value": [
                       {
-                        "string": "goes"
+                        "string": "goes",
+                        "raw_string": "goes"
                       }
                     ]
                   }
@@ -697,7 +701,8 @@
                     "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30",
                     "value": [
                       {
-                        "string": "How does the cat go?"
+                        "string": "How does the cat go?",
+                        "raw_string": "How does the cat go?"
                       }
                     ]
                   }
@@ -783,7 +788,8 @@
                                         "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169",
                                         "value": [
                                           {
-                                            "string": "green"
+                                            "string": "green",
+                                            "raw_string": "green"
                                           }
                                         ]
                                       }
diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json
index 25f2adca7..1aa7a9673 100644
--- a/testdata/d2compiler/TestCompile/missing-class.exp.json
+++ b/testdata/d2compiler/TestCompile/missing-class.exp.json
@@ -41,7 +41,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/missing-class.d2,0:9:9-0:11:11",
                 "value": [
                   {
-                    "string": "yo"
+                    "string": "yo",
+                    "raw_string": "yo"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json
index d6f5751d1..6139e09c5 100644
--- a/testdata/d2compiler/TestCompile/near_constant.exp.json
+++ b/testdata/d2compiler/TestCompile/near_constant.exp.json
@@ -41,7 +41,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18",
                 "value": [
                   {
-                    "string": "top-center"
+                    "string": "top-center",
+                    "raw_string": "top-center"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json
index 0ba0aac3f..a897f1678 100644
--- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json
+++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json
@@ -158,7 +158,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/nested-array-classes.d2,5:26:101-5:31:106",
                                     "value": [
                                       {
-                                        "string": "arrow"
+                                        "string": "arrow",
+                                        "raw_string": "arrow"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json
index 6c15ddb77..1781b2ac6 100644
--- a/testdata/d2compiler/TestCompile/nested_sql.exp.json
+++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,2:11:31-2:20:40",
                                     "value": [
                                       {
-                                        "string": "sql_table"
+                                        "string": "sql_table",
+                                        "raw_string": "sql_table"
                                       }
                                     ]
                                   }
@@ -110,7 +111,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,4:15:57-4:21:63",
                                     "value": [
                                       {
-                                        "string": "string"
+                                        "string": "string",
+                                        "raw_string": "string"
                                       }
                                     ]
                                   }
@@ -142,7 +144,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/nested_sql.d2,5:10:74-5:14:78",
                                     "value": [
                                       {
-                                        "string": "bool"
+                                        "string": "bool",
+                                        "raw_string": "bool"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/path_link.exp.json b/testdata/d2compiler/TestCompile/path_link.exp.json
index c2daa0039..af370962e 100644
--- a/testdata/d2compiler/TestCompile/path_link.exp.json
+++ b/testdata/d2compiler/TestCompile/path_link.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/path_link.d2,1:8:13-1:39:44",
                           "value": [
                             {
-                              "string": "Overview.Untitled board 7.zzzzz"
+                              "string": "Overview.Untitled board 7.zzzzz",
+                              "raw_string": "Overview.Untitled board 7.zzzzz"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json
index 0e9844908..07280d1c2 100644
--- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json
+++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,2:11:29-2:17:35",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
@@ -131,7 +132,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,5:9:51-5:10:52",
                 "value": [
                   {
-                    "string": "x"
+                    "string": "x",
+                    "raw_string": "x"
                   }
                 ]
               }
@@ -185,7 +187,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/reordered-classes.d2,6:17:70-6:24:77",
                 "value": [
                   {
-                    "string": "diamond"
+                    "string": "diamond",
+                    "raw_string": "diamond"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
index e2cc05144..d037b9da4 100644
--- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
+++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,1:8:13-1:14:19",
                           "value": [
                             {
-                              "string": "orange"
+                              "string": "orange",
+                              "raw_string": "orange"
                             }
                           ]
                         }
@@ -137,7 +138,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,3:16:57-3:19:60",
                           "value": [
                             {
-                              "string": "red"
+                              "string": "red",
+                              "raw_string": "red"
                             }
                           ]
                         }
@@ -180,7 +182,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,4:13:74-4:18:79",
                           "value": [
                             {
-                              "string": "green"
+                              "string": "green",
+                              "raw_string": "green"
                             }
                           ]
                         }
@@ -228,7 +231,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91",
                 "value": [
                   {
-                    "string": "y"
+                    "string": "y",
+                    "raw_string": "y"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
index 8fdf89c77..98ba30eda 100644
--- a/testdata/d2compiler/TestCompile/root_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/root_direction.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/root_direction.d2,0:11:11-0:16:16",
                 "value": [
                   {
-                    "string": "right"
+                    "string": "right",
+                    "raw_string": "right"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
index 510f8fe47..353ce9a61 100644
--- a/testdata/d2compiler/TestCompile/root_sequence.exp.json
+++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/root_sequence.d2,0:7:7-0:23:23",
                 "value": [
                   {
-                    "string": "sequence_diagram"
+                    "string": "sequence_diagram",
+                    "raw_string": "sequence_diagram"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
index 8248fadb1..4c90eaac0 100644
--- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/sequence-timestamp.d2,0:7:7-0:23:23",
                 "value": [
                   {
-                    "string": "sequence_diagram"
+                    "string": "sequence_diagram",
+                    "raw_string": "sequence_diagram"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json
index 170abd9c8..5dd16ad44 100644
--- a/testdata/d2compiler/TestCompile/sequence_container.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/sequence_container.d2,0:7:7-0:23:23",
                 "value": [
                   {
-                    "string": "sequence_diagram"
+                    "string": "sequence_diagram",
+                    "raw_string": "sequence_diagram"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
index dc7b3eb12..503423b6c 100644
--- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/sequence_container_2.d2,0:7:7-0:23:23",
                 "value": [
                   {
-                    "string": "sequence_diagram"
+                    "string": "sequence_diagram",
+                    "raw_string": "sequence_diagram"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
index 459a76786..1958d8227 100644
--- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/sequence_grouped_note.d2,0:7:7-0:23:23",
                 "value": [
                   {
-                    "string": "sequence_diagram"
+                    "string": "sequence_diagram",
+                    "raw_string": "sequence_diagram"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
index a46a3fa31..0870aa4c1 100644
--- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
+++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/sequence_scoping.d2,1:9:14-1:25:30",
                           "value": [
                             {
-                              "string": "sequence_diagram"
+                              "string": "sequence_diagram",
+                              "raw_string": "sequence_diagram"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json
index 92d4166c1..b59d6d0da 100644
--- a/testdata/d2compiler/TestCompile/set_direction.exp.json
+++ b/testdata/d2compiler/TestCompile/set_direction.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/set_direction.d2,1:13:18-1:17:22",
                           "value": [
                             {
-                              "string": "left"
+                              "string": "left",
+                              "raw_string": "left"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
index afba4f2c6..3cf517caa 100644
--- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
+++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json
@@ -59,7 +59,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/single_dimension_on_circle.d2,1:8:18-1:14:24",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json
index a74178a5e..db24296fa 100644
--- a/testdata/d2compiler/TestCompile/sql-constraints.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,1:9:14-1:18:23",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -120,7 +121,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/sql-constraints.d2,2:22:46-2:33:57",
                                     "value": [
                                       {
-                                        "string": "primary_key"
+                                        "string": "primary_key",
+                                        "raw_string": "primary_key"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json
index 47cfcf60c..64b5d46e5 100644
--- a/testdata/d2compiler/TestCompile/sql-regression.exp.json
+++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,2:10:26-2:22:38",
                                     "value": [
                                       {
-                                        "string": "lemonchiffon"
+                                        "string": "lemonchiffon",
+                                        "raw_string": "lemonchiffon"
                                       }
                                     ]
                                   }
@@ -139,7 +140,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/sql-regression.d2,5:11:61-5:20:70",
                                     "value": [
                                       {
-                                        "string": "sql_table"
+                                        "string": "sql_table",
+                                        "raw_string": "sql_table"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json
index 4bc3e381e..8064ff8ed 100644
--- a/testdata/d2compiler/TestCompile/sql_paren.exp.json
+++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json
@@ -64,7 +64,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,1:9:28-1:18:37",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -96,7 +97,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,3:13:52-3:19:58",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
@@ -128,7 +130,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/sql_paren.d2,4:8:67-4:12:71",
                           "value": [
                             {
-                              "string": "bool"
+                              "string": "bool",
+                              "raw_string": "bool"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
index 8d0548dea..9012bd927 100644
--- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
+++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,1:9:14-1:18:23",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -138,7 +139,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_connection_attr.d2,5:9:44-5:18:53",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json
index 782284d04..b68772eff 100644
--- a/testdata/d2compiler/TestCompile/table_style.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,1:9:28-1:18:37",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_style.d2,2:13:51-2:19:57",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json
index a2e8f3ff5..bd065d54f 100644
--- a/testdata/d2compiler/TestCompile/table_style_map.exp.json
+++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,1:9:28-1:18:37",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,2:13:51-2:19:57",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
@@ -171,7 +173,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/table_style_map.d2,5:16:102-5:20:106",
                                     "value": [
                                       {
-                                        "string": "blue"
+                                        "string": "blue",
+                                        "raw_string": "blue"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json
index e8e1fd4a1..6d32e0f75 100644
--- a/testdata/d2compiler/TestCompile/text-transform.exp.json
+++ b/testdata/d2compiler/TestCompile/text-transform.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,0:11:11-0:16:16",
                 "value": [
                   {
-                    "string": "right"
+                    "string": "right",
+                    "raw_string": "right"
                   }
                 ]
               }
@@ -143,7 +144,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,3:20:61-3:30:71",
                                     "value": [
                                       {
-                                        "string": "capitalize"
+                                        "string": "capitalize",
+                                        "raw_string": "capitalize"
                                       }
                                     ]
                                   }
@@ -207,7 +209,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,6:24:102-6:33:111",
                 "value": [
                   {
-                    "string": "uppercase"
+                    "string": "uppercase",
+                    "raw_string": "uppercase"
                   }
                 ]
               }
@@ -261,7 +264,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/text-transform.d2,7:24:136-7:33:145",
                 "value": [
                   {
-                    "string": "lowercase"
+                    "string": "lowercase",
+                    "raw_string": "lowercase"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
index 6d2eaca67..7b44d6ac8 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json
@@ -53,7 +53,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,1:8:9-1:77:78",
                 "value": [
                   {
-                    "string": "Can you imagine how life could be improved if we could do away with"
+                    "string": "Can you imagine how life could be improved if we could do away with",
+                    "raw_string": "Can you imagine how life could be improved if we could do away with"
                   }
                 ]
               }
@@ -154,7 +155,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_existing.d2,3:13:97-3:80:164",
                           "value": [
                             {
-                              "string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
+                              "string": "Well, it's garish, ugly, and derelicts have used it for a toilet.",
+                              "raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
index b88843238..25aa72494 100644
--- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json
@@ -53,7 +53,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,1:8:9-1:77:78",
                 "value": [
                   {
-                    "string": "Can you imagine how life could be improved if we could do away with"
+                    "string": "Can you imagine how life could be improved if we could do away with",
+                    "raw_string": "Can you imagine how life could be improved if we could do away with"
                   }
                 ]
               }
@@ -159,7 +160,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_edge_index.d2,3:18:102-3:85:169",
                           "value": [
                             {
-                              "string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
+                              "string": "Well, it's garish, ugly, and derelicts have used it for a toilet.",
+                              "raw_string": "Well, it's garish, ugly, and derelicts have used it for a toilet."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
index ea91c3114..8e1ecb3f2 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json
@@ -65,7 +65,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,2:6:12-2:84:90",
                           "value": [
                             {
-                              "string": "All we are given is possibilities -- to make ourselves one thing or another."
+                              "string": "All we are given is possibilities -- to make ourselves one thing or another.",
+                              "raw_string": "All we are given is possibilities -- to make ourselves one thing or another."
                             }
                           ]
                         }
@@ -102,7 +103,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_1.d2,4:3:96-4:80:173",
                 "value": [
                   {
-                    "string": "But it's real.  And if it's real it can be affected ...  we may not be able"
+                    "string": "But it's real.  And if it's real it can be affected ...  we may not be able",
+                    "raw_string": "But it's real.  And if it's real it can be affected ...  we may not be able"
                   }
                 ]
               }
diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
index b241f3064..e8850d2a2 100644
--- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
+++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,1:3:4-1:80:81",
                 "value": [
                   {
-                    "string": "But it's real.  And if it's real it can be affected ...  we may not be able"
+                    "string": "But it's real.  And if it's real it can be affected ...  we may not be able",
+                    "raw_string": "But it's real.  And if it's real it can be affected ...  we may not be able"
                   }
                 ]
               }
@@ -97,7 +98,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/underscore_parent_preference_2.d2,3:6:93-3:84:171",
                           "value": [
                             {
-                              "string": "All we are given is possibilities -- to make ourselves one thing or another."
+                              "string": "All we are given is possibilities -- to make ourselves one thing or another.",
+                              "raw_string": "All we are given is possibilities -- to make ourselves one thing or another."
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json
index ec370207a..0ee2c0378 100644
--- a/testdata/d2compiler/TestCompile/url_link.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_link.d2,1:8:13-1:26:31",
                           "value": [
                             {
-                              "string": "https://google.com"
+                              "string": "https://google.com",
+                              "raw_string": "https://google.com"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
index c581bc47f..4fc6b9851 100644
--- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:10:10-0:28:28",
                           "value": [
                             {
-                              "string": "https://google.com"
+                              "string": "https://google.com",
+                              "raw_string": "https://google.com"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.d2,0:39:39-0:50:50",
                           "value": [
                             {
-                              "string": "hello world"
+                              "string": "hello world",
+                              "raw_string": "hello world"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json
index 201fb038a..55017b2a1 100644
--- a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json
+++ b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:10:10-0:32:32",
                           "value": [
                             {
-                              "string": "https://not-google.com"
+                              "string": "https://not-google.com",
+                              "raw_string": "https://not-google.com"
                             }
                           ]
                         }
@@ -86,7 +87,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.d2,0:43:43-0:92:92",
                           "value": [
                             {
-                              "string": "note: url.ParseRequestURI might see this as a URL"
+                              "string": "note: url.ParseRequestURI might see this as a URL",
+                              "raw_string": "note: url.ParseRequestURI might see this as a URL"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json
index 302556ce6..5191349ed 100644
--- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json
+++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/url_tooltip.d2,0:13:13-0:31:31",
                           "value": [
                             {
-                              "string": "https://google.com"
+                              "string": "https://google.com",
+                              "raw_string": "https://google.com"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
index 17739cdd2..555ed3efc 100644
--- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
+++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,1:9:24-1:18:33",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -120,7 +121,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,2:23:57-2:34:68",
                                     "value": [
                                       {
-                                        "string": "primary_key"
+                                        "string": "primary_key",
+                                        "raw_string": "primary_key"
                                       }
                                     ]
                                   }
@@ -157,7 +159,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,3:15:85-3:18:88",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -189,7 +192,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,4:13:102-4:19:108",
                           "value": [
                             {
-                              "string": "string"
+                              "string": "string",
+                              "raw_string": "string"
                             }
                           ]
                         }
@@ -221,7 +225,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,5:7:116-5:10:119",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -287,7 +292,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,6:27:147-6:38:158",
                                     "value": [
                                       {
-                                        "string": "foreign_key"
+                                        "string": "foreign_key",
+                                        "raw_string": "foreign_key"
                                       }
                                     ]
                                   }
@@ -358,7 +364,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,7:30:190-7:41:201",
                                     "value": [
                                       {
-                                        "string": "foreign_key"
+                                        "string": "foreign_key",
+                                        "raw_string": "foreign_key"
                                       }
                                     ]
                                   }
@@ -424,7 +431,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,11:9:243-11:18:252",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
@@ -456,7 +464,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,12:6:259-12:9:262",
                           "value": [
                             {
-                              "string": "int"
+                              "string": "int",
+                              "raw_string": "int"
                             }
                           ]
                         }
@@ -522,7 +531,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,13:31:294-13:42:305",
                                     "value": [
                                       {
-                                        "string": "foreign_key"
+                                        "string": "foreign_key",
+                                        "raw_string": "foreign_key"
                                       }
                                     ]
                                   }
@@ -593,7 +603,8 @@
                                     "range": "d2/testdata/d2compiler/TestCompile/wrong_column_index.d2,14:30:337-14:41:348",
                                     "value": [
                                       {
-                                        "string": "foreign_key"
+                                        "string": "foreign_key",
+                                        "raw_string": "foreign_key"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
index 31148f447..75999c067 100644
--- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
+++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json
@@ -253,7 +253,8 @@
                                                                   "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
                                                                   "value": [
                                                                     {
-                                                                      "string": "one two three"
+                                                                      "string": "one two three",
+                                                                      "raw_string": "one two three"
                                                                     }
                                                                   ]
                                                                 }
@@ -607,7 +608,8 @@
                                                   "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
                                                   "value": [
                                                     {
-                                                      "string": "one two three"
+                                                      "string": "one two three",
+                                                      "raw_string": "one two three"
                                                     }
                                                   ]
                                                 }
@@ -880,7 +882,8 @@
                                   "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143",
                                   "value": [
                                     {
-                                      "string": "one two three"
+                                      "string": "one two three",
+                                      "raw_string": "one two three"
                                     }
                                   ]
                                 }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json
index 091481ef5..647ad1d52 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/combined.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json
index 1be8d8d91..dd4764b6b 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json
index f58e67429..f7d87362c 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/edge_label.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/edge_label.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json
index 2e0d918a0..5a0acd806 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/label.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/label.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json
index 6fd7ef761..d32d26e50 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json
@@ -102,7 +102,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/nested.d2,4:14:49-4:17:52",
                                               "value": [
                                                 {
-                                                  "string": "red"
+                                                  "string": "red",
+                                                  "raw_string": "red"
                                                 }
                                               ]
                                             }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json
index f2717ee09..5e1a45456 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json
index 47d41ae5d..11ae2fe4d 100644
--- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/style.d2,2:17:26-2:20:29",
                           "value": [
                             {
-                              "string": "red"
+                              "string": "red",
+                              "raw_string": "red"
                             }
                           ]
                         }
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json
index a48942633..7f3f693b1 100644
--- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
@@ -236,7 +237,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22",
                               "value": [
                                 {
-                                  "string": "im a var"
+                                  "string": "im a var",
+                                  "raw_string": "im a var"
                                 }
                               ]
                             }
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json
index 24b73c55d..23431936c 100644
--- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im x var"
+                              "string": "im x var",
+                              "raw_string": "im x var"
                             }
                           ]
                         }
@@ -163,7 +164,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75",
                                               "value": [
                                                 {
-                                                  "string": "im y var"
+                                                  "string": "im y var",
+                                                  "raw_string": "im y var"
                                                 }
                                               ]
                                             }
@@ -346,7 +348,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159",
                                               "value": [
                                                 {
-                                                  "string": "im y var"
+                                                  "string": "im y var",
+                                                  "raw_string": "im y var"
                                                 }
                                               ]
                                             }
@@ -512,7 +515,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
                               "value": [
                                 {
-                                  "string": "im x var"
+                                  "string": "im x var",
+                                  "raw_string": "im x var"
                                 }
                               ]
                             }
@@ -543,7 +547,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:9:151-17:17:159",
                               "value": [
                                 {
-                                  "string": "im y var"
+                                  "string": "im y var",
+                                  "raw_string": "im y var"
                                 }
                               ]
                             }
@@ -791,7 +796,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
                               "value": [
                                 {
-                                  "string": "im x var"
+                                  "string": "im x var",
+                                  "raw_string": "im x var"
                                 }
                               ]
                             }
@@ -822,7 +828,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:9:67-8:17:75",
                               "value": [
                                 {
-                                  "string": "im y var"
+                                  "string": "im y var",
+                                  "raw_string": "im y var"
                                 }
                               ]
                             }
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json
index 75089a991..fc75006dd 100644
--- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im x var"
+                              "string": "im x var",
+                              "raw_string": "im x var"
                             }
                           ]
                         }
@@ -163,7 +164,8 @@
                                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84",
                                               "value": [
                                                 {
-                                                  "string": "im replaced x var"
+                                                  "string": "im replaced x var",
+                                                  "raw_string": "im replaced x var"
                                                 }
                                               ]
                                             }
@@ -297,7 +299,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,8:9:67-8:26:84",
                               "value": [
                                 {
-                                  "string": "im replaced x var"
+                                  "string": "im replaced x var",
+                                  "raw_string": "im replaced x var"
                                 }
                               ]
                             }
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json
index dbf4881e3..571e94ad8 100644
--- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
@@ -236,7 +237,8 @@
                               "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:5:14-2:13:22",
                               "value": [
                                 {
-                                  "string": "im a var"
+                                  "string": "im a var",
+                                  "raw_string": "im a var"
                                 }
                               ]
                             }
diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json
index 72267b626..9040dfa59 100644
--- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json
+++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,2:5:14-2:13:22",
                           "value": [
                             {
-                              "string": "im a var"
+                              "string": "im a var",
+                              "raw_string": "im a var"
                             }
                           ]
                         }
@@ -123,7 +124,8 @@
                 "range": "d2/testdata/d2compiler/TestCompile2/vars/override/label.d2,5:4:38-5:13:47",
                 "value": [
                   {
-                    "string": "not a var"
+                    "string": "not a var",
+                    "raw_string": "not a var"
                   }
                 ]
               }
diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json
index b53c72817..eed20a6c8 100644
--- a/testdata/d2ir/TestCompile/classes/basic.exp.json
+++ b/testdata/d2ir/TestCompile/classes/basic.exp.json
@@ -75,7 +75,8 @@
                             "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
                             "value": [
                               {
-                                "string": "orange"
+                                "string": "orange",
+                                "raw_string": "orange"
                               }
                             ]
                           }
@@ -155,7 +156,8 @@
                                     "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -243,7 +245,8 @@
                               "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
                               "value": [
                                 {
-                                  "string": "orange"
+                                  "string": "orange",
+                                  "raw_string": "orange"
                                 }
                               ]
                             }
@@ -344,7 +347,8 @@
                                   "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
                                   "value": [
                                     {
-                                      "string": "orange"
+                                      "string": "orange",
+                                      "raw_string": "orange"
                                     }
                                   ]
                                 }
@@ -474,7 +478,8 @@
                                       "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46",
                                       "value": [
                                         {
-                                          "string": "orange"
+                                          "string": "orange",
+                                          "raw_string": "orange"
                                         }
                                       ]
                                     }
diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json
index 48f9fe144..f88697361 100644
--- a/testdata/d2ir/TestCompile/classes/inherited.exp.json
+++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json
@@ -19,7 +19,8 @@
                             "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                             "value": [
                               {
-                                "string": "orange"
+                                "string": "orange",
+                                "raw_string": "orange"
                               }
                             ]
                           }
@@ -99,7 +100,8 @@
                                     "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -187,7 +189,8 @@
                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                               "value": [
                                 {
-                                  "string": "orange"
+                                  "string": "orange",
+                                  "raw_string": "orange"
                                 }
                               ]
                             }
@@ -288,7 +291,8 @@
                                   "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                   "value": [
                                     {
-                                      "string": "orange"
+                                      "string": "orange",
+                                      "raw_string": "orange"
                                     }
                                   ]
                                 }
@@ -418,7 +422,8 @@
                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                       "value": [
                                         {
-                                          "string": "orange"
+                                          "string": "orange",
+                                          "raw_string": "orange"
                                         }
                                       ]
                                     }
@@ -465,7 +470,8 @@
                                         "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                         "value": [
                                           {
-                                            "string": "orange"
+                                            "string": "orange",
+                                            "raw_string": "orange"
                                           }
                                         ]
                                       }
@@ -545,7 +551,8 @@
                                                 "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                 "value": [
                                                   {
-                                                    "string": "orange"
+                                                    "string": "orange",
+                                                    "raw_string": "orange"
                                                   }
                                                 ]
                                               }
@@ -633,7 +640,8 @@
                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                           "value": [
                                             {
-                                              "string": "orange"
+                                              "string": "orange",
+                                              "raw_string": "orange"
                                             }
                                           ]
                                         }
@@ -734,7 +742,8 @@
                                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                               "value": [
                                                 {
-                                                  "string": "orange"
+                                                  "string": "orange",
+                                                  "raw_string": "orange"
                                                 }
                                               ]
                                             }
@@ -864,7 +873,8 @@
                                                   "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                   "value": [
                                                     {
-                                                      "string": "orange"
+                                                      "string": "orange",
+                                                      "raw_string": "orange"
                                                     }
                                                   ]
                                                 }
@@ -911,7 +921,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                     "value": [
                                                       {
-                                                        "string": "orange"
+                                                        "string": "orange",
+                                                        "raw_string": "orange"
                                                       }
                                                     ]
                                                   }
@@ -991,7 +1002,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                             "value": [
                                                               {
-                                                                "string": "orange"
+                                                                "string": "orange",
+                                                                "raw_string": "orange"
                                                               }
                                                             ]
                                                           }
@@ -1079,7 +1091,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                       "value": [
                                                         {
-                                                          "string": "orange"
+                                                          "string": "orange",
+                                                          "raw_string": "orange"
                                                         }
                                                       ]
                                                     }
@@ -1180,7 +1193,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                           "value": [
                                                             {
-                                                              "string": "orange"
+                                                              "string": "orange",
+                                                              "raw_string": "orange"
                                                             }
                                                           ]
                                                         }
@@ -1210,7 +1224,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                     "value": [
                                                       {
-                                                        "string": "red"
+                                                        "string": "red",
+                                                        "raw_string": "red"
                                                       }
                                                     ]
                                                   }
@@ -1290,7 +1305,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                             "value": [
                                                               {
-                                                                "string": "red"
+                                                                "string": "red",
+                                                                "raw_string": "red"
                                                               }
                                                             ]
                                                           }
@@ -1378,7 +1394,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                       "value": [
                                                         {
-                                                          "string": "red"
+                                                          "string": "red",
+                                                          "raw_string": "red"
                                                         }
                                                       ]
                                                     }
@@ -1479,7 +1496,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                           "value": [
                                                             {
-                                                              "string": "red"
+                                                              "string": "red",
+                                                              "raw_string": "red"
                                                             }
                                                           ]
                                                         }
@@ -1609,7 +1627,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                               "value": [
                                                                 {
-                                                                  "string": "orange"
+                                                                  "string": "orange",
+                                                                  "raw_string": "orange"
                                                                 }
                                                               ]
                                                             }
@@ -1738,7 +1757,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                               "value": [
                                                                 {
-                                                                  "string": "red"
+                                                                  "string": "red",
+                                                                  "raw_string": "red"
                                                                 }
                                                               ]
                                                             }
@@ -1953,7 +1973,8 @@
                                                                   "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                   "value": [
                                                                     {
-                                                                      "string": "red"
+                                                                      "string": "red",
+                                                                      "raw_string": "red"
                                                                     }
                                                                   ]
                                                                 }
@@ -2024,7 +2045,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                     "value": [
                                                       {
-                                                        "string": "orange"
+                                                        "string": "orange",
+                                                        "raw_string": "orange"
                                                       }
                                                     ]
                                                   }
@@ -2104,7 +2126,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                             "value": [
                                                               {
-                                                                "string": "orange"
+                                                                "string": "orange",
+                                                                "raw_string": "orange"
                                                               }
                                                             ]
                                                           }
@@ -2192,7 +2215,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                       "value": [
                                                         {
-                                                          "string": "orange"
+                                                          "string": "orange",
+                                                          "raw_string": "orange"
                                                         }
                                                       ]
                                                     }
@@ -2293,7 +2317,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                           "value": [
                                                             {
-                                                              "string": "orange"
+                                                              "string": "orange",
+                                                              "raw_string": "orange"
                                                             }
                                                           ]
                                                         }
@@ -2323,7 +2348,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                     "value": [
                                                       {
-                                                        "string": "red"
+                                                        "string": "red",
+                                                        "raw_string": "red"
                                                       }
                                                     ]
                                                   }
@@ -2403,7 +2429,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                             "value": [
                                                               {
-                                                                "string": "red"
+                                                                "string": "red",
+                                                                "raw_string": "red"
                                                               }
                                                             ]
                                                           }
@@ -2491,7 +2518,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                       "value": [
                                                         {
-                                                          "string": "red"
+                                                          "string": "red",
+                                                          "raw_string": "red"
                                                         }
                                                       ]
                                                     }
@@ -2592,7 +2620,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                           "value": [
                                                             {
-                                                              "string": "red"
+                                                              "string": "red",
+                                                              "raw_string": "red"
                                                             }
                                                           ]
                                                         }
@@ -2722,7 +2751,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                               "value": [
                                                                 {
-                                                                  "string": "orange"
+                                                                  "string": "orange",
+                                                                  "raw_string": "orange"
                                                                 }
                                                               ]
                                                             }
@@ -2851,7 +2881,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                               "value": [
                                                                 {
-                                                                  "string": "red"
+                                                                  "string": "red",
+                                                                  "raw_string": "red"
                                                                 }
                                                               ]
                                                             }
@@ -3092,7 +3123,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                     "value": [
                                                       {
-                                                        "string": "orange"
+                                                        "string": "orange",
+                                                        "raw_string": "orange"
                                                       }
                                                     ]
                                                   }
@@ -3172,7 +3204,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                             "value": [
                                                               {
-                                                                "string": "orange"
+                                                                "string": "orange",
+                                                                "raw_string": "orange"
                                                               }
                                                             ]
                                                           }
@@ -3260,7 +3293,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                       "value": [
                                                         {
-                                                          "string": "orange"
+                                                          "string": "orange",
+                                                          "raw_string": "orange"
                                                         }
                                                       ]
                                                     }
@@ -3361,7 +3395,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                           "value": [
                                                             {
-                                                              "string": "orange"
+                                                              "string": "orange",
+                                                              "raw_string": "orange"
                                                             }
                                                           ]
                                                         }
@@ -3391,7 +3426,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                     "value": [
                                                       {
-                                                        "string": "blue"
+                                                        "string": "blue",
+                                                        "raw_string": "blue"
                                                       }
                                                     ]
                                                   }
@@ -3471,7 +3507,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                             "value": [
                                                               {
-                                                                "string": "red"
+                                                                "string": "red",
+                                                                "raw_string": "red"
                                                               }
                                                             ]
                                                           }
@@ -3553,7 +3590,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                             "value": [
                                                               {
-                                                                "string": "blue"
+                                                                "string": "blue",
+                                                                "raw_string": "blue"
                                                               }
                                                             ]
                                                           }
@@ -3641,7 +3679,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                       "value": [
                                                         {
-                                                          "string": "red"
+                                                          "string": "red",
+                                                          "raw_string": "red"
                                                         }
                                                       ]
                                                     }
@@ -3723,7 +3762,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                       "value": [
                                                         {
-                                                          "string": "blue"
+                                                          "string": "blue",
+                                                          "raw_string": "blue"
                                                         }
                                                       ]
                                                     }
@@ -3824,7 +3864,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                           "value": [
                                                             {
-                                                              "string": "red"
+                                                              "string": "red",
+                                                              "raw_string": "red"
                                                             }
                                                           ]
                                                         }
@@ -3924,7 +3965,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                           "value": [
                                                             {
-                                                              "string": "blue"
+                                                              "string": "blue",
+                                                              "raw_string": "blue"
                                                             }
                                                           ]
                                                         }
@@ -4054,7 +4096,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                               "value": [
                                                                 {
-                                                                  "string": "orange"
+                                                                  "string": "orange",
+                                                                  "raw_string": "orange"
                                                                 }
                                                               ]
                                                             }
@@ -4183,7 +4226,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                               "value": [
                                                                 {
-                                                                  "string": "red"
+                                                                  "string": "red",
+                                                                  "raw_string": "red"
                                                                 }
                                                               ]
                                                             }
@@ -4312,7 +4356,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                               "value": [
                                                                 {
-                                                                  "string": "blue"
+                                                                  "string": "blue",
+                                                                  "raw_string": "blue"
                                                                 }
                                                               ]
                                                             }
@@ -4634,7 +4679,8 @@
                                                                   "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                   "value": [
                                                                     {
-                                                                      "string": "blue"
+                                                                      "string": "blue",
+                                                                      "raw_string": "blue"
                                                                     }
                                                                   ]
                                                                 }
@@ -4705,7 +4751,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                     "value": [
                                                       {
-                                                        "string": "orange"
+                                                        "string": "orange",
+                                                        "raw_string": "orange"
                                                       }
                                                     ]
                                                   }
@@ -4785,7 +4832,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                             "value": [
                                                               {
-                                                                "string": "orange"
+                                                                "string": "orange",
+                                                                "raw_string": "orange"
                                                               }
                                                             ]
                                                           }
@@ -4873,7 +4921,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                       "value": [
                                                         {
-                                                          "string": "orange"
+                                                          "string": "orange",
+                                                          "raw_string": "orange"
                                                         }
                                                       ]
                                                     }
@@ -4974,7 +5023,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                           "value": [
                                                             {
-                                                              "string": "orange"
+                                                              "string": "orange",
+                                                              "raw_string": "orange"
                                                             }
                                                           ]
                                                         }
@@ -5004,7 +5054,8 @@
                                                     "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                     "value": [
                                                       {
-                                                        "string": "blue"
+                                                        "string": "blue",
+                                                        "raw_string": "blue"
                                                       }
                                                     ]
                                                   }
@@ -5084,7 +5135,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                             "value": [
                                                               {
-                                                                "string": "red"
+                                                                "string": "red",
+                                                                "raw_string": "red"
                                                               }
                                                             ]
                                                           }
@@ -5166,7 +5218,8 @@
                                                             "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                             "value": [
                                                               {
-                                                                "string": "blue"
+                                                                "string": "blue",
+                                                                "raw_string": "blue"
                                                               }
                                                             ]
                                                           }
@@ -5254,7 +5307,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                       "value": [
                                                         {
-                                                          "string": "red"
+                                                          "string": "red",
+                                                          "raw_string": "red"
                                                         }
                                                       ]
                                                     }
@@ -5336,7 +5390,8 @@
                                                       "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                       "value": [
                                                         {
-                                                          "string": "blue"
+                                                          "string": "blue",
+                                                          "raw_string": "blue"
                                                         }
                                                       ]
                                                     }
@@ -5437,7 +5492,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                           "value": [
                                                             {
-                                                              "string": "red"
+                                                              "string": "red",
+                                                              "raw_string": "red"
                                                             }
                                                           ]
                                                         }
@@ -5537,7 +5593,8 @@
                                                           "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                           "value": [
                                                             {
-                                                              "string": "blue"
+                                                              "string": "blue",
+                                                              "raw_string": "blue"
                                                             }
                                                           ]
                                                         }
@@ -5667,7 +5724,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                               "value": [
                                                                 {
-                                                                  "string": "orange"
+                                                                  "string": "orange",
+                                                                  "raw_string": "orange"
                                                                 }
                                                               ]
                                                             }
@@ -5796,7 +5854,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                               "value": [
                                                                 {
-                                                                  "string": "red"
+                                                                  "string": "red",
+                                                                  "raw_string": "red"
                                                                 }
                                                               ]
                                                             }
@@ -5925,7 +5984,8 @@
                                                               "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                               "value": [
                                                                 {
-                                                                  "string": "blue"
+                                                                  "string": "blue",
+                                                                  "raw_string": "blue"
                                                                 }
                                                               ]
                                                             }
@@ -6242,7 +6302,8 @@
                                                                 "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                                 "value": [
                                                                   {
-                                                                    "string": "orange"
+                                                                    "string": "orange",
+                                                                    "raw_string": "orange"
                                                                   }
                                                                 ]
                                                               }
@@ -6322,7 +6383,8 @@
                                                                         "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                                         "value": [
                                                                           {
-                                                                            "string": "orange"
+                                                                            "string": "orange",
+                                                                            "raw_string": "orange"
                                                                           }
                                                                         ]
                                                                       }
@@ -6410,7 +6472,8 @@
                                                                   "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                                   "value": [
                                                                     {
-                                                                      "string": "orange"
+                                                                      "string": "orange",
+                                                                      "raw_string": "orange"
                                                                     }
                                                                   ]
                                                                 }
@@ -6511,7 +6574,8 @@
                                                                       "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                                       "value": [
                                                                         {
-                                                                          "string": "orange"
+                                                                          "string": "orange",
+                                                                          "raw_string": "orange"
                                                                         }
                                                                       ]
                                                                     }
@@ -6541,7 +6605,8 @@
                                                                 "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                 "value": [
                                                                   {
-                                                                    "string": "blue"
+                                                                    "string": "blue",
+                                                                    "raw_string": "blue"
                                                                   }
                                                                 ]
                                                               }
@@ -6621,7 +6686,8 @@
                                                                         "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                         "value": [
                                                                           {
-                                                                            "string": "red"
+                                                                            "string": "red",
+                                                                            "raw_string": "red"
                                                                           }
                                                                         ]
                                                                       }
@@ -6703,7 +6769,8 @@
                                                                         "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                         "value": [
                                                                           {
-                                                                            "string": "blue"
+                                                                            "string": "blue",
+                                                                            "raw_string": "blue"
                                                                           }
                                                                         ]
                                                                       }
@@ -6791,7 +6858,8 @@
                                                                   "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                   "value": [
                                                                     {
-                                                                      "string": "red"
+                                                                      "string": "red",
+                                                                      "raw_string": "red"
                                                                     }
                                                                   ]
                                                                 }
@@ -6873,7 +6941,8 @@
                                                                   "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                   "value": [
                                                                     {
-                                                                      "string": "blue"
+                                                                      "string": "blue",
+                                                                      "raw_string": "blue"
                                                                     }
                                                                   ]
                                                                 }
@@ -6974,7 +7043,8 @@
                                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                       "value": [
                                                                         {
-                                                                          "string": "red"
+                                                                          "string": "red",
+                                                                          "raw_string": "red"
                                                                         }
                                                                       ]
                                                                     }
@@ -7074,7 +7144,8 @@
                                                                       "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                       "value": [
                                                                         {
-                                                                          "string": "blue"
+                                                                          "string": "blue",
+                                                                          "raw_string": "blue"
                                                                         }
                                                                       ]
                                                                     }
@@ -7204,7 +7275,8 @@
                                                                           "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44",
                                                                           "value": [
                                                                             {
-                                                                              "string": "orange"
+                                                                              "string": "orange",
+                                                                              "raw_string": "orange"
                                                                             }
                                                                           ]
                                                                         }
@@ -7333,7 +7405,8 @@
                                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                           "value": [
                                                                             {
-                                                                              "string": "red"
+                                                                              "string": "red",
+                                                                              "raw_string": "red"
                                                                             }
                                                                           ]
                                                                         }
@@ -7462,7 +7535,8 @@
                                                                           "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                           "value": [
                                                                             {
-                                                                              "string": "blue"
+                                                                              "string": "blue",
+                                                                              "raw_string": "blue"
                                                                             }
                                                                           ]
                                                                         }
@@ -8013,7 +8087,8 @@
                                                                       "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                       "value": [
                                                                         {
-                                                                          "string": "red"
+                                                                          "string": "red",
+                                                                          "raw_string": "red"
                                                                         }
                                                                       ]
                                                                     }
@@ -8218,7 +8293,8 @@
                                                                       "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                       "value": [
                                                                         {
-                                                                          "string": "blue"
+                                                                          "string": "blue",
+                                                                          "raw_string": "blue"
                                                                         }
                                                                       ]
                                                                     }
@@ -8591,7 +8667,8 @@
                                                                           "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                           "value": [
                                                                             {
-                                                                              "string": "red"
+                                                                              "string": "red",
+                                                                              "raw_string": "red"
                                                                             }
                                                                           ]
                                                                         }
@@ -8796,7 +8873,8 @@
                                                                           "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                           "value": [
                                                                             {
-                                                                              "string": "blue"
+                                                                              "string": "blue",
+                                                                              "raw_string": "blue"
                                                                             }
                                                                           ]
                                                                         }
@@ -9198,7 +9276,8 @@
                                                                               "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164",
                                                                               "value": [
                                                                                 {
-                                                                                  "string": "red"
+                                                                                  "string": "red",
+                                                                                  "raw_string": "red"
                                                                                 }
                                                                               ]
                                                                             }
@@ -9403,7 +9482,8 @@
                                                                               "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312",
                                                                               "value": [
                                                                                 {
-                                                                                  "string": "blue"
+                                                                                  "string": "blue",
+                                                                                  "raw_string": "blue"
                                                                                 }
                                                                               ]
                                                                             }
diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json
index 07e31f3f8..087bc4de2 100644
--- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json
+++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json
@@ -19,7 +19,8 @@
                             "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                             "value": [
                               {
-                                "string": "yellow"
+                                "string": "yellow",
+                                "raw_string": "yellow"
                               }
                             ]
                           }
@@ -99,7 +100,8 @@
                                     "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                     "value": [
                                       {
-                                        "string": "yellow"
+                                        "string": "yellow",
+                                        "raw_string": "yellow"
                                       }
                                     ]
                                   }
@@ -187,7 +189,8 @@
                               "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                               "value": [
                                 {
-                                  "string": "yellow"
+                                  "string": "yellow",
+                                  "raw_string": "yellow"
                                 }
                               ]
                             }
@@ -288,7 +291,8 @@
                                   "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                   "value": [
                                     {
-                                      "string": "yellow"
+                                      "string": "yellow",
+                                      "raw_string": "yellow"
                                     }
                                   ]
                                 }
@@ -418,7 +422,8 @@
                                       "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                       "value": [
                                         {
-                                          "string": "yellow"
+                                          "string": "yellow",
+                                          "raw_string": "yellow"
                                         }
                                       ]
                                     }
@@ -465,7 +470,8 @@
                                         "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                         "value": [
                                           {
-                                            "string": "yellow"
+                                            "string": "yellow",
+                                            "raw_string": "yellow"
                                           }
                                         ]
                                       }
@@ -545,7 +551,8 @@
                                                 "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                                 "value": [
                                                   {
-                                                    "string": "yellow"
+                                                    "string": "yellow",
+                                                    "raw_string": "yellow"
                                                   }
                                                 ]
                                               }
@@ -562,7 +569,8 @@
                                         "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                         "value": [
                                           {
-                                            "string": "red"
+                                            "string": "red",
+                                            "raw_string": "red"
                                           }
                                         ]
                                       }
@@ -686,7 +694,8 @@
                                                 "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                                 "value": [
                                                   {
-                                                    "string": "red"
+                                                    "string": "red",
+                                                    "raw_string": "red"
                                                   }
                                                 ]
                                               }
@@ -774,7 +783,8 @@
                                           "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                           "value": [
                                             {
-                                              "string": "yellow"
+                                              "string": "yellow",
+                                              "raw_string": "yellow"
                                             }
                                           ]
                                         }
@@ -900,7 +910,8 @@
                                           "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                           "value": [
                                             {
-                                              "string": "red"
+                                              "string": "red",
+                                              "raw_string": "red"
                                             }
                                           ]
                                         }
@@ -1001,7 +1012,8 @@
                                               "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                               "value": [
                                                 {
-                                                  "string": "yellow"
+                                                  "string": "yellow",
+                                                  "raw_string": "yellow"
                                                 }
                                               ]
                                             }
@@ -1132,7 +1144,8 @@
                                     "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                     "value": [
                                       {
-                                        "string": "red"
+                                        "string": "red",
+                                        "raw_string": "red"
                                       }
                                     ]
                                   }
@@ -1257,7 +1270,8 @@
                                                   "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42",
                                                   "value": [
                                                     {
-                                                      "string": "yellow"
+                                                      "string": "yellow",
+                                                      "raw_string": "yellow"
                                                     }
                                                   ]
                                                 }
@@ -1390,7 +1404,8 @@
                                   "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                   "value": [
                                     {
-                                      "string": "red"
+                                      "string": "red",
+                                      "raw_string": "red"
                                     }
                                   ]
                                 }
@@ -1542,7 +1557,8 @@
                                       "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99",
                                       "value": [
                                         {
-                                          "string": "red"
+                                          "string": "red",
+                                          "raw_string": "red"
                                         }
                                       ]
                                     }
diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json
index fc776823c..1ad04233f 100644
--- a/testdata/d2ir/TestCompile/classes/merge.exp.json
+++ b/testdata/d2ir/TestCompile/classes/merge.exp.json
@@ -19,7 +19,8 @@
                             "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                             "value": [
                               {
-                                "string": "orange"
+                                "string": "orange",
+                                "raw_string": "orange"
                               }
                             ]
                           }
@@ -99,7 +100,8 @@
                                     "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -187,7 +189,8 @@
                               "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                               "value": [
                                 {
-                                  "string": "orange"
+                                  "string": "orange",
+                                  "raw_string": "orange"
                                 }
                               ]
                             }
@@ -357,7 +360,8 @@
                                   "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                   "value": [
                                     {
-                                      "string": "orange"
+                                      "string": "orange",
+                                      "raw_string": "orange"
                                     }
                                   ]
                                 }
@@ -516,7 +520,8 @@
                                       "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                       "value": [
                                         {
-                                          "string": "orange"
+                                          "string": "orange",
+                                          "raw_string": "orange"
                                         }
                                       ]
                                     }
@@ -592,7 +597,8 @@
                                         "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                         "value": [
                                           {
-                                            "string": "orange"
+                                            "string": "orange",
+                                            "raw_string": "orange"
                                           }
                                         ]
                                       }
@@ -672,7 +678,8 @@
                                                 "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                                 "value": [
                                                   {
-                                                    "string": "orange"
+                                                    "string": "orange",
+                                                    "raw_string": "orange"
                                                   }
                                                 ]
                                               }
@@ -760,7 +767,8 @@
                                           "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                           "value": [
                                             {
-                                              "string": "orange"
+                                              "string": "orange",
+                                              "raw_string": "orange"
                                             }
                                           ]
                                         }
@@ -987,7 +995,8 @@
                                               "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                               "value": [
                                                 {
-                                                  "string": "orange"
+                                                  "string": "orange",
+                                                  "raw_string": "orange"
                                                 }
                                               ]
                                             }
@@ -1232,7 +1241,8 @@
                                                   "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44",
                                                   "value": [
                                                     {
-                                                      "string": "orange"
+                                                      "string": "orange",
+                                                      "raw_string": "orange"
                                                     }
                                                   ]
                                                 }
diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json
index 40fcad16d..9fec0c647 100644
--- a/testdata/d2ir/TestCompile/classes/nested.exp.json
+++ b/testdata/d2ir/TestCompile/classes/nested.exp.json
@@ -19,7 +19,8 @@
                             "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                             "value": [
                               {
-                                "string": "orange"
+                                "string": "orange",
+                                "raw_string": "orange"
                               }
                             ]
                           }
@@ -99,7 +100,8 @@
                                     "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                     "value": [
                                       {
-                                        "string": "orange"
+                                        "string": "orange",
+                                        "raw_string": "orange"
                                       }
                                     ]
                                   }
@@ -187,7 +189,8 @@
                               "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                               "value": [
                                 {
-                                  "string": "orange"
+                                  "string": "orange",
+                                  "raw_string": "orange"
                                 }
                               ]
                             }
@@ -288,7 +291,8 @@
                                   "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                   "value": [
                                     {
-                                      "string": "orange"
+                                      "string": "orange",
+                                      "raw_string": "orange"
                                     }
                                   ]
                                 }
@@ -418,7 +422,8 @@
                                       "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                       "value": [
                                         {
-                                          "string": "orange"
+                                          "string": "orange",
+                                          "raw_string": "orange"
                                         }
                                       ]
                                     }
@@ -529,7 +534,8 @@
                                                     "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                     "value": [
                                                       {
-                                                        "string": "orange"
+                                                        "string": "orange",
+                                                        "raw_string": "orange"
                                                       }
                                                     ]
                                                   }
@@ -609,7 +615,8 @@
                                                             "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                             "value": [
                                                               {
-                                                                "string": "orange"
+                                                                "string": "orange",
+                                                                "raw_string": "orange"
                                                               }
                                                             ]
                                                           }
@@ -697,7 +704,8 @@
                                                       "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                       "value": [
                                                         {
-                                                          "string": "orange"
+                                                          "string": "orange",
+                                                          "raw_string": "orange"
                                                         }
                                                       ]
                                                     }
@@ -798,7 +806,8 @@
                                                           "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                           "value": [
                                                             {
-                                                              "string": "orange"
+                                                              "string": "orange",
+                                                              "raw_string": "orange"
                                                             }
                                                           ]
                                                         }
@@ -928,7 +937,8 @@
                                                               "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                               "value": [
                                                                 {
-                                                                  "string": "orange"
+                                                                  "string": "orange",
+                                                                  "raw_string": "orange"
                                                                 }
                                                               ]
                                                             }
@@ -1168,7 +1178,8 @@
                                         "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                         "value": [
                                           {
-                                            "string": "orange"
+                                            "string": "orange",
+                                            "raw_string": "orange"
                                           }
                                         ]
                                       }
@@ -1248,7 +1259,8 @@
                                                 "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                 "value": [
                                                   {
-                                                    "string": "orange"
+                                                    "string": "orange",
+                                                    "raw_string": "orange"
                                                   }
                                                 ]
                                               }
@@ -1336,7 +1348,8 @@
                                           "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                           "value": [
                                             {
-                                              "string": "orange"
+                                              "string": "orange",
+                                              "raw_string": "orange"
                                             }
                                           ]
                                         }
@@ -1437,7 +1450,8 @@
                                               "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                               "value": [
                                                 {
-                                                  "string": "orange"
+                                                  "string": "orange",
+                                                  "raw_string": "orange"
                                                 }
                                               ]
                                             }
@@ -1567,7 +1581,8 @@
                                                   "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44",
                                                   "value": [
                                                     {
-                                                      "string": "orange"
+                                                      "string": "orange",
+                                                      "raw_string": "orange"
                                                     }
                                                   ]
                                                 }
diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json
index be26669b0..278d70857 100644
--- a/testdata/d2ir/TestCompile/fields/label.exp.json
+++ b/testdata/d2ir/TestCompile/fields/label.exp.json
@@ -7,7 +7,8 @@
           "range": "TestCompile/fields/label.d2,0:3:3-0:6:6",
           "value": [
             {
-              "string": "yes"
+              "string": "yes",
+              "raw_string": "yes"
             }
           ]
         }
@@ -65,7 +66,8 @@
                   "range": "TestCompile/fields/label.d2,0:3:3-0:6:6",
                   "value": [
                     {
-                      "string": "yes"
+                      "string": "yes",
+                      "raw_string": "yes"
                     }
                   ]
                 }
diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json
index 48b7c3ec1..042d9865f 100644
--- a/testdata/d2ir/TestCompile/fields/nested.exp.json
+++ b/testdata/d2ir/TestCompile/fields/nested.exp.json
@@ -11,7 +11,8 @@
                 "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
                 "value": [
                   {
-                    "string": "yes"
+                    "string": "yes",
+                    "raw_string": "yes"
                   }
                 ]
               }
@@ -91,7 +92,8 @@
                         "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
                         "value": [
                           {
-                            "string": "yes"
+                            "string": "yes",
+                            "raw_string": "yes"
                           }
                         ]
                       }
@@ -179,7 +181,8 @@
                   "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8",
                   "value": [
                     {
-                      "string": "yes"
+                      "string": "yes",
+                      "raw_string": "yes"
                     }
                   ]
                 }
diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json
index e6f547dbd..b1dedaa35 100644
--- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json
+++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json
@@ -11,7 +11,8 @@
                 "range": "x.d2,1:8:13-1:14:19",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
@@ -69,7 +70,8 @@
                         "range": "x.d2,1:8:13-1:14:19",
                         "value": [
                           {
-                            "string": "circle"
+                            "string": "circle",
+                            "raw_string": "circle"
                           }
                         ]
                       }
@@ -86,7 +88,8 @@
                 "range": "x.d2,2:8:28-2:12:32",
                 "value": [
                   {
-                    "string": "meow"
+                    "string": "meow",
+                    "raw_string": "meow"
                   }
                 ]
               }
@@ -144,7 +147,8 @@
                         "range": "x.d2,2:8:28-2:12:32",
                         "value": [
                           {
-                            "string": "meow"
+                            "string": "meow",
+                            "raw_string": "meow"
                           }
                         ]
                       }
diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json
index 750095b9a..ed273c2c0 100644
--- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json
+++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json
@@ -7,7 +7,8 @@
           "range": "x.d2,0:3:3-0:7:7",
           "value": [
             {
-              "string": "meow"
+              "string": "meow",
+              "raw_string": "meow"
             }
           ]
         }
diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json
index b43e59e20..cc2a0a3e5 100644
--- a/testdata/d2ir/TestCompile/imports/spread.exp.json
+++ b/testdata/d2ir/TestCompile/imports/spread.exp.json
@@ -7,7 +7,8 @@
           "range": "x.d2,0:3:3-0:7:7",
           "value": [
             {
-              "string": "wowa"
+              "string": "wowa",
+              "raw_string": "wowa"
             }
           ]
         }
@@ -65,7 +66,8 @@
                   "range": "x.d2,0:3:3-0:7:7",
                   "value": [
                     {
-                      "string": "wowa"
+                      "string": "wowa",
+                      "raw_string": "wowa"
                     }
                   ]
                 }
diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json
index 7828f5ba2..8e5c0f021 100644
--- a/testdata/d2ir/TestCompile/imports/value.exp.json
+++ b/testdata/d2ir/TestCompile/imports/value.exp.json
@@ -11,7 +11,8 @@
                 "range": "x.d2,0:7:7-0:13:13",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
@@ -69,7 +70,8 @@
                         "range": "x.d2,0:7:7-0:13:13",
                         "value": [
                           {
-                            "string": "circle"
+                            "string": "circle",
+                            "raw_string": "circle"
                           }
                         ]
                       }
@@ -86,7 +88,8 @@
                 "range": "x.d2,1:7:21-1:11:25",
                 "value": [
                   {
-                    "string": "meow"
+                    "string": "meow",
+                    "raw_string": "meow"
                   }
                 ]
               }
@@ -144,7 +147,8 @@
                         "range": "x.d2,1:7:21-1:11:25",
                         "value": [
                           {
-                            "string": "meow"
+                            "string": "meow",
+                            "raw_string": "meow"
                           }
                         ]
                       }
diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json
index 7da5d84d7..bd5c4b97e 100644
--- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json
+++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json
@@ -11,7 +11,8 @@
                 "range": "x.d2,0:6:6-0:18:18",
                 "value": [
                   {
-                    "string": "var replaced"
+                    "string": "var replaced",
+                    "raw_string": "var replaced"
                   }
                 ]
               }
@@ -69,7 +70,8 @@
                         "range": "x.d2,0:6:6-0:18:18",
                         "value": [
                           {
-                            "string": "var replaced"
+                            "string": "var replaced",
+                            "raw_string": "var replaced"
                           }
                         ]
                       }
@@ -129,7 +131,8 @@
                         "range": "x.d2,0:6:6-0:18:18",
                         "value": [
                           {
-                            "string": "var replaced"
+                            "string": "var replaced",
+                            "raw_string": "var replaced"
                           }
                         ]
                       }
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
index 379eb30af..3b2eb0b98 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline.d2,1:9:17-1:15:23",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
index 021d825c5..c5e68d3cb 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.d2,2:9:24-2:15:30",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
index 4457a46e7..b5616c220 100644
--- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
+++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.d2,3:9:25-3:15:31",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
index 408321427..0ca9c574f 100644
--- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
+++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/arrowhead_label.d2,1:26:36-1:33:43",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json
index 7cdb43a60..dc0352817 100644
--- a/testdata/d2oracle/TestDelete/chaos_1.exp.json
+++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,0:12:12-0:20:20",
                           "value": [
                             {
-                              "string": "cylinder"
+                              "string": "cylinder",
+                              "raw_string": "cylinder"
                             }
                           ]
                         }
@@ -149,7 +150,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,1:36:58-1:51:73",
                           "value": [
                             {
-                              "string": "cf-one-required"
+                              "string": "cf-one-required",
+                              "raw_string": "cf-one-required"
                             }
                           ]
                         }
@@ -186,7 +188,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/chaos_1.d2,2:4:79-2:5:80",
                 "value": [
                   {
-                    "string": "z"
+                    "string": "z",
+                    "raw_string": "z"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
index f995a64cc..7759732a2 100644
--- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json
@@ -99,7 +99,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_edge_conflicts.d2,4:5:18-4:9:22",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
index ee7d331d5..a11ffdd2c 100644
--- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json
@@ -159,7 +159,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,4:5:26-4:9:30",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
@@ -191,7 +192,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.d2,5:5:36-5:9:40",
                 "value": [
                   {
-                    "string": "ey"
+                    "string": "ey",
+                    "raw_string": "ey"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
index 4b7ffd6ad..fe212f64a 100644
--- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json
@@ -76,7 +76,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_flat_conflicts.d2,3:5:12-3:9:16",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
index e6a9fe976..c1cf6e922 100644
--- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json
@@ -168,7 +168,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_multiple_conflicts.d2,7:5:30-7:9:34",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
index b4bef5253..489e99551 100644
--- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json
@@ -87,7 +87,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,4:5:15-4:9:19",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
@@ -130,7 +131,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.d2,5:7:27-5:12:32",
                 "value": [
                   {
-                    "string": "hey"
+                    "string": "hey",
+                    "raw_string": "hey"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
index e61acceb2..25088c478 100644
--- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
+++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json
@@ -76,7 +76,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/children_referenced_conflicts.d2,4:5:13-4:9:17",
                 "value": [
                   {
-                    "string": "hi"
+                    "string": "hi",
+                    "raw_string": "hi"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json
index f9a7d69e9..5044d5f4b 100644
--- a/testdata/d2oracle/TestDelete/container_near.exp.json
+++ b/testdata/d2oracle/TestDelete/container_near.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14",
                           "value": [
                             {
-                              "string": "z"
+                              "string": "z",
+                              "raw_string": "z"
                             }
                           ]
                         }
@@ -138,7 +139,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33",
                           "value": [
                             {
-                              "string": "z"
+                              "string": "z",
+                              "raw_string": "z"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
index 5555f957e..4c52363d8 100644
--- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,0:11:11-0:15:15",
                 "value": [
                   {
-                    "string": "down"
+                    "string": "down",
+                    "raw_string": "down"
                   }
                 ]
               }
@@ -451,7 +452,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254",
                 "value": [
                   {
-                    "string": "collision detected"
+                    "string": "collision detected",
+                    "raw_string": "collision detected"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json
index 2c04083ce..09b4bbab9 100644
--- a/testdata/d2oracle/TestDelete/delete_icon.exp.json
+++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json
@@ -65,7 +65,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/delete_icon.d2,1:8:15-1:26:33",
                           "value": [
                             {
-                              "string": "https://google.com"
+                              "string": "https://google.com",
+                              "raw_string": "https://google.com"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
index d9910b9db..13a576bb8 100644
--- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json
+++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json
@@ -242,7 +242,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,5:13:42-5:17:46",
                 "value": [
                   {
-                    "string": "zero"
+                    "string": "zero",
+                    "raw_string": "zero"
                   }
                 ]
               }
@@ -302,7 +303,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,6:13:60-6:16:63",
                 "value": [
                   {
-                    "string": "one"
+                    "string": "one",
+                    "raw_string": "one"
                   }
                 ]
               }
@@ -362,7 +364,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,8:13:78-8:18:83",
                 "value": [
                   {
-                    "string": "three"
+                    "string": "three",
+                    "raw_string": "three"
                   }
                 ]
               }
@@ -422,7 +425,8 @@
                 "range": "d2/testdata/d2oracle/TestDelete/edge_decrement.d2,9:13:97-9:17:101",
                 "value": [
                   {
-                    "string": "four"
+                    "string": "four",
+                    "raw_string": "four"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json
index 78ba7c9a8..f6c3e68b1 100644
--- a/testdata/d2oracle/TestDelete/multi_near.exp.json
+++ b/testdata/d2oracle/TestDelete/multi_near.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27",
                           "value": [
                             {
-                              "string": "API"
+                              "string": "API",
+                              "raw_string": "API"
                             }
                           ]
                         }
@@ -138,7 +139,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48",
                           "value": [
                             {
-                              "string": "Blah"
+                              "string": "Blah",
+                              "raw_string": "Blah"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
index 224894d55..b93c9f0c6 100644
--- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json
@@ -65,7 +65,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/only_delete_edge_reserved.d2,0:18:18-0:27:27",
                           "value": [
                             {
-                              "string": "#000e3d"
+                              "string": "#000e3d",
+                              "raw_string": "#000e3d"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
index 6a06bf2ad..35f4eac8b 100644
--- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
+++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json
@@ -134,7 +134,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/only_delete_obj_reserved.d2,2:23:27-2:32:36",
                           "value": [
                             {
-                              "string": "#2b50c2"
+                              "string": "#2b50c2",
+                              "raw_string": "#2b50c2"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json
index 6050b7dec..f9a437bd2 100644
--- a/testdata/d2oracle/TestDelete/save_map.exp.json
+++ b/testdata/d2oracle/TestDelete/save_map.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/save_map.d2,1:9:14-1:15:20",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
index 7a09a0b95..9135e9999 100644
--- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
+++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json
@@ -64,7 +64,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/save_map_with_primary.d2,1:9:20-1:15:26",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
index 48896ea4c..279fee006 100644
--- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
+++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,2:11:31-2:20:40",
                                     "value": [
                                       {
-                                        "string": "sql_table"
+                                        "string": "sql_table",
+                                        "raw_string": "sql_table"
                                       }
                                     ]
                                   }
@@ -144,7 +145,8 @@
                                               "range": "d2/testdata/d2oracle/TestDelete/shape_sql_table.d2,3:25:66-3:36:77",
                                               "value": [
                                                 {
-                                                  "string": "primary_key"
+                                                  "string": "primary_key",
+                                                  "raw_string": "primary_key"
                                                 }
                                               ]
                                             }
diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json
index 903675ede..8dddf30b2 100644
--- a/testdata/d2oracle/TestDelete/table_refs.exp.json
+++ b/testdata/d2oracle/TestDelete/table_refs.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestDelete/table_refs.d2,1:9:14-1:18:23",
                           "value": [
                             {
-                              "string": "sql_table"
+                              "string": "sql_table",
+                              "raw_string": "sql_table"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
index 84fb3f5cc..f35e81c9d 100644
--- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
+++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json
@@ -189,7 +189,8 @@
                                               "range": "d2/testdata/d2oracle/TestMove/append_multiple_styles.d2,8:12:86-8:17:91",
                                               "value": [
                                                 {
-                                                  "string": "red"
+                                                  "string": "red",
+                                                  "raw_string": "red"
                                                 }
                                               ]
                                             }
diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
index 53bcaad10..2bb20536a 100644
--- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
+++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json
@@ -28,11 +28,7 @@
             "value": {
               "double_quoted_string": {
                 "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,0:10:10-0:12:12",
-                "value": [
-                  {
-                    "string": ""
-                  }
-                ]
+                "value": null
               }
             }
           }
@@ -60,11 +56,7 @@
             "value": {
               "double_quoted_string": {
                 "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,2:8:22-2:10:24",
-                "value": [
-                  {
-                    "string": ""
-                  }
-                ]
+                "value": null
               }
             }
           }
@@ -116,11 +108,7 @@
                       "value": {
                         "double_quoted_string": {
                           "range": "d2/testdata/d2oracle/TestMove/container_conflicts_generated.d2,4:12:49-4:14:51",
-                          "value": [
-                            {
-                              "string": ""
-                            }
-                          ]
+                          "value": null
                         }
                       }
                     }
diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json
index a48adc76c..95d0a5982 100644
--- a/testdata/d2oracle/TestMove/container_near.exp.json
+++ b/testdata/d2oracle/TestMove/container_near.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27",
                                     "value": [
                                       {
-                                        "string": "x.a.z"
+                                        "string": "x.a.z",
+                                        "raw_string": "x.a.z"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json
index 099aaf357..322268428 100644
--- a/testdata/d2oracle/TestMove/duplicate.exp.json
+++ b/testdata/d2oracle/TestMove/duplicate.exp.json
@@ -100,7 +100,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:9:19-4:17:27",
                           "value": [
                             {
-                              "string": "cylinder"
+                              "string": "cylinder",
+                              "raw_string": "cylinder"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json
index 21adc5115..735394e90 100644
--- a/testdata/d2oracle/TestMove/flat_merge.exp.json
+++ b/testdata/d2oracle/TestMove/flat_merge.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/flat_merge.d2,2:5:12-2:9:16",
                           "value": [
                             {
-                              "string": "meow"
+                              "string": "meow",
+                              "raw_string": "meow"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json
index bcefc6a77..88af9eb39 100644
--- a/testdata/d2oracle/TestMove/flat_near.exp.json
+++ b/testdata/d2oracle/TestMove/flat_near.exp.json
@@ -41,7 +41,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,0:8:8-0:11:11",
                 "value": [
                   {
-                    "string": "a.y"
+                    "string": "a.y",
+                    "raw_string": "a.y"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
index 0521ffd8b..28401eb18 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_map_value.d2,2:9:16-2:16:23",
                           "value": [
                             {
-                              "string": "hexagon"
+                              "string": "hexagon",
+                              "raw_string": "hexagon"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
index 12ba9058d..5ca987152 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json
@@ -118,7 +118,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.d2,6:9:62-6:16:69",
                           "value": [
                             {
-                              "string": "hexagon"
+                              "string": "hexagon",
+                              "raw_string": "hexagon"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
index 369217c57..936069718 100644
--- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
+++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json
@@ -53,7 +53,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/flat_reparent_with_value.d2,1:3:5-1:7:9",
                 "value": [
                   {
-                    "string": "yo"
+                    "string": "yo",
+                    "raw_string": "yo"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json
index 0fc9d191c..ac3ee7326 100644
--- a/testdata/d2oracle/TestMove/flat_style.exp.json
+++ b/testdata/d2oracle/TestMove/flat_style.exp.json
@@ -127,7 +127,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/flat_style.d2,2:16:44-2:21:49",
                           "value": [
                             {
-                              "string": "black"
+                              "string": "black",
+                              "raw_string": "black"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json
index 20eecde9f..d4fdf0016 100644
--- a/testdata/d2oracle/TestMove/gnarly_1.exp.json
+++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json
@@ -144,7 +144,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,2:5:25-2:9:29",
                           "value": [
                             {
-                              "string": "meow"
+                              "string": "meow",
+                              "raw_string": "meow"
                             }
                           ]
                         }
@@ -181,7 +182,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/gnarly_1.d2,4:3:35-4:8:40",
                 "value": [
                   {
-                    "string": "eyy"
+                    "string": "eyy",
+                    "raw_string": "eyy"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json
index d98ded6e2..fe66e976f 100644
--- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json
+++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json
@@ -104,7 +104,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,3:8:21-3:13:26",
                 "value": [
                   {
-                    "string": "z.x.y"
+                    "string": "z.x.y",
+                    "raw_string": "z.x.y"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json
index 561c3dc9c..16780889e 100644
--- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json
+++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json
@@ -75,7 +75,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.d2,1:9:13-1:15:19",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json
index 553161a8f..354853776 100644
--- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json
+++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json
@@ -75,7 +75,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.d2,1:11:13-1:17:19",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json
index 61a5f3bc9..990495062 100644
--- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json
+++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json
@@ -78,7 +78,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,2:11:23-2:20:32",
                                     "value": [
                                       {
-                                        "string": "sql_table"
+                                        "string": "sql_table",
+                                        "raw_string": "sql_table"
                                       }
                                     ]
                                   }
@@ -110,7 +111,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/include_descendants_sql.d2,3:7:40-3:8:41",
                                     "value": [
                                       {
-                                        "string": "b"
+                                        "string": "b",
+                                        "raw_string": "b"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
index 0c07d2608..409433d81 100644
--- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
+++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json
@@ -129,7 +129,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,3:16:51-3:25:60",
                                     "value": [
                                       {
-                                        "string": "#FFFFFF"
+                                        "string": "#FFFFFF",
+                                        "raw_string": "#FFFFFF"
                                       }
                                     ]
                                   }
@@ -172,7 +173,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/into_container_with_flat_keys.d2,4:18:79-4:27:88",
                                     "value": [
                                       {
-                                        "string": "#FFFFFF"
+                                        "string": "#FFFFFF",
+                                        "raw_string": "#FFFFFF"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json
index d9bdd3d73..e5eb38532 100644
--- a/testdata/d2oracle/TestMove/map_transplant.exp.json
+++ b/testdata/d2oracle/TestMove/map_transplant.exp.json
@@ -182,7 +182,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/map_transplant.d2,10:11:68-10:15:72",
                                     "value": [
                                       {
-                                        "string": "yo"
+                                        "string": "yo",
+                                        "raw_string": "yo"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json
index 5c5b35676..fd11c8959 100644
--- a/testdata/d2oracle/TestMove/map_with_label.exp.json
+++ b/testdata/d2oracle/TestMove/map_with_label.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/map_with_label.d2,3:5:13-3:9:17",
                           "value": [
                             {
-                              "string": "yo"
+                              "string": "yo",
+                              "raw_string": "yo"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json
index 037f7fab4..26d98f1c7 100644
--- a/testdata/d2oracle/TestMove/merge_reserved.exp.json
+++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json
@@ -99,7 +99,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,2:11:22-2:15:26",
                           "value": [
                             {
-                              "string": "yo"
+                              "string": "yo",
+                              "raw_string": "yo"
                             }
                           ]
                         }
@@ -142,7 +143,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/merge_reserved.d2,3:11:38-3:15:42",
                           "value": [
                             {
-                              "string": "hi"
+                              "string": "hi",
+                              "raw_string": "hi"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json
index 6d222608e..bb04cafce 100644
--- a/testdata/d2oracle/TestMove/near.exp.json
+++ b/testdata/d2oracle/TestMove/near.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16",
                           "value": [
                             {
-                              "string": "a.y"
+                              "string": "a.y",
+                              "raw_string": "a.y"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json
index df689ac77..178643bd1 100644
--- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json
+++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json
@@ -75,7 +75,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/nested_reserved_2.d2,1:9:13-1:15:19",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json
index f5e278e7e..6e727d799 100644
--- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json
+++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json
@@ -134,7 +134,8 @@
                                     "range": "d2/testdata/d2oracle/TestMove/nested_reserved_3.d2,3:13:31-3:19:37",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json
index a1359a9fa..8550114db 100644
--- a/testdata/d2oracle/TestMove/parentheses.exp.json
+++ b/testdata/d2oracle/TestMove/parentheses.exp.json
@@ -85,11 +85,7 @@
             "value": {
               "double_quoted_string": {
                 "range": "d2/testdata/d2oracle/TestMove/parentheses.d2,1:3:16-1:5:18",
-                "value": [
-                  {
-                    "string": ""
-                  }
-                ]
+                "value": null
               }
             }
           }
diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json
index 0e5d76161..ab093f083 100644
--- a/testdata/d2oracle/TestMove/slice_style.exp.json
+++ b/testdata/d2oracle/TestMove/slice_style.exp.json
@@ -110,7 +110,8 @@
                 "range": "d2/testdata/d2oracle/TestMove/slice_style.d2,3:8:14-3:63:69",
                 "value": [
                   {
-                    "string": "https://icons.terrastruct.com/essentials/142-target.svg"
+                    "string": "https://icons.terrastruct.com/essentials/142-target.svg",
+                    "raw_string": "https://icons.terrastruct.com/essentials/142-target.svg"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json
index 3094f38ca..914e4dc1b 100644
--- a/testdata/d2oracle/TestMove/underscore_merge.exp.json
+++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,3:5:13-3:9:17",
                           "value": [
                             {
-                              "string": "yo"
+                              "string": "yo",
+                              "raw_string": "yo"
                             }
                           ]
                         }
@@ -109,7 +110,8 @@
                           "range": "d2/testdata/d2oracle/TestMove/underscore_merge.d2,4:5:23-4:11:29",
                           "value": [
                             {
-                              "string": "what"
+                              "string": "what",
+                              "raw_string": "what"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
index cef57ffe1..02ecdaa4f 100644
--- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json
@@ -177,7 +177,8 @@
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/indexed_ref.d2,3:26:37-3:29:40",
                 "value": [
                   {
-                    "string": "red"
+                    "string": "red",
+                    "raw_string": "red"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
index 743197677..aef393151 100644
--- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json
@@ -154,7 +154,8 @@
                 "range": "d2/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.d2,2:26:35-2:29:38",
                 "value": [
                   {
-                    "string": "red"
+                    "string": "red",
+                    "raw_string": "red"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
index 0d0d769c3..5f52b761f 100644
--- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
+++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,1:16:26-1:20:30",
                           "value": [
                             {
-                              "string": "blue"
+                              "string": "blue",
+                              "raw_string": "blue"
                             }
                           ]
                         }
@@ -183,7 +184,8 @@
                           "range": "d2/testdata/d2oracle/TestReconnectEdge/second_index.d2,4:16:59-4:19:62",
                           "value": [
                             {
-                              "string": "red"
+                              "string": "red",
+                              "raw_string": "red"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json
index b467fb1be..1d4593223 100644
--- a/testdata/d2oracle/TestRename/container.exp.json
+++ b/testdata/d2oracle/TestRename/container.exp.json
@@ -437,7 +437,8 @@
                           "range": "d2/testdata/d2oracle/TestRename/container.d2,3:5:108-3:10:113",
                           "value": [
                             {
-                              "string": "label"
+                              "string": "label",
+                              "raw_string": "label"
                             }
                           ]
                         }
@@ -616,7 +617,8 @@
                 "range": "d2/testdata/d2oracle/TestRename/container.d2,10:30:181-10:45:196",
                 "value": [
                   {
-                    "string": "furbling, v.:"
+                    "string": "furbling, v.:",
+                    "raw_string": "furbling, v.:"
                   }
                 ]
               }
@@ -720,7 +722,8 @@
                 "range": "d2/testdata/d2oracle/TestRename/container.d2,11:22:219-11:37:234",
                 "value": [
                   {
-                    "string": "furbling, v.:"
+                    "string": "furbling, v.:",
+                    "raw_string": "furbling, v.:"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json
index 21f125199..6e5ab0650 100644
--- a/testdata/d2oracle/TestRename/edges.exp.json
+++ b/testdata/d2oracle/TestRename/edges.exp.json
@@ -382,7 +382,8 @@
                           "range": "d2/testdata/d2oracle/TestRename/edges.d2,3:7:66-3:12:71",
                           "value": [
                             {
-                              "string": "label"
+                              "string": "label",
+                              "raw_string": "label"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json
index e1cf9bfb6..7c7ddf563 100644
--- a/testdata/d2oracle/TestRename/near.exp.json
+++ b/testdata/d2oracle/TestRename/near.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14",
                           "value": [
                             {
-                              "string": "z"
+                              "string": "z",
+                              "raw_string": "z"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json
index a7a808ade..a99073d1f 100644
--- a/testdata/d2oracle/TestSet/classes-style.exp.json
+++ b/testdata/d2oracle/TestSet/classes-style.exp.json
@@ -89,7 +89,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,2:16:34-2:19:37",
                                     "value": [
                                       {
-                                        "string": "red"
+                                        "string": "red",
+                                        "raw_string": "red"
                                       }
                                     ]
                                   }
@@ -142,7 +143,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,5:9:53-5:10:54",
                 "value": [
                   {
-                    "string": "a"
+                    "string": "a",
+                    "raw_string": "a"
                   }
                 ]
               }
@@ -196,7 +198,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/classes-style.d2,6:14:69-6:19:74",
                 "value": [
                   {
-                    "string": "green"
+                    "string": "green",
+                    "raw_string": "green"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json
index ec26cc69e..9c74249a8 100644
--- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json
+++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json
@@ -89,7 +89,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,2:16:34-2:19:37",
                                     "value": [
                                       {
-                                        "string": "red"
+                                        "string": "red",
+                                        "raw_string": "red"
                                       }
                                     ]
                                   }
@@ -142,7 +143,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,5:9:53-5:10:54",
                 "value": [
                   {
-                    "string": "a"
+                    "string": "a",
+                    "raw_string": "a"
                   }
                 ]
               }
@@ -196,7 +198,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/dupe-classes-style.d2,6:14:69-6:19:74",
                 "value": [
                   {
-                    "string": "green"
+                    "string": "green",
+                    "raw_string": "green"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json
index 1da9d1df9..f9568af91 100644
--- a/testdata/d2oracle/TestSet/edge.exp.json
+++ b/testdata/d2oracle/TestSet/edge.exp.json
@@ -53,7 +53,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/edge.d2,0:8:8-0:11:11",
                 "value": [
                   {
-                    "string": "two"
+                    "string": "two",
+                    "raw_string": "two"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json
index 88c2c9847..e36df946d 100644
--- a/testdata/d2oracle/TestSet/edge_chain.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain.exp.json
@@ -114,7 +114,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,1:15:23-1:19:27",
                           "value": [
                             {
-                              "string": "wsup"
+                              "string": "wsup",
+                              "raw_string": "wsup"
                             }
                           ]
                         }
@@ -174,7 +175,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_chain.d2,2:15:43-2:62:90",
                           "value": [
                             {
-                              "string": "QOTD:\n  \"It's been Monday all week today.\""
+                              "string": "QOTD:\n  \"It's been Monday all week today.\"",
+                              "raw_string": "QOTD:\\n  \\\"It's been Monday all week today.\\\""
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
index f39d6e68e..3bd0f42a8 100644
--- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json
@@ -114,7 +114,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_chain_nested_set.d2,1:15:23-1:19:27",
                           "value": [
                             {
-                              "string": "wsup"
+                              "string": "wsup",
+                              "raw_string": "wsup"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
index d6b04d13d..fe8208050 100644
--- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json
@@ -168,7 +168,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.d2,1:36:48-1:42:54",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json
index 8ae066c10..d1eb8f9c3 100644
--- a/testdata/d2oracle/TestSet/edge_index_case.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_index_case.d2,1:22:32-1:25:35",
                           "value": [
                             {
-                              "string": "two"
+                              "string": "two",
+                              "raw_string": "two"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
index a18a8da4d..1abf22a57 100644
--- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json
+++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_index_nested.d2,1:10:18-1:14:22",
                           "value": [
                             {
-                              "string": "QOTD"
+                              "string": "QOTD",
+                              "raw_string": "QOTD"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
index f7ffe8821..e647ebf85 100644
--- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json
@@ -130,7 +130,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/edge_merge_arrowhead.d2,3:11:56-3:18:63",
                                     "value": [
                                       {
-                                        "string": "diamond"
+                                        "string": "diamond",
+                                        "raw_string": "diamond"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
index 53237d909..64f975592 100644
--- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
+++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json
@@ -77,7 +77,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_nested_label_set.d2,1:10:18-1:12:20",
                           "value": [
                             {
-                              "string": "yo"
+                              "string": "yo",
+                              "raw_string": "yo"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
index c9064aac6..88538296c 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead.d2,0:33:33-0:40:40",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
index a852056d4..7b3b4168a 100644
--- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
+++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json
@@ -131,7 +131,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.d2,1:36:43-1:43:50",
                 "value": [
                   {
-                    "string": "diamond"
+                    "string": "diamond",
+                    "raw_string": "diamond"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
index f34c30d72..4a3477968 100644
--- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/edge_set_arrowhead.d2,0:33:33-0:40:40",
                           "value": [
                             {
-                              "string": "diamond"
+                              "string": "diamond",
+                              "raw_string": "diamond"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json
index 08156af78..ab79c0a72 100644
--- a/testdata/d2oracle/TestSet/icon.exp.json
+++ b/testdata/d2oracle/TestSet/icon.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/icon.d2,0:13:13-0:66:66",
                           "value": [
                             {
-                              "string": "https://icons.terrastruct.com/essentials/087-menu.svg"
+                              "string": "https://icons.terrastruct.com/essentials/087-menu.svg",
+                              "raw_string": "https://icons.terrastruct.com/essentials/087-menu.svg"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json
index f66fd2cda..032b0654e 100644
--- a/testdata/d2oracle/TestSet/inline_style.exp.json
+++ b/testdata/d2oracle/TestSet/inline_style.exp.json
@@ -105,7 +105,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/inline_style.d2,2:14:45-2:17:48",
                           "value": [
                             {
-                              "string": "red"
+                              "string": "red",
+                              "raw_string": "red"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json
index 601a69cfe..b091d0d7e 100644
--- a/testdata/d2oracle/TestSet/label.exp.json
+++ b/testdata/d2oracle/TestSet/label.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/label.d2,0:8:8-0:87:87",
                 "value": [
                   {
-                    "string": "Always try to do things in chronological order; it's less confusing that way."
+                    "string": "Always try to do things in chronological order; it's less confusing that way.",
+                    "raw_string": "Always try to do things in chronological order; it's less confusing that way."
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json
index 57815ab6f..976aa222f 100644
--- a/testdata/d2oracle/TestSet/label_replace.exp.json
+++ b/testdata/d2oracle/TestSet/label_replace.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/label_replace.d2,0:8:8-0:87:87",
                 "value": [
                   {
-                    "string": "Always try to do things in chronological order; it's less confusing that way."
+                    "string": "Always try to do things in chronological order; it's less confusing that way.",
+                    "raw_string": "Always try to do things in chronological order; it's less confusing that way."
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json
index 3fa422118..e26a74490 100644
--- a/testdata/d2oracle/TestSet/map_key_missing.exp.json
+++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json
@@ -76,7 +76,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/map_key_missing.d2,0:11:11-0:82:82",
                 "value": [
                   {
-                    "string": "Never offend people with style when you can offend them with substance."
+                    "string": "Never offend people with style when you can offend them with substance.",
+                    "raw_string": "Never offend people with style when you can offend them with substance."
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json
index 46c65b1e3..97bb445e0 100644
--- a/testdata/d2oracle/TestSet/nested_alex.exp.json
+++ b/testdata/d2oracle/TestSet/nested_alex.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,1:9:17-1:11:19",
                           "value": [
                             {
-                              "string": "do"
+                              "string": "do",
+                              "raw_string": "do"
                             }
                           ]
                         }
@@ -109,7 +110,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,2:16:36-2:20:40",
                           "value": [
                             {
-                              "string": "asdf"
+                              "string": "asdf",
+                              "raw_string": "asdf"
                             }
                           ]
                         }
@@ -141,7 +143,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/nested_alex.d2,3:8:49-3:158:199",
                           "value": [
                             {
-                              "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing"
+                              "string": "How much of their influence on you is a result of your influence on them?\nA conference is a gathering of important people who singly can do nothing",
+                              "raw_string": "How much of their influence on you is a result of your influence on them?\\nA conference is a gathering of important people who singly can do nothing"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
index ae74ac3ba..9870e4e34 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead.d2,1:26:36-1:32:42",
                           "value": [
                             {
-                              "string": "circle"
+                              "string": "circle",
+                              "raw_string": "circle"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
index 5b4e8547a..2c26e580a 100644
--- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
+++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json
@@ -101,7 +101,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/replace_arrowhead_map.d2,2:11:43-2:17:49",
                                     "value": [
                                       {
-                                        "string": "circle"
+                                        "string": "circle",
+                                        "raw_string": "circle"
                                       }
                                     ]
                                   }
diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
index ed61d736f..e85fb417b 100644
--- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
+++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json
@@ -65,7 +65,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/replace_fill_pattern.d2,1:22:32-1:27:37",
                           "value": [
                             {
-                              "string": "grain"
+                              "string": "grain",
+                              "raw_string": "grain"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json
index b8e5e01e0..e6ac31625 100644
--- a/testdata/d2oracle/TestSet/replace_link.exp.json
+++ b/testdata/d2oracle/TestSet/replace_link.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/replace_link.d2,1:8:18-1:25:35",
                           "value": [
                             {
-                              "string": "https://apple.com"
+                              "string": "https://apple.com",
+                              "raw_string": "https://apple.com"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json
index 7d3024894..9fa391b04 100644
--- a/testdata/d2oracle/TestSet/replace_shape.exp.json
+++ b/testdata/d2oracle/TestSet/replace_shape.exp.json
@@ -41,7 +41,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/replace_shape.d2,0:14:14-0:20:20",
                 "value": [
                   {
-                    "string": "circle"
+                    "string": "circle",
+                    "raw_string": "circle"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
index 66bbecebf..197c9461b 100644
--- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
+++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json
@@ -52,7 +52,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/replace_style_edgecase.d2,0:19:19-0:25:25",
                 "value": [
                   {
-                    "string": "orange"
+                    "string": "orange",
+                    "raw_string": "orange"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
index 18a8a85a6..c1490dc89 100644
--- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/replace_tooltip.d2,1:11:21-1:12:22",
                           "value": [
                             {
-                              "string": "y"
+                              "string": "y",
+                              "raw_string": "y"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json
index e25834dfd..168961d59 100644
--- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json
@@ -88,7 +88,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:26:36-1:34:44",
                           "value": [
                             {
-                              "string": "triangle"
+                              "string": "triangle",
+                              "raw_string": "triangle"
                             }
                           ]
                         }
@@ -282,7 +283,8 @@
                                               "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131",
                                               "value": [
                                                 {
-                                                  "string": "diamond"
+                                                  "string": "diamond",
+                                                  "raw_string": "diamond"
                                                 }
                                               ]
                                             }
@@ -867,7 +869,8 @@
                                         "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,8:30:124-8:37:131",
                                         "value": [
                                           {
-                                            "string": "diamond"
+                                            "string": "diamond",
+                                            "raw_string": "diamond"
                                           }
                                         ]
                                       }
diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
index e6e289764..9dd6fd8f1 100644
--- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json
@@ -170,7 +170,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63",
                                     "value": [
                                       {
-                                        "string": "b"
+                                        "string": "b",
+                                        "raw_string": "b"
                                       }
                                     ]
                                   }
@@ -294,7 +295,8 @@
                     "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,7:7:62-7:8:63",
                     "value": [
                       {
-                        "string": "b"
+                        "string": "b",
+                        "raw_string": "b"
                       }
                     ]
                   }
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 b7d308ac2..10d0c34ab 100644
--- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,1:5:10-1:10:15",
                           "value": [
                             {
-                              "string": "outer"
+                              "string": "outer",
+                              "raw_string": "outer"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
index d51f5db66..446504d3b 100644
--- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
+++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json
@@ -30,7 +30,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:3:3-0:8:8",
                 "value": [
                   {
-                    "string": "outer"
+                    "string": "outer",
+                    "raw_string": "outer"
                   }
                 ]
               }
diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
index 5552199b8..476a81bc1 100644
--- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
+++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json
@@ -65,7 +65,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/set_fill_pattern.d2,0:29:29-0:34:34",
                           "value": [
                             {
-                              "string": "grain"
+                              "string": "grain",
+                              "raw_string": "grain"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json
index e08e95d17..a832f994d 100644
--- a/testdata/d2oracle/TestSet/set_tooltip.exp.json
+++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/set_tooltip.d2,0:18:18-0:19:19",
                           "value": [
                             {
-                              "string": "y"
+                              "string": "y",
+                              "raw_string": "y"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json
index fc4a57469..bd4bedb40 100644
--- a/testdata/d2oracle/TestSet/shape.exp.json
+++ b/testdata/d2oracle/TestSet/shape.exp.json
@@ -54,7 +54,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/shape.d2,0:16:16-0:22:22",
                           "value": [
                             {
-                              "string": "square"
+                              "string": "square",
+                              "raw_string": "square"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json
index ef7596fba..fce9058ea 100644
--- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json
+++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json
@@ -89,7 +89,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,2:16:34-2:19:37",
                                     "value": [
                                       {
-                                        "string": "red"
+                                        "string": "red",
+                                        "raw_string": "red"
                                       }
                                     ]
                                   }
@@ -166,7 +167,8 @@
                           "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style-2.d2,5:16:60-5:21:65",
                           "value": [
                             {
-                              "string": "green"
+                              "string": "green",
+                              "raw_string": "green"
                             }
                           ]
                         }
diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json
index 971db84a9..b7ac7a166 100644
--- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json
+++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json
@@ -89,7 +89,8 @@
                                     "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,2:16:34-2:19:37",
                                     "value": [
                                       {
-                                        "string": "red"
+                                        "string": "red",
+                                        "raw_string": "red"
                                       }
                                     ]
                                   }
@@ -153,7 +154,8 @@
                 "range": "d2/testdata/d2oracle/TestSet/unapplied-classes-style.d2,5:14:58-5:19:63",
                 "value": [
                   {
-                    "string": "green"
+                    "string": "green",
+                    "raw_string": "green"
                   }
                 ]
               }