ea 0.6.43 → 0.6.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00712a8a81ec1a2db75cb8d603ecea20b4f5499b59c4b32b269f5ae6630a8fc8
-  data.tar.gz: 98957abd4b964ca2c27bc2f5637497ed08762f163fe042ee6091a4228a3c52ac
+  metadata.gz: 70775a4db6ad6a0d240e3eb3de0e60aa31db24561ad167898a9613df3f431810
+  data.tar.gz: b15a7d2bcce540619ed08e2fb32d6fe427850a6381e6db15dd72a25b6bc6739f
 SHA512:
-  metadata.gz: 4224e7c3dac17d7d6174aed6cbca23530a91d28fc6270bca00c8a09a682e611bba397294ae9ba3e33081f627f38b18c5ea6820448ab0d317fdca512b83ec1ff5
-  data.tar.gz: 5b377f89f6c20bdf4dfcc56fe02e503320404f6cfacfe9483ba4c7efd4bda8631ea64b30acb3d04f3f909590108e393a49263956eb0c3d8572caa984b42251fc
+  metadata.gz: 1d3e2a0d75fc280ab1eea83db6376dd9d6e045569ca99ef5ba5fa7bbc7a39d8c3b5eff7af59fa12bd7ad5b63f2518b16dbc20694b605c80574c5415617635036
+  data.tar.gz: 49baf9df9e8d0327b9d81bc5549edbf3a8d71e4401adbbe5cf895a17bcae8e283daf178e4e87ef5a509b9d7e0a94a2630899e22adebddebcdd9a40f5c1e2042a

data/lib/ea/svg/ea_emitter/connector_redock.rb

@@ -39,6 +39,46 @@ module Ea
            edge_point(target_bounds, source_bounds)]
         end
 
+        # EA never docks a horizontal connector line at the header
+        # divider: endpoints landing on (box side edge, divider_y)
+        # move down one row slot to divider_y + 13 - the first
+        # attribute-row slot (E0C65C12/TK_PositionType: EA docks at
+        # (451,90) where the stored route says (451,77) = our
+        # divider; the (0,-13) endpoint-delta family, 57 lines).
+        ROW_SLOT_PITCH = 13
+
+        def row_slot_adjust(pairs, connector, diagram, model_index,
+                            bounds_map, divider_y_by_ref)
+          return nil unless bounds_map && divider_y_by_ref
+          return nil unless pairs.size == 2
+
+          rel = relationship_for(connector, model_index)
+          return nil unless rel
+
+          source_ref, target_ref = end_refs(rel)
+          return nil unless source_ref && target_ref
+
+          bounds = [bounds_map[source_ref], bounds_map[target_ref]]
+          dividers = [divider_y_by_ref[source_ref],
+                      divider_y_by_ref[target_ref]]
+          return nil unless bounds.all? && dividers.all?
+
+          changed = false
+          adjusted = pairs.each_with_index.map do |(x, y), i|
+            box = bounds[i]
+            divider = dividers[i]
+            at_edge = (x - box.x).abs <= 1 || (x - (box.x + box.width)).abs <= 1
+            at_divider = (y - divider.to_f).abs <= 1
+            if at_edge && at_divider
+              changed = true
+              [x, y + ROW_SLOT_PITCH]
+            else
+              [x, y]
+            end
+          end
+          changed ? adjusted : nil
+        end
+
         def direct?(connector)
           style = connector.style || {}
           %i[direct regenerated].any? { |k| style.key?(k) } ||

data/lib/ea/svg/ea_emitter/connectors.rb

@@ -17,16 +17,18 @@ module Ea
         LINE_STYLE_KEY = :connector_line
 
         attr_reader :diagram, :canvas, :grouped, :stroke_width, :drawn_bounds,
-                    :model_index
+                    :model_index, :divider_y_by_ref
 
         def initialize(diagram, canvas: nil, grouped: true, stroke_width: 2,
-                       drawn_bounds: nil, model_index: nil)
+                       drawn_bounds: nil, model_index: nil,
+                       divider_y_by_ref: nil)
           @diagram = diagram
           @canvas = canvas
           @grouped = grouped
           @stroke_width = stroke_width
           @drawn_bounds = drawn_bounds
           @model_index = model_index
+          @divider_y_by_ref = divider_y_by_ref
         end
 
         def layers
@@ -62,6 +64,9 @@ module Ea
           pts = ConnectorRedock.pairs_for(connector, diagram, model_index,
                                           drawn_bounds) ||
                 waypoints_for(connector)
+          pts = ConnectorRedock.row_slot_adjust(pts, connector, diagram,
+                                                model_index, drawn_bounds,
+                                                divider_y_by_ref) || pts
           return nil if pts.size < 2
 
           # DIRECT (auto-routed straight) connectors: EA writes the

data/lib/ea/svg/ea_emitter/element/compartment_geometry.rb

@@ -61,35 +61,31 @@ module Ea
           # Y of the divider line between header and the rest.
           # Returns nil when there's no header content to separate
           # from empty below-header content.
+          # {root}/{leaf} marker lines sit INSIDE the header region:
+          # each pushes the divider down one row slot (E0C65C12/
+          # TK_PositionType: name at 69, EA divider at 90 = our old
+          # 77 + 13, attrs follow at 104 on both sides).
           def divider_y
             return nil if header_lines_count.zero?
 
             header_first_y +
               ([header_lines_count, 1].max - 1) * (size + (header_line_offset || 6)) +
