Skip to content

Commit f64b5c0

Browse files
committed
IsContainerOnly -> IsFolderOnly
1 parent 78b09f5 commit f64b5c0

File tree

641 files changed

+2361
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

641 files changed

+2361
-673
lines changed

ci/sub

d2compiler/compile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
7373
c.compileBoardsField(g, ir, "steps")
7474
if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) {
7575
if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 {
76-
g.IsContainerOnly = true
76+
g.IsFolderOnly = true
7777
}
7878
}
7979
return g

d2compiler/compile_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,7 @@ layers: {
21332133
},
21342134
},
21352135
{
2136-
name: "isContainerOnly",
2136+
name: "isFolderOnly",
21372137
run: func(t *testing.T) {
21382138
g := assertCompile(t, `
21392139
layers: {
@@ -2154,13 +2154,13 @@ layers: {
21542154
}
21552155
}
21562156
`, "")
2157-
assert.True(t, g.IsContainerOnly)
2157+
assert.True(t, g.IsFolderOnly)
21582158
assert.Equal(t, 2, len(g.Layers))
21592159
assert.Equal(t, "one", g.Layers[0].Name)
21602160
assert.Equal(t, "two", g.Layers[1].Name)
21612161
assert.Equal(t, 2, len(g.Layers[1].Scenarios))
2162-
assert.False(t, g.Layers[1].Scenarios[0].IsContainerOnly)
2163-
assert.False(t, g.Layers[1].Scenarios[1].IsContainerOnly)
2162+
assert.False(t, g.Layers[1].Scenarios[0].IsFolderOnly)
2163+
assert.False(t, g.Layers[1].Scenarios[1].IsFolderOnly)
21642164
},
21652165
},
21662166
{

d2exporter/export.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
1616
diagram := d2target.NewDiagram()
1717
applyStyles(&diagram.Root, g.Root)
1818
diagram.Name = g.Name
19-
diagram.IsContainerOnly = g.IsContainerOnly
19+
diagram.IsFolderOnly = g.IsFolderOnly
2020
if fontFamily == nil {
2121
fontFamily = go2.Pointer(d2fonts.SourceSansPro)
2222
}

d2graph/d2graph.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ const MIN_SHAPE_SIZE = 5
2929

3030
type Graph struct {
3131
Name string `json:"name"`
32-
// IsContainerOnly indicates a board or scenario itself makes no modifications from its
33-
// base. Container only boards do not have a render and are used purely for organizing
32+
// IsFolderOnly indicates a board or scenario itself makes no modifications from its
33+
// base. Folder only boards do not have a render and are used purely for organizing
3434
// the board tree.
35-
IsContainerOnly bool `json:"isContainerOnly"`
36-
AST *d2ast.Map `json:"ast"`
35+
IsFolderOnly bool `json:"isFolderOnly"`
36+
AST *d2ast.Map `json:"ast"`
3737

3838
Root *Object `json:"root"`
3939
Edges []*Edge `json:"edges"`

d2target/d2target.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ var BorderOffset = geo.NewVector(5, 5)
3636
type Diagram struct {
3737
Name string `json:"name"`
3838
// See docs on the same field in d2graph to understand what it means.
39-
IsContainerOnly bool `json:"isContainerOnly"`
40-
Description string `json:"description,omitempty"`
41-
FontFamily *d2fonts.FontFamily `json:"fontFamily,omitempty"`
39+
IsFolderOnly bool `json:"isFolderOnly"`
40+
Description string `json:"description,omitempty"`
41+
FontFamily *d2fonts.FontFamily `json:"fontFamily,omitempty"`
4242

4343
Shapes []Shape `json:"shapes"`
4444
Connections []Connection `json:"connections"`

e2etests/testdata/measured/empty-class/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/measured/empty-shape/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/ampersand-escape/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_alignment/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_alignment/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_order/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/elk_order/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/empty_class_height/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/empty_class_height/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/empty_sequence/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/empty_sequence/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/hex-fill/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/hex-fill/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/just-width/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/just-width/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/nested_steps/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/nested_steps/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/no-lexer/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/no-lexer/elk/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)