drawio_dsl 0.5.0 → 0.5.3

data/lib/drawio_dsl/configuration_shapes.rb

@@ -5,9 +5,16 @@
 module DrawioDsl
   # Used to attach configuration to KConfig module
   module ConfigurationShapes
-    ShapeDefaults = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
+    ShapeDefaults = Struct.new(:type, :text_only, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
     Shapes = Struct.new(
       :shape,
+      :h1,
+      :h2,
+      :h3,
+      :h4,
+      :h5,
+      :h6,
+      :p,
       :actor,
       :actor2,
       :callout,
@@ -35,39 +42,52 @@ module DrawioDsl
       :tick,
       :face,
       :triangle,
+      :embed_row,
+      :embed_col50,
+      :embed_col200,
       keyword_init: true
     )
 
     def add_shapes
       @shapes = Shapes.new(
-        shape: ShapeDefaults.new(type: :shape, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
-        actor: ShapeDefaults.new(type: :actor, x: 0, y: 0, w: 40, h: 50, style_modifiers: 'shape=actor'),
-        actor2: ShapeDefaults.new(type: :actor2, x: 0, y: 0, w: 30, h: 50, style_modifiers: 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'),
-        callout: ShapeDefaults.new(type: :callout, x: 0, y: 0, w: 160, h: 120, style_modifiers: 'shape=callout'),
-        callout2: ShapeDefaults.new(type: :callout2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.oval_callout'),
-        callout3: ShapeDefaults.new(type: :callout3, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.cloud_callout'),
-        callout4: ShapeDefaults.new(type: :callout4, x: 0, y: 0, w: 160, h: 120, style_modifiers: 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'),
-        circle: ShapeDefaults.new(type: :circle, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'ellipse'),
-        cloud: ShapeDefaults.new(type: :cloud, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=cloud'),
-        cross: ShapeDefaults.new(type: :cross, x: 0, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'),
-        envelop: ShapeDefaults.new(type: :envelop, x: 0, y: 0, w: 160, h: 100, style_modifiers: 'shape=message'),
-        diamond: ShapeDefaults.new(type: :diamond, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'rhombus'),
-        document: ShapeDefaults.new(type: :document, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
-        ellipse: ShapeDefaults.new(type: :ellipse, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
-        hexagon: ShapeDefaults.new(type: :hexagon, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
-        container: ShapeDefaults.new(type: :container, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
-        container2: ShapeDefaults.new(type: :container2, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane'),
-        container3: ShapeDefaults.new(type: :container3, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;startSize=50'),
-        container4: ShapeDefaults.new(type: :container4, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;resizable=0'),
-        note: ShapeDefaults.new(type: :note, x: 0, y: 0, w: 160, h: 160, style_modifiers: 'shape=note'),
-        process: ShapeDefaults.new(type: :process, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=process'),
-        rectangle: ShapeDefaults.new(type: :rectangle, x: 0, y: 0, w: 200, h: 120, style_modifiers: ''),
-        rectangle2: ShapeDefaults.new(type: :rectangle2, x: 0, y: 0, w: 200, h: 120, style_modifiers: 'shape=mxgraph.basic.cloud_rect'),
-        square: ShapeDefaults.new(type: :square, x: 0, y: 0, w: 160, h: 160, style_modifiers: ''),
-        step: ShapeDefaults.new(type: :step, x: 0, y: 0, w: 120, h: 80, style_modifiers: 'shape=step;perimeter=stepPerimeter;fixedSize=1'),
-        tick: ShapeDefaults.new(type: :tick, x: 0, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'),
-        face: ShapeDefaults.new(type: :face, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'),
-        triangle: ShapeDefaults.new(type: :triangle, x: 0, y: 0, w: 100, h: 100, style_modifiers: 'triangle')
+        shape: ShapeDefaults.new(type: :shape, text_only: false, x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        h1: ShapeDefaults.new(type: :h1, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=89;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h2: ShapeDefaults.new(type: :h2, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=67;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h3: ShapeDefaults.new(type: :h3, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=50;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h4: ShapeDefaults.new(type: :h4, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=37;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h5: ShapeDefaults.new(type: :h5, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=28;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        h6: ShapeDefaults.new(type: :h6, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=21;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        p: ShapeDefaults.new(type: :p, x: 0, text_only: true, y: 0, w: 100, h: 50, style_modifiers: 'text;fontSize=16;fontColor=#ffffff;fontStyle=1;fillColor=none'),
+        actor: ShapeDefaults.new(type: :actor, x: 0, text_only: false, y: 0, w: 40, h: 50, style_modifiers: 'shape=actor'),
+        actor2: ShapeDefaults.new(type: :actor2, x: 0, text_only: false, y: 0, w: 30, h: 50, style_modifiers: 'shape=umlActor;verticalLabelPosition=bottom;outlineConnect=1'),
+        callout: ShapeDefaults.new(type: :callout, x: 0, text_only: false, y: 0, w: 160, h: 120, style_modifiers: 'shape=callout'),
+        callout2: ShapeDefaults.new(type: :callout2, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.oval_callout'),
+        callout3: ShapeDefaults.new(type: :callout3, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.cloud_callout'),
+        callout4: ShapeDefaults.new(type: :callout4, x: 0, text_only: false, y: 0, w: 160, h: 120, style_modifiers: 'shape=mxgraph.basic.roundRectCallout;dx=30;dy=15;size=5;boundedLbl=1;'),
+        circle: ShapeDefaults.new(type: :circle, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'ellipse'),
+        cloud: ShapeDefaults.new(type: :cloud, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=cloud'),
+        cross: ShapeDefaults.new(type: :cross, x: 0, text_only: false, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x'),
+        envelop: ShapeDefaults.new(type: :envelop, x: 0, text_only: false, y: 0, w: 160, h: 100, style_modifiers: 'shape=message'),
+        diamond: ShapeDefaults.new(type: :diamond, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'rhombus'),
+        document: ShapeDefaults.new(type: :document, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=mxgraph.basic.document'),
+        ellipse: ShapeDefaults.new(type: :ellipse, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'ellipse'),
+        hexagon: ShapeDefaults.new(type: :hexagon, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=hexagon'),
+        container: ShapeDefaults.new(type: :container, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane'),
+        container2: ShapeDefaults.new(type: :container2, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;horizontal=0'),
+        container3: ShapeDefaults.new(type: :container3, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;startSize=50'),
+        container4: ShapeDefaults.new(type: :container4, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'swimlane;resizable=0'),
+        note: ShapeDefaults.new(type: :note, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: 'shape=note'),
+        process: ShapeDefaults.new(type: :process, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=process'),
+        rectangle: ShapeDefaults.new(type: :rectangle, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: ''),
+        rectangle2: ShapeDefaults.new(type: :rectangle2, x: 0, text_only: false, y: 0, w: 200, h: 120, style_modifiers: 'shape=mxgraph.basic.cloud_rect'),
+        square: ShapeDefaults.new(type: :square, x: 0, text_only: false, y: 0, w: 160, h: 160, style_modifiers: ''),
+        step: ShapeDefaults.new(type: :step, x: 0, text_only: false, y: 0, w: 120, h: 80, style_modifiers: 'shape=step;perimeter=stepPerimeter;fixedSize=1'),
+        tick: ShapeDefaults.new(type: :tick, x: 0, text_only: false, y: 0, w: 50, h: 50, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.tick'),
+        face: ShapeDefaults.new(type: :face, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'verticalLabelPosition=bottom;verticalAlign=top;shape=mxgraph.basic.smiley'),
+        triangle: ShapeDefaults.new(type: :triangle, x: 0, text_only: false, y: 0, w: 100, h: 100, style_modifiers: 'triangle'),
+        embed_row: ShapeDefaults.new(type: :embed_row, x: 0, text_only: false, y: 0, w: 200, h: 40, style_modifiers: 'shape=partialRectangle;collapsible=0;dropTarget=0;pointerEvents=0;top=0;left=0;bottom=1;right=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest'),
+        embed_col50: ShapeDefaults.new(type: :embed_col50, x: 0, text_only: false, y: 0, w: 50, h: 40, style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden'),
+        embed_col200: ShapeDefaults.new(type: :embed_col200, x: 0, text_only: false, y: 0, w: 150, h: 40, style_modifiers: 'shape=partialRectangle;connectable=0;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden')
       )
     end
   end

data/lib/drawio_dsl/dom_builder.rb

@@ -54,20 +54,20 @@ module DrawioDsl
 
     def add_grid_layout(**opts)
       rule = DrawioDsl::Schema::GridLayout.new(current_page, **opts)
-      add_layout_rule(rule)
+      add_layout(rule)
     end
 
     def add_flex_layout(**opts)
       rule = DrawioDsl::Schema::FlexLayout.new(current_page, **opts)
-      add_layout_rule(rule)
+      add_layout(rule)
     end
 
-    def add_layout_rule(rule)
+    def add_layout(rule)
       @current_layout_rule = rule
 
       rule.id = "rule-#{current_page.nodes.length + 1}" unless rule.id
 
-      current_page.nodes << rule
+      current_page.nodes.add(rule)
 
       rule
     end
@@ -81,7 +81,7 @@ module DrawioDsl
 
       shape.id = "#{current_page.id}-#{current_page.nodes.length + 1}" unless shape.id
 
-      current_page.nodes << shape
+      current_page.nodes.add(shape)
 
       shape
     end

data/lib/drawio_dsl/dom_builder_shapes.rb

@@ -4,6 +4,41 @@
 module DrawioDsl
   # DrawioDsl is a DSL for draw-io diagrams.
   module DomBuilderShapes
+    def add_h1(**opts)
+      h1 = DrawioDsl::Schema::H1.new(current_page, **opts)
+      add_shape(h1)
+    end
+
+    def add_h2(**opts)
+      h2 = DrawioDsl::Schema::H2.new(current_page, **opts)
+      add_shape(h2)
+    end
+
+    def add_h3(**opts)
+      h3 = DrawioDsl::Schema::H3.new(current_page, **opts)
+      add_shape(h3)
+    end
+
+    def add_h4(**opts)
+      h4 = DrawioDsl::Schema::H4.new(current_page, **opts)
+      add_shape(h4)
+    end
+
+    def add_h5(**opts)
+      h5 = DrawioDsl::Schema::H5.new(current_page, **opts)
+      add_shape(h5)
+    end
+
+    def add_h6(**opts)
+      h6 = DrawioDsl::Schema::H6.new(current_page, **opts)
+      add_shape(h6)
+    end
+
+    def add_p(**opts)
+      p = DrawioDsl::Schema::P.new(current_page, **opts)
+      add_shape(p)
+    end
+
     def add_actor(**opts)
       actor = DrawioDsl::Schema::Actor.new(current_page, **opts)
       add_shape(actor)
@@ -138,6 +173,21 @@ module DrawioDsl
       triangle = DrawioDsl::Schema::Triangle.new(current_page, **opts)
       add_shape(triangle)
     end
+
+    def add_embed_row(**opts)
+      embed_row = DrawioDsl::Schema::EmbedRow.new(current_page, **opts)
+      add_shape(embed_row)
+    end
+
+    def add_embed_col50(**opts)
+      embed_col50 = DrawioDsl::Schema::EmbedCol50.new(current_page, **opts)
+      add_shape(embed_col50)
+    end
+
+    def add_embed_col200(**opts)
+      embed_col200 = DrawioDsl::Schema::EmbedCol200.new(current_page, **opts)
+      add_shape(embed_col200)
+    end
   end
 end
 # :nocov:

data/lib/drawio_dsl/drawio_shapes.rb

@@ -5,64 +5,112 @@ module DrawioDsl
   # :nocov:
   module DrawioShapes
     def random(**opts)
-      case rand(27)
+      case rand(37)
       when 0
-        actor(**opts)
+        h1(**opts)
       when 1
-        actor2(**opts)
+        h2(**opts)
       when 2
-        callout(**opts)
+        h3(**opts)
       when 3
-        callout2(**opts)
+        h4(**opts)
       when 4
-        callout3(**opts)
+        h5(**opts)
       when 5
-        callout4(**opts)
+        h6(**opts)
       when 6
-        circle(**opts)
+        p(**opts)
       when 7
-        cloud(**opts)
+        actor(**opts)
       when 8
-        cross(**opts)
+        actor2(**opts)
       when 9
-        envelop(**opts)
+        callout(**opts)
       when 10
-        diamond(**opts)
+        callout2(**opts)
       when 11
-        document(**opts)
+        callout3(**opts)
       when 12
-        ellipse(**opts)
+        callout4(**opts)
       when 13
-        hexagon(**opts)
+        circle(**opts)
       when 14
-        container(**opts)
+        cloud(**opts)
       when 15
-        container2(**opts)
+        cross(**opts)
       when 16
-        container3(**opts)
+        envelop(**opts)
       when 17
-        container4(**opts)
+        diamond(**opts)
       when 18
-        note(**opts)
+        document(**opts)
       when 19
-        process(**opts)
+        ellipse(**opts)
       when 20
-        rectangle(**opts)
+        hexagon(**opts)
       when 21
-        rectangle2(**opts)
+        container(**opts)
       when 22
-        square(**opts)
+        container2(**opts)
       when 23
-        step(**opts)
+        container3(**opts)
       when 24
-        tick(**opts)
+        container4(**opts)
       when 25
-        face(**opts)
+        note(**opts)
       when 26
+        process(**opts)
+      when 27
+        rectangle(**opts)
+      when 28
+        rectangle2(**opts)
+      when 29
+        square(**opts)
+      when 30
+        step(**opts)
+      when 31
+        tick(**opts)
+      when 32
+        face(**opts)
+      when 33
         triangle(**opts)
+      when 34
+        embed_row(**opts)
+      when 35
+        embed_col50(**opts)
+      when 36
+        embed_col200(**opts)
       end
     end
 
+    def h1(**opts)
+      builder.add_h1(**opts)
+    end
+
+    def h2(**opts)
+      builder.add_h2(**opts)
+    end
+
+    def h3(**opts)
+      builder.add_h3(**opts)
+    end
+
+    def h4(**opts)
+      builder.add_h4(**opts)
+    end
+
+    def h5(**opts)
+      builder.add_h5(**opts)
+    end
+
+    def h6(**opts)
+      builder.add_h6(**opts)
+    end
+
+    def p(**opts)
+      builder.add_p(**opts)
+    end
+
     def actor(**opts)
       builder.add_actor(**opts)
     end
@@ -170,6 +218,18 @@ module DrawioDsl
     def triangle(**opts)
       builder.add_triangle(**opts)
     end
+
+    def embed_row(**opts)
+      builder.add_embed_row(**opts)
+    end
+
+    def embed_col50(**opts)
+      builder.add_embed_col50(**opts)
+    end
+
+    def embed_col200(**opts)
+      builder.add_embed_col200(**opts)
+    end
   end
   # :nocov:
 end

data/lib/drawio_dsl/layout_engine.rb

@@ -14,22 +14,15 @@ module DrawioDsl
     attr_reader :current_page
     attr_reader :current_layout
 
-    # attr_reader :page_margin_top
-    # attr_reader :page_margin_left
-    # attr_reader :x
-    # attr_reader :y
-
     def initialize(page)
       @page = page
-      # @x = 0
-      # @y = 0
     end
 
     def call
       page.position_x = page.margin_left
       page.position_y = page.margin_top
 
-      page.nodes.each do |node|
+      page.nodes.all.each do |node|
         case node.classification
         when :layout_rule
           @current_layout = node

data/lib/drawio_dsl/schema/_.rb

@@ -4,6 +4,7 @@ require_relative 'common_style'
 require_relative 'default_palette'
 require_relative 'diagram'
 require_relative 'node'
+require_relative 'node_list'
 require_relative 'page'
 
 require_relative 'layouts/layout'
@@ -11,6 +12,13 @@ require_relative 'layouts/flex_layout'
 require_relative 'layouts/grid_layout'
 
 require_relative 'shapes/shape'
+require_relative 'shapes/h1'
+require_relative 'shapes/h2'
+require_relative 'shapes/h3'
+require_relative 'shapes/h4'
+require_relative 'shapes/h5'
+require_relative 'shapes/h6'
+require_relative 'shapes/p'
 require_relative 'shapes/actor'
 require_relative 'shapes/actor2'
 require_relative 'shapes/callout'
@@ -38,3 +46,6 @@ require_relative 'shapes/step'
 require_relative 'shapes/tick'
 require_relative 'shapes/face'
 require_relative 'shapes/triangle'
+require_relative 'shapes/embed_row'
+require_relative 'shapes/embed_col50'
+require_relative 'shapes/embed_col200'

data/lib/drawio_dsl/schema/layouts/grid_layout.rb

@@ -6,22 +6,28 @@ module DrawioDsl
     class GridLayout < Layout
       attr_accessor :direction
       attr_accessor :wrap_at
-      attr_accessor :grid_size
+      attr_accessor :grid_size # this is an alternative to grid_w/grid_h
+      attr_accessor :grid_w
+      attr_accessor :grid_h
       attr_accessor :cell_no
       attr_accessor :h_align
       attr_accessor :v_align
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def initialize(page, **args)
         @type       = :grid_layout
         @direction  = args[:direction]  || :horizontal
         @wrap_at    = args[:wrap_at]    || 5
         @grid_size  = args[:grid_size]  || 220
+        @grid_w     = args[:grid_w]     || grid_size
+        @grid_h     = args[:grid_h]     || grid_size
         @h_align    = args[:h_align]    || :center
         @v_align    = args[:v_align]    || :center
         @cell_no    = 1
 
         super(page, **args)
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def position_shape(shape)
         fire_after_init
@@ -47,7 +53,8 @@ module DrawioDsl
         super.merge(
           direction: direction,
           wrap_at: wrap_at,
-          grid_size: grid_size,
+          grid_w: grid_w,
+          grid_h: grid_h,
           cell_no: cell_no
         )
       end
@@ -56,8 +63,8 @@ module DrawioDsl
 
       # rubocop:disable Metrics/AbcSize
       def horizontal_shape_alignment(shape)
-        return page.position_x + ((grid_size - shape.w) / 2)  if h_align == :center
-        return page.position_x + (grid_size - shape.w)        if h_align == :right
+        return page.position_x + ((grid_w - shape.w) / 2)  if h_align == :center
+        return page.position_x + (grid_w - shape.w)        if h_align == :right
 
         page.position_x
       end
@@ -65,8 +72,8 @@ module DrawioDsl
 
       # rubocop:disable Metrics/AbcSize
       def vertical_shape_alignment(shape)
-        return page.position_y + ((grid_size - shape.h) / 2)  if v_align == :center || v_align == :middle
-        return page.position_y + (grid_size - shape.h)        if v_align == :bottom
+        return page.position_y + ((grid_h - shape.h) / 2)  if v_align == :center || v_align == :middle
+        return page.position_y + (grid_h - shape.h)        if v_align == :bottom
 
         page.position_y
       end
@@ -74,27 +81,27 @@ module DrawioDsl
 
       def move_cell_horizontally
         if cell_no < wrap_at
-          page.position_x += grid_size
+          page.position_x += grid_w
           @cell_no += 1
           return
         end
 
         # Flow down to the next row
         page.position_x = anchor_x
-        page.position_y += grid_size
+        page.position_y += grid_h
         @cell_no = 1
       end
 
       def move_cell_vertically
         if cell_no < wrap_at
-          page.position_y += grid_size
+          page.position_y += grid_h
           @cell_no += 1
           return
         end
 
         # Flow right to the next column
         page.position_y = anchor_y
-        page.position_x += grid_size
+        page.position_x += grid_w
         @cell_no = 1
       end
     end

data/lib/drawio_dsl/schema/node.rb

@@ -22,32 +22,37 @@ module DrawioDsl
         }
       end
 
-      #   def debug(format: :detail)
-      #     if format == :detail
-      #       debug_detail(to_h)
-      #     else
-      #       debug_row(classification, id)
-      #     end
-      #   end
+      # :nocov:
+      # rubocop:disable Metrics/AbcSize
+      def debug(format: :detail)
+        if format == :detail
+          debug_detail(to_h)
+        else
+          debug_row(classification, id)
+        end
+      end
 
-      #   def debug_detail(**key_values)
-      #     key_values.each do |key, value|
-      #       puts "#{key.to_s.ljust(15)}: #{value}"
-      #     end
-      #   end
+      def debug_detail(**key_values)
+        key_values.each do |key, value|
+          puts "#{key.to_s.ljust(15)}: #{value}"
+        end
+      end
 
-      #
-      #   def debug_row(classification, id, type = nil, x = nil, y = nil, width = nil, height = nil)
-      #     row = []
-      #     row << classification.to_s.ljust(11)
-      #     row << id.to_s.ljust(6)
-      #     row << (type.nil? ? '' : type).to_s.ljust(15)
-      #     row << (x.nil? ? '' : x).to_s.rjust(5)
-      #     row << (y.nil? ? '' : y).to_s.rjust(5)
-      #     row << (width.nil? ? '' : width).to_s.rjust(5)
-      #     row << (height.nil? ? '' : height).to_s.rjust(5)
-      #     puts row.join(' | ')
-      #   end
+      # rubocop:disable Metrics/ParameterLists
+      def debug_row(classification, id, type = nil, x = nil, y = nil, width = nil, height = nil)
+        row = []
+        row << classification.to_s.ljust(11)
+        row << id.to_s.ljust(6)
+        row << (type.nil? ? '' : type).to_s.ljust(15)
+        row << (x.nil? ? '' : x).to_s.rjust(5)
+        row << (y.nil? ? '' : y).to_s.rjust(5)
+        row << (width.nil? ? '' : width).to_s.rjust(5)
+        row << (height.nil? ? '' : height).to_s.rjust(5)
+        puts row.join(' | ')
+      end
+      # rubocop:enable Metrics/ParameterLists
+      # :nocov:
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/drawio_dsl/schema/node_list.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class NodeList
+      attr_reader :nodes
+
+      def initialize
+        @nodes = []
+      end
+
+      def add(node)
+        @nodes << node
+      end
+
+      def all
+        @nodes
+      end
+
+      def shapes
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
+      end
+
+      def layouts
+        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Layout) }
+      end
+
+      def length
+        @nodes.length
+      end
+
+      def to_h
+        @nodes.map(&:to_h)
+      end
+    end
+  end
+end

data/lib/drawio_dsl/schema/page.rb

@@ -86,13 +86,13 @@ module DrawioDsl
           @gradient     ||= theme_palette.gradient
         end
 
-        @nodes = args[:nodes] || []
+        @nodes = NodeList.new # []
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-      def shapes
-        @nodes.select { |node| node.is_a?(DrawioDsl::Schema::Shape) }
-      end
+      # def shapes
+      #   nodes.shapes
+      # end
 
       def to_h
         {
@@ -104,7 +104,7 @@ module DrawioDsl
           palette: palette.to_h,
           style: style.to_h,
           settings: settings,
-          nodes: nodes.map(&:to_h)
+          nodes: nodes.to_h
         }
       end
 

data/lib/drawio_dsl/schema/shapes/embed_col200.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class EmbedCol200 < Shape
+      configure_shape(:embed_col200)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/embed_col50.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class EmbedCol50 < Shape
+      configure_shape(:embed_col50)
+    end
+  end
+end

data/lib/drawio_dsl/schema/shapes/embed_row.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class EmbedRow < Shape
+      configure_shape(:embed_row)
+    end
+  end
+end