d2ir: Review fixes #714

d2ir/compile.go

@@ -61,7 +61,6 @@ func (c *compiler) compileSteps(m *Map) {
 		if sf.Map() == nil {
 			continue
 		}
-
 		var base *Map
 		if i == 0 {
 			base = m.CopyBase(sf)
@@ -243,7 +242,7 @@ func (c *compiler) compileArray(dst *Array, a *d2ast.Array) {
 				Value:  v,
 			}
 		case *d2ast.Substitution:
-			panic("TODO")
+			// panic("TODO")
 		}
 
 		dst.Values = append(dst.Values, irv)

d2ir/d2ir.go

@@ -268,6 +268,8 @@ type Field struct {
 
 	Name string `json:"name"`
 
+	// Primary_ to avoid clashing with Primary(). We need to keep it exported for
+	// encoding/json to marshal it so cannot prefix _ instead.
 	Primary_  *Scalar   `json:"primary,omitempty"`
 	Composite Composite `json:"composite,omitempty"`
 

e2etests/stable_test.go

@@ -1877,6 +1877,62 @@ a.sp1 -> a.sp2: redirect
 a.sp2 -> b: bar
 `,
 		},
+		{
+			name: "complex-layers",
+			script: `
+desc: Multi-layer diagram of a home.
+
+window: {
+  style.double-border: true
+}
+roof
+garage
+
+layers: {
+  window: {
+    blinds
+    glass
+  }
+  roof: {
+    shingles
+    starlink
+    utility hookup
+  }
+  garage: {
+    tools
+    vehicles
+  }
+  repair: {
+    desc: How to repair a home.
+
+    steps: {
+      1: {
+        find contractors: {
+          craigslist
+          facebook
+        }
+      }
+      2: {
+        find contractors -> solicit quotes
+      }
+      3: {
+        obtain quotes -> negotiate
+      }
+      4: {
+        negotiate -> book the best bid
+      }
+    }
+  }
+}
+
+scenarios: {
+  storm: {
+    water
+    rain
+    thunder
+  }
+}`,
+		},
 	}
 
 	runa(t, tcs)