IsContainerOnly -> IsFolderOnly

This commit is contained in:
Anmol Sethi 2023-02-27 14:33:33 -08:00
parent 78b09f5007
commit f64b5c010d
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
641 changed files with 2361 additions and 673 deletions

2
ci/sub

@ -1 +1 @@
Subproject commit 512bad5a958c5e33ba9b3e89dfac1bfd6002f98c
Subproject commit cb8a9993d7e1d91815650c5baade7658622189b9

View file

@ -73,7 +73,7 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph {
c.compileBoardsField(g, ir, "steps")
if d2ir.ParentMap(ir).CopyBase(nil).Equal(ir.CopyBase(nil)) {
if len(g.Layers) > 0 || len(g.Scenarios) > 0 || len(g.Steps) > 0 {
g.IsContainerOnly = true
g.IsFolderOnly = true
}
}
return g

View file

@ -2133,7 +2133,7 @@ layers: {
},
},
{
name: "isContainerOnly",
name: "isFolderOnly",
run: func(t *testing.T) {
g := assertCompile(t, `
layers: {
@ -2154,13 +2154,13 @@ layers: {
}
}
`, "")
assert.True(t, g.IsContainerOnly)
assert.True(t, g.IsFolderOnly)
assert.Equal(t, 2, len(g.Layers))
assert.Equal(t, "one", g.Layers[0].Name)
assert.Equal(t, "two", g.Layers[1].Name)
assert.Equal(t, 2, len(g.Layers[1].Scenarios))
assert.False(t, g.Layers[1].Scenarios[0].IsContainerOnly)
assert.False(t, g.Layers[1].Scenarios[1].IsContainerOnly)
assert.False(t, g.Layers[1].Scenarios[0].IsFolderOnly)
assert.False(t, g.Layers[1].Scenarios[1].IsFolderOnly)
},
},
{

View file

@ -16,7 +16,7 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil
diagram := d2target.NewDiagram()
applyStyles(&diagram.Root, g.Root)
diagram.Name = g.Name
diagram.IsContainerOnly = g.IsContainerOnly
diagram.IsFolderOnly = g.IsFolderOnly
if fontFamily == nil {
fontFamily = go2.Pointer(d2fonts.SourceSansPro)
}

View file

@ -29,11 +29,11 @@ const MIN_SHAPE_SIZE = 5
type Graph struct {
Name string `json:"name"`
// IsContainerOnly indicates a board or scenario itself makes no modifications from its
// base. Container only boards do not have a render and are used purely for organizing
// IsFolderOnly indicates a board or scenario itself makes no modifications from its
// base. Folder only boards do not have a render and are used purely for organizing
// the board tree.
IsContainerOnly bool `json:"isContainerOnly"`
AST *d2ast.Map `json:"ast"`
IsFolderOnly bool `json:"isFolderOnly"`
AST *d2ast.Map `json:"ast"`
Root *Object `json:"root"`
Edges []*Edge `json:"edges"`

View file

@ -36,9 +36,9 @@ var BorderOffset = geo.NewVector(5, 5)
type Diagram struct {
Name string `json:"name"`
// See docs on the same field in d2graph to understand what it means.
IsContainerOnly bool `json:"isContainerOnly"`
Description string `json:"description,omitempty"`
FontFamily *d2fonts.FontFamily `json:"fontFamily,omitempty"`
IsFolderOnly bool `json:"isFolderOnly"`
Description string `json:"description,omitempty"`
FontFamily *d2fonts.FontFamily `json:"fontFamily,omitempty"`
Shapes []Shape `json:"shapes"`
Connections []Connection `json:"connections"`

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [],
"connections": [],

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [],
"connections": [],

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

View file

@ -1,6 +1,6 @@
{
"name": "",
"isContainerOnly": false,
"isFolderOnly": false,
"fontFamily": "SourceSansPro",
"shapes": [
{

Some files were not shown because too many files have changed in this diff Show more