Merge pull request #1090 from alixander/scenarios-bug

fix scenarios/steps inheritence

ci/release/changelogs/next.md

@@ -10,6 +10,7 @@
 
 #### Bugfixes ⛑️
 
+- Fix inheritence in scenarios/steps [#1090](https://github.com/terrastruct/d2/pull/1090)
 - Fix a bug in 32bit builds [#1115](https://github.com/terrastruct/d2/issues/1115)
 - Fix a bug in ID parsing [#322](https://github.com/terrastruct/d2/issues/322)
 - Fix a bug in watch mode parsing SVG [#1119](https://github.com/terrastruct/d2/issues/1119)

d2compiler/compile_test.go

@@ -2456,6 +2456,19 @@ layers: {
 				assert.False(t, g.Layers[1].Scenarios[1].IsFolderOnly)
 			},
 		},
+		{
+			name: "scenarios_edge_index",
+			run: func(t *testing.T) {
+				assertCompile(t, `a -> x
+
+scenarios: {
+  1: {
+    (a -> x)[0].style.opacity: 0.1
+  }
+}
+`, "")
+			},
+		},
 		{
 			name: "errs/duplicate_board",
 			run: func(t *testing.T) {

d2ir/compile.go

@@ -22,62 +22,20 @@ func Compile(ast *d2ast.Map) (*Map, error) {
 	m.initRoot()
 	m.parent.(*Field).References[0].Context.Scope = ast
 	c.compileMap(m, ast)
-	c.compileScenarios(m)
-	c.compileSteps(m)
 	if !c.err.Empty() {
 		return nil, c.err
 	}
 	return m, nil
 }
 
-func (c *compiler) compileScenarios(m *Map) {
-	scenariosf := m.GetField("scenarios")
-	if scenariosf == nil {
+func (c *compiler) overlay(base *Map, f *Field) {
+	if f.Map() == nil || f.Primary() != nil {
+		c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f))
 		return
 	}
-	scenarios := scenariosf.Map()
-	if scenarios == nil {
-		return
-	}
-
-	for _, sf := range scenarios.Fields {
-		if sf.Map() == nil || sf.Primary() != nil {
-			c.errorf(sf.References[0].Context.Key, "invalid scenario")
-			continue
-		}
-		base := m.CopyBase(sf)
-		OverlayMap(base, sf.Map())
-		sf.Composite = base
-		c.compileScenarios(sf.Map())
-		c.compileSteps(sf.Map())
-	}
-}
-
-func (c *compiler) compileSteps(m *Map) {
-	stepsf := m.GetField("steps")
-	if stepsf == nil {
-		return
-	}
-	steps := stepsf.Map()
-	if steps == nil {
-		return
-	}
-	for i, sf := range steps.Fields {
-		if sf.Map() == nil || sf.Primary() != nil {
-			c.errorf(sf.References[0].Context.Key, "invalid step")
-			break
-		}
-		var base *Map
-		if i == 0 {
-			base = m.CopyBase(sf)
-		} else {
-			base = steps.Fields[i-1].Map().CopyBase(sf)
-		}
-		OverlayMap(base, sf.Map())
-		sf.Composite = base
-		c.compileScenarios(sf.Map())
-		c.compileSteps(sf.Map())
-	}
+	base = base.CopyBase(f)
+	OverlayMap(base, f.Map())
+	f.Composite = base
 }
 
 func (c *compiler) compileMap(dst *Map, ast *d2ast.Map) {
@@ -128,6 +86,22 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext)
 				parent: f,
 			}
 		}
+		switch NodeBoardKind(f) {
+		case BoardScenario:
+			c.overlay(ParentBoard(f).Map(), f)
+		case BoardStep:
+			stepsMap := ParentMap(f)
+			for i := range stepsMap.Fields {
+				if stepsMap.Fields[i] == f {
+					if i == 0 {
+						c.overlay(ParentBoard(f).Map(), f)
+					} else {
+						c.overlay(stepsMap.Fields[i-1].Map(), f)
+					}
+					break
+				}
+			}
+		}
 		c.compileMap(f.Map(), refctx.Key.Value.Map)
 	} else if refctx.Key.Value.ScalarBox().Unbox() != nil {
 		// If the link is a board, we need to transform it into an absolute path.

d2ir/compile_test.go

@@ -379,6 +379,20 @@ scenarios: {
 				assertQuery(t, m, 0, 0, nil, "scenarios.nuclear.quiche")
 			},
 		},
+		{
+			name: "edge",
+			run: func(t testing.TB) {
+				m, err := compile(t, `a -> b
+scenarios: {
+  1: {
+    (a -> b)[0].style.opacity: 0.1
+  }
+}`)
+				assert.Success(t, err)
+
+				assertQuery(t, m, 0, 0, nil, "(a -> b)[0]")
+			},
+		},
 	}
 	runa(t, tca)
 }
@@ -431,9 +445,8 @@ scenarios: {
   shape: sql_table
   hey: int {constraint: primary_key}
 }`)
-				assert.ErrorString(t, err, `TestCompile/steps/steps_panic.d2:6:3: invalid scenario
-TestCompile/steps/steps_panic.d2:7:3: invalid scenario
-TestCompile/steps/steps_panic.d2:2:3: invalid step`)
+				assert.ErrorString(t, err, `TestCompile/steps/steps_panic.d2:3:3: invalid step
+TestCompile/steps/steps_panic.d2:7:3: invalid scenario`)
 			},
 		},
 		{