folder check

terrastruct · Jul 29, 2023 · 167a5c7 · 167a5c7
1 parent 3b0939f
commit 167a5c7
Show file tree

Hide file tree

Showing 12 changed files with 314 additions and 9 deletions.
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
@@ -92,6 +92,9 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
 			g.IsFolderOnly = true
 		}
 	}
+	if len(g.Objects) == 0 {
+		g.IsFolderOnly = true
+	}
 	return g
 }
 

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -2832,6 +2832,21 @@ layers: {
 				assert.False(t, g.Layers[1].Scenarios[1].IsFolderOnly)
 			},
 		},
+		{
+			name: "isFolderOnly-shapes",
+			run: func(t *testing.T) {
+				g, _ := assertCompile(t, `
+direction: right
+
+steps: {
+  1: {
+    RJ
+  }
+}
+`, "")
+				assert.True(t, g.IsFolderOnly)
+			},
+		},
 		{
 			name: "scenarios_edge_index",
 			run: func(t *testing.T) {

diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json
diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json
diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json
diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json
diff --git a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json
diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json