drawio_dsl 0.5.7 → 0.8.0

data/lib/drawio_dsl/layout_engine.rb

@@ -23,13 +23,23 @@ module DrawioDsl
       page.position_y = page.margin_top
 
       page.nodes.all.each do |node|
-        case node.classification
-        when :layout_rule
-          @current_layout = node
-        when :shape
-          current_layout&.position_shape(node)
-        end
-        # node.debug(format: :row)
+        traverse_node(node)
+      end
+    end
+
+    def traverse_node(node)
+      process_node(node)
+      node.nodes.all.each do |child|
+        traverse_node(child)
+      end
+    end
+
+    def process_node(node)
+      case node.classification
+      when :layout_rule
+        @current_layout = node
+      when :shape
+        current_layout&.position_shape(node)
       end
     end
   end

data/lib/drawio_dsl/schema/_.rb

@@ -27,16 +27,18 @@ require_relative 'shapes/callout3'
 require_relative 'shapes/callout4'
 require_relative 'shapes/circle'
 require_relative 'shapes/cloud'
+require_relative 'shapes/container'
+require_relative 'shapes/container2'
+require_relative 'shapes/container3'
+require_relative 'shapes/container4'
 require_relative 'shapes/cross'
 require_relative 'shapes/envelop'
 require_relative 'shapes/diamond'
 require_relative 'shapes/document'
 require_relative 'shapes/ellipse'
 require_relative 'shapes/hexagon'
-require_relative 'shapes/container'
-require_relative 'shapes/container2'
-require_relative 'shapes/container3'
-require_relative 'shapes/container4'
+require_relative 'shapes/interface'
+require_relative 'shapes/klass'
 require_relative 'shapes/note'
 require_relative 'shapes/process'
 require_relative 'shapes/rectangle'
@@ -44,6 +46,7 @@ require_relative 'shapes/rectangle2'
 require_relative 'shapes/square'
 require_relative 'shapes/step'
 require_relative 'shapes/tick'
+require_relative 'shapes/todo'
 require_relative 'shapes/face'
 require_relative 'shapes/triangle'
 require_relative 'shapes/embed_row'

data/lib/drawio_dsl/schema/diagram.rb

@@ -49,7 +49,7 @@ module DrawioDsl
           theme: theme,
           palette: palette.to_h,
           style: style.to_h,
-          pages: pages.map(&:to_h)
+          pages: pages.select(&:active?).map(&:to_h)
         }
       end
     end

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

@@ -10,13 +10,12 @@ module DrawioDsl
       attr_reader :perpendicular_max
 
       def initialize(page, **args)
-        @type = :flex_layout
         @direction = args[:direction] || :horizontal
         @wrap_at = args[:wrap_at] || (direction == :horizontal ? 1000 : 800)
         @gap = args[:gap] || 20
         @perpendicular_max = 0
 
-        super(page, **args)
+        super(page, **args.merge(type: :flex_layout))
       end
 
       def position_shape(shape)

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

@@ -15,7 +15,6 @@ module DrawioDsl
 
       # 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
@@ -25,7 +24,7 @@ module DrawioDsl
         @v_align    = args[:v_align]    || :center
         @cell_no    = 1
 
-        super(page, **args)
+        super(page, **args.merge(type: :grid_layout))
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 

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

@@ -4,8 +4,6 @@ module DrawioDsl
   module Schema
     # Provides base configuration for automatic layouts
     class Layout < Node
-      attr_accessor :type
-
       # represents the x coordinate of the top left corner layout area
       # this coordinate is based on the current location of the page
       attr_accessor :anchor_x
@@ -31,7 +29,6 @@ module DrawioDsl
 
       def to_h
         super.merge(
-          type: type,
           anchor_x: anchor_x,
           anchor_y: anchor_y
         )

data/lib/drawio_dsl/schema/node.rb

@@ -9,23 +9,36 @@ module DrawioDsl
       attr_accessor :page
       attr_accessor :parent
       attr_accessor :classification
+      attr_accessor :type
+      attr_accessor :nodes
 
       def initialize(page, **args)
         @page = page
         @id = args[:id]
         @parent = args[:parent]
         @classification = args[:classification] || :unknown
+        @type = args[:type] || :unknown
+        @nodes = NodeList.new
       end
 
       def to_h