+              (marker_count.to_i * (size + 6)) +
               (divider_offset || 8)
           end
 
           def attr_first_y
-            base = raw_attr_first_y
-            return base unless marker_count.to_i.positive?
-
-            # EA renders the {root}/{leaf} marker compartment BETWEEN
-            # the header divider and the attributes: its rows occupy
-            # (attr_base - 9) onward at the 13px pitch, and attributes
-            # shift down one row per marker line. Real OCL constraints
-            # do NOT shift attributes — they render trailing.
-            # Corpus-verified (TK_PositionType: name +13 {root} +22
-            # first-attr; MD_Identification keeps attrs at +22 despite
-            # carrying OCL constraints).
-            base + (size + 6) * marker_count
+            raw_attr_first_y
           end
 
-          # First marker-line baseline: one row slot above where
-          # attributes would start without markers.
+          # First marker-line baseline: its own row between the name
+          # and the divider it pushes down (E0C65C12: name 69, {root}
+          # 82, divider 90 = {root} + 8).
           def marker_first_y
             return nil unless marker_count.to_i.positive?
+            return nil unless divider_y
 
-            raw_attr_first_y - 9
+            divider_y - 8
           end
 
           def raw_attr_first_y

data/lib/ea/svg/ea_emitter/elements.rb

@@ -32,6 +32,7 @@ module Ea
         # divider, attrs) in EA's per-entity layer order.
         def groups
           @drawn_bounds = {}
+          @divider_y = {}
           ordered_elements.flat_map { |e| groups_for(e) }
         end
 
@@ -42,6 +43,11 @@ module Ea
         # drawn outlines, never the stored rect.
         attr_reader :drawn_bounds
 
+        # Logical-space header divider y per model element ref, for
+        # connector row-slot docking (EA docks horizontal exits at
+        # divider_y + 13, the first attribute-row slot).
+        attr_reader :divider_y
+
         private
 
         def ordered_elements
@@ -91,6 +97,9 @@ module Ea
             width: width,
             height: context.bounds.height
           )
+          return unless context.geometry
+
+          @divider_y[element.model_element_ref] = context.geometry.divider_y
         end
 
 

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -62,11 +62,11 @@ module Ea
                                                   text_pos, mult_pos)
             elsif mult_box && stored_offsets_zero?(mult_box)
               # A stored mult box with OX=0:OY=0 means "EA default":
-              # the multiplicity sits 15px BELOW the endpoint anchor,
-              # regardless of line direction (87-sample corpus fit:
-              # dy = +15 constant; the dx residual follows the
-              # dock-slot family).
-              mult_pos = [anchor[0], anchor[1] + 15]
+              # the multiplicity sits 12px right of and 15px below the
+              # endpoint anchor, regardless of line direction
+              # (87-sample corpus fit: dy = +15 constant, dx = +12
+              # dominant with a +3 minority).
+              mult_pos = [anchor[0] + 12, anchor[1] + 15]
             end
             show_property = property_label?(connector, end_kind)
 

data/lib/ea/svg/ea_emitter/layer_sequencer.rb

@@ -49,6 +49,10 @@ module Ea
           @elements&.drawn_bounds
         end
 
+        def divider_y_by_ref
+          @elements&.divider_y
+        end
+
         private
 
         def frame_layers
@@ -67,11 +71,13 @@ module Ea
                                                   grouped: true,
                                                   stroke_width: DEFAULT_STROKE_WIDTH,
                                                   drawn_bounds: drawn_bounds,
+                                                  divider_y_by_ref: divider_y_by_ref,
                                                   model_index: model_index).layers
           marker_layers_raw = Markers.new(diagram, model_index: model_index,
                                            canvas: canvas, grouped: true,
                                            stroke_width: DEFAULT_STROKE_WIDTH,
-                                           drawn_bounds: drawn_bounds).layers
+                                           drawn_bounds: drawn_bounds,
+                                           divider_y_by_ref: divider_y_by_ref).layers
           merge_layers_by_style(connector_layers_raw + marker_layers_raw).map(&:to_svg)
         end
 

data/lib/ea/svg/ea_emitter/markers.rb

@@ -32,16 +32,18 @@ module Ea
         DEP_ARROW_HEIGHT = 15
 
         attr_reader :diagram, :model_index, :canvas, :grouped, :stroke_width,
-                    :drawn_bounds
+                    :drawn_bounds, :divider_y_by_ref
 
         def initialize(diagram, model_index:, canvas: nil, grouped: true,
-                       stroke_width: 2, drawn_bounds: nil)
+                       stroke_width: 2, drawn_bounds: nil,
+                       divider_y_by_ref: nil)
           @diagram = diagram
           @model_index = model_index
           @canvas = canvas
           @grouped = grouped
           @stroke_width = stroke_width
           @drawn_bounds = drawn_bounds
+          @divider_y_by_ref = divider_y_by_ref
         end
 
         def layers
@@ -459,7 +461,12 @@ module Ea
         def waypoint_pairs(connector)
           redocked = ConnectorRedock.pairs_for(connector, diagram,
                                                model_index, drawn_bounds)
-          return redocked if redocked
+          if redocked
+            return ConnectorRedock.row_slot_adjust(redocked, connector,
+                                                   diagram, model_index,
+                                                   drawn_bounds,
+                                                   divider_y_by_ref) || redocked
+          end
 
           (connector.waypoints || []).filter_map do |w|
             next unless w.position

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.43"
+  VERSION = "0.6.45"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.43
+  version: 0.6.45
 platform: ruby
 authors:
 - Ribose Inc.