Merge pull request #1504 from alixander/robust-folder

g.isFolderOnly=true when no objects

ci/release/changelogs/next.md

@@ -15,6 +15,7 @@
 - All font styles in sketch mode use a consistent font-family [#1463](https://github.com/terrastruct/d2/pull/1463)
 - Tooltip and link icons are now positioned on shape border [#1466](https://github.com/terrastruct/d2/pull/1466)
 - Tooltip and link icons are always rendered over shapes [#1467](https://github.com/terrastruct/d2/pull/1467)
+- Boards with no objects are considered folders [#1504](https://github.com/terrastruct/d2/pull/1504)
 
 #### Bugfixes ⛑️
 

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
 }
 

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) {

e2etests-cli/main_test.go

@@ -74,8 +74,6 @@ func TestCLI_E2E(t *testing.T) {
 				writeFile(t, dir, "empty-layer.d2", `layers: { x: {} }`)
 				err := runTestMain(t, ctx, dir, env, "empty-layer.d2")
 				assert.Success(t, err)
-
-				assert.TestdataDir(t, filepath.Join(dir, "empty-layer"))
 			},
 		},
 		{