-        {
+        result = {
           id: id,
-          classification: classification
+          parent_id: parent&.id,
+          classification: classification,
+          type: type
         }
+        result[:nodes] = nodes.to_h if nodes.any?
+        result
       end
 
       def root?
-        parent.nil?
+        parent.nil? || parent.is_a?(DrawioDsl::Schema::Page)
+      end
+
+      def add_node(node)
+        @nodes.add(self, node)
+        node
       end
 
       # :nocov:

data/lib/drawio_dsl/schema/node_list.rb

@@ -9,7 +9,8 @@ module DrawioDsl
         @nodes = []
       end
 
-      def add(node)
+      def add(parent, node)
+        node.parent = parent
         @nodes << node
       end
 
@@ -29,6 +30,24 @@ module DrawioDsl
         @nodes.length
       end
 
+      def empty?
+        @nodes.empty?
+      end
+
+      def any?
+        @nodes.any?
+      end
+
+      def first
+        @nodes.first
+      end
+
+      def as_xml(xml)
+        nodes.each do |node|
+          node.as_xml(xml) if node.respond_to?(:as_xml)
+        end
+      end
+
       def to_h
         @nodes.map(&:to_h)
       end

data/lib/drawio_dsl/schema/page.rb

@@ -11,6 +11,7 @@ module DrawioDsl
       attr_accessor :position_y
 
       attr_accessor :id
+      attr_accessor :active
       attr_reader :name
       attr_reader :theme
       attr_reader :style
@@ -39,6 +40,7 @@ module DrawioDsl
         @diagram = diagram
 
         @id           = args[:id]
+        @active       = args[:active].nil? ? true : !args[:active].nil?
         @name         = args[:name]
         @theme        = args[:theme] || diagram.theme
 
@@ -87,16 +89,21 @@ module DrawioDsl
         end
 
         @nodes = NodeList.new # []
-
-        # add anchor nodes
-        @nodes.add(DrawioDsl::Schema::Anchor.new(self, id: "page_root_#{id}"))
-        @nodes.add(DrawioDsl::Schema::Anchor.new(self, id: "node_root_#{id}"))
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-      # def shapes
-      #   nodes.shapes
-      # end
+      def active?
+        !!@active
+      end
+
+      def add_node(node)
+        @nodes.add(self, node)
+        node
+      end
+
+      def as_xml(xml)
+        nodes.as_xml(xml)
+      end
 
       def to_h
         {

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

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

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

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

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

@@ -4,18 +4,20 @@ module DrawioDsl
   module Schema
     # Shape is a graphical element, it can be a shape, a text, or a group (todo)
     class Shape < Node
+      include DrawioDsl::Formatters::Factory
+
       class << self
+        attr_reader :shape_key
         attr_reader :shape_defaults
 
-        def configure_shape(name)
-          unless KConfig.configuration.drawio.shapes.members.include?(name)
-            puts "Shape #{name} not found in configuration"
+        def configure_shape(key)
+          unless KConfig.configuration.drawio.shapes.members.include?(key)
+            puts "Shape #{key} not found in configuration"
             return
           end
 
-          config = KConfig.configuration.drawio.shapes[name]
-
-          @shape_defaults = config.clone
+          @shape_key = key
+          @shape_defaults = KConfig.configuration.drawio.shapes[key].clone
         end
       end
 
@@ -23,6 +25,7 @@ module DrawioDsl
 
       attr_accessor :theme
       attr_accessor :title
+      attr_accessor :value
 
       # The style of the element, these will derive from the page style if not provided
       attr_accessor :white_space
@@ -37,7 +40,6 @@ module DrawioDsl
       attr_accessor :font_color
       attr_accessor :gradient
 
-      attr_accessor :type
       attr_accessor :text_only
       attr_accessor :x
       attr_accessor :y
@@ -45,11 +47,15 @@ module DrawioDsl
       attr_accessor :h
       attr_accessor :style_modifiers
 
-      def initialize(page, **args)
+      def initialize(page, **args, &block)
         args[:classification] = :shape
         super(page, **args)
 
         apply_defaults(args)
+
+        instance_eval(&block) if block_given?
+
+        @value = formatter.empty? ? title : formatter.as_html
       end
 
       def shape_defaults
@@ -83,9 +89,13 @@ module DrawioDsl
         @font_color       = args[:font_color]       || theme_palette.font_color
       end
 
+      def format(type = nil)
+        type ||= self.class.shape_key
+        format_instance(type)
+      end
+
       def style
         key_values = []
-        key_values << style_modifiers unless style_modifiers.empty?
         key_values << "whiteSpace=#{white_space}"         if white_space
         key_values << "html=#{html}"                      if html
         key_values << "rounded=#{rounded}"                if rounded
@@ -96,20 +106,22 @@ module DrawioDsl
         key_values << "strokeColor=#{stroke_color}"       if stroke_color
         key_values << "fontColor=#{font_color}"           if font_color
         key_values << "gradient=#{gradient}"              if gradient
+        key_values << style_modifiers unless style_modifiers.empty?
 
         key_values.join(';')
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def as_xml(xml)
-        xml.mxCell(id: id, value: title, style: style, vertex: 1, parent: "#{page.id}-B") do
+        xml.mxCell(id: id, value: value, style: style, vertex: 1, parent: parent&.id) do
           xml.mxGeometry(x: x, y: y, width: w, height: h, as: 'geometry')
         end
       end
 
       def to_h
-        {
+        result = {
           id: id,
+          parent_id: parent&.id,
           classification: classification,
           type: type,
           x: x,
@@ -118,6 +130,8 @@ module DrawioDsl
           h: h,
           style: style
         }
+        result[:nodes] = nodes.to_h if nodes.any?
+        result
       end
 
       # :nocov:

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

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

data/lib/drawio_dsl/schema/virtual/anchor.rb

@@ -18,6 +18,8 @@ module DrawioDsl
         else
           xml.mxCell(id: id)
         end
+
+        nodes.as_xml(xml)
       end
     end
   end

data/lib/drawio_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DrawioDsl
-  VERSION = '0.5.7'
+  VERSION = '0.8.0'
 end

data/lib/drawio_dsl/xml_builder.rb

@@ -22,13 +22,13 @@ module DrawioDsl
 
     def build_diagram(xml)
       xml.mxfile(host: diagram.host) do
-        diagram.pages.each do |page|
+        diagram.pages.select(&:active?).each do |page|
           build_page(xml, page)
         end
       end
     end
 
-    # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:disable  Metrics/AbcSize
     def build_page(xml, page)
       xml.diagram(id: page.id, name: page.name) do
         xml.mxGraphModel(
@@ -50,16 +50,11 @@ module DrawioDsl
           shadow: page.page_shadow
         ) do
           xml.root do
-            # xml.mxCell(id: "#{page.id}-A")
-            # xml.mxCell(id: "#{page.id}-B", parent: "#{page.id}-A")
-            page.nodes.all.each do |node|
-              # puts node.classification
-              node.as_xml(xml) if %i[shape anchor].include?(node.classification)
-            end
+            page.as_xml(xml)
           end
         end
       end
     end
-    # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/drawio_dsl.rb

@@ -12,12 +12,15 @@ require_relative 'drawio_dsl/configuration_shapes'
 require_relative 'drawio_dsl/configuration_themes'
 require_relative 'drawio_dsl/configuration'
 require_relative 'drawio_dsl/version'
+require_relative 'drawio_dsl/formatters/_'
 require_relative 'drawio_dsl/schema/_'
 require_relative 'drawio_dsl/dom_builder_shapes'
 require_relative 'drawio_dsl/dom_builder'
 require_relative 'drawio_dsl/xml_builder'
 require_relative 'drawio_dsl/layout_engine'
 require_relative 'drawio_dsl/drawio_shapes'
+require_relative 'drawio_dsl/drawio_extensions_active'
+require_relative 'drawio_dsl/drawio_extensions'
 require_relative 'drawio_dsl/drawio'
 
 module DrawioDsl

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.7",
+  "version": "0.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "drawio_dsl",
-      "version": "0.5.7",
+      "version": "0.8.0",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drawio_dsl",
-  "version": "0.5.7",
+  "version": "0.8.0",
   "description": "DrawIO DSL can build DrawIO diagrams using a Domain Specific Language",
   "scripts": {
     "release": "semantic-release"