ea 0.6.31 → 0.6.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da25cfb5a4f0690b2b73df2d3c12fe3cd042c96fe6aab67d07e2c8871868feaf
-  data.tar.gz: 8be40d4bb501b904f1ba2609446d332ea260f3d04a831528d213d6747e352dfa
+  metadata.gz: e63b36fde438e5d088ee091f1a7e9612eb93d379d066d3abaebca6e3495b3d16
+  data.tar.gz: fbe7073cfddcd4bb861cb7ea238ea436a7f3f5bab5d661e928b2df596bdde92a
 SHA512:
-  metadata.gz: 271180e45139ae7e67a63a66a9fd78c8311edd379ee73f3a5ab9241f7b43d1be737bffca276e0585473f0294f1f557d3ff46fb254cdd105b8b6526ffb052fd36
-  data.tar.gz: 63856efa026109bf92d89468c10e6325f9a2f411e4f49217335667b590842d1b5f8f0f860f17c3527bb57236a3d096729ae411a9c3166c4f4efbb169db30eea0
+  metadata.gz: e1a3392ff7069a1c9287e94997c9d516ac5ee358fb66f76bf27a310615bcaad6e4daeffb135bbda464976e6cccf24e9d40999fabbec64c2f3a863e0bb5b60b3d
+  data.tar.gz: 55d8d38d9bc7d613f0673863b6f6ace24bad435d1e59b9662fada852bc38248abcacb5f211f466566b668abfcb7a368c129a57e34b58b389d6621a8b5fa13cde

data/lib/ea/sources/qea/diagram_builder.rb

@@ -165,8 +165,8 @@ module Ea
           target = diagram_object_placement(diagram_row.diagram_id, target_id)
           return nil unless source && target
 
-          source_bounds = bounds_from_rect(source)
-          target_bounds = bounds_from_rect(target)
+          source_bounds = drawn_bounds_for(source)
+          target_bounds = drawn_bounds_for(target)
           waypoints = if source_id == target_id
                         self_loop_waypoints(source_bounds)
                       else
@@ -182,7 +182,12 @@ module Ea
             target_stereotype: conn.deststereotype,
             waypoints: waypoints,
             label_boxes: {},
-            style: { direct: true },
+            # Only the Dependency family carries EA's double-back
+            # "M t L s M t" byte form; regenerated generalizations
+            # and associations draw as plain source-first lines
+            # (0CABA7D7's gen "M 125 130 L 125 99"; 568CDFC9's
+            # regenerated assocs).
+            style: conn.connector_type == "Dependency" ? { direct: true } : {},
             hidden: false,
             has_geometry_offsets: false
           )
@@ -224,8 +229,8 @@ module Ea
           target_placement = diagram_object_placement(diagram_row.diagram_id, target_id)
           return nil unless source_placement && target_placement
 
-          source_bounds = bounds_from_rect(source_placement)
-          target_bounds = bounds_from_rect(target_placement)
+          source_bounds = drawn_bounds_for(source_placement)
+          target_bounds = drawn_bounds_for(target_placement)
           waypoints = direct_waypoints(source_bounds, target_bounds)
           Ea::Model::DiagramConnector.new(
             id: IdNormalizer.synthetic("xc", diagram_row.diagram_id, object_id),
@@ -383,7 +388,33 @@ module Ea
                                             connector.end_object_id)
           return [] unless source && target
 
-          direct_waypoints(bounds_from_rect(source), bounds_from_rect(target))
+          direct_waypoints(drawn_bounds_for(source),
+                           drawn_bounds_for(target))
+        end
+
+        # The outline EA clips connector rays against: the DRAWN
+        # autosized box, not the stored logical rect. Packages draw
+        # narrower than their stored rect (body = autosized tab +
+        # 15), so their docks land on the drawn edges (E58034A3:
+        # supplier right-edge dock 155 drawn vs 121 stored). All
+        # other element kinds draw at the stored rect.
+        PACKAGE_BODY_EXTRA = 15
+
+        def drawn_bounds_for(placement)
+          logical = bounds_from_rect(placement)
+          obj = database.find_object(placement.ea_object_id.to_i)
+          return logical unless obj && obj.object_type == "Package"
+
+          tab = ::Ea::Svg::EaEmitter::Element::PackageShapeRenderer
+                .autosized_tab_width(label: obj.name.to_s,
+                                     stereotype: obj.stereotype.to_s,
+                                     size: 7)
+          Ea::Model::Bounds.new(
+            x: logical.x,
+            y: logical.y,
+            width: tab + PACKAGE_BODY_EXTRA,
+            height: logical.height
+          )
         end
 
         # Straight-line waypoints between the two box-outline

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

@@ -58,17 +58,23 @@ module Ea
           pts = waypoints_for(connector)
           return nil if pts.size < 2
 
-          d = pts.each_with_index.map do |p, idx|
-            x, y = translate_point(p)
-            "#{idx.zero? ? 'M' : 'L'} #{Canvas.coord(x)} #{Canvas.coord(y)}"
-          end.join(" ")
-          # EA writes a trailing zero-length "M <start>" repeat for
-          # DIRECT (auto-routed straight) connectors — verified on
-          # context diagrams where every line carries it (B6847577,
-          # E58034A3, 8CF27BE8).
+          # DIRECT (auto-routed straight) connectors: EA writes the
+          # segment TARGET-FIRST with a trailing zero-length repeat —
+          # "M target L source M target" (B6847577, E58034A3,
+          # 8CF27BE8). Same pixels as source-first; only the byte
+          # order differs, so reversal lives here at the emitter and
+          # the marker anchoring (source = first waypoint) is
+          # untouched.
           if pts.size == 2 && direct?(connector)
-            x, y = translate_point(pts.first)
-            d = "#{d} M #{Canvas.coord(x)} #{Canvas.coord(y)}"
+            x1, y1 = translate_point(pts.first)
+            x2, y2 = translate_point(pts.last)
+            d = "M #{Canvas.coord(x2)} #{Canvas.coord(y2)} L #{Canvas.coord(x1)} #{Canvas.coord(y1)} " \
+                "M #{Canvas.coord(x2)} #{Canvas.coord(y2)}"
+          else
+            d = pts.each_with_index.map do |p, idx|
+              x, y = translate_point(p)
+              "#{idx.zero? ? 'M' : 'L'} #{Canvas.coord(x)} #{Canvas.coord(y)}"
+            end.join(" ")
           end
           %(<path d="#{d}" shape-rendering="auto"/>)
         end

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

@@ -101,7 +101,13 @@ module Ea
           # baseline + text descent (~4px) against the box bottom:
           # TK_PositionType keeps 7 rows ending 6px above the bottom,
           # while a 13px-tighter box loses them all.
+          # The drop applies only to association-derived property
+          # rows (AOS/CityFurniture). When the element has REAL
+          # attributes EA instead GROWS the drawn box past the
+          # stored height and shows every row (0CABA7D7: parent at
+          # stored h44 draws at h59 with +minimumOccurs visible).
           if attr_lines.any? &&
+             !classifier.properties.to_a.any? { |p| !p.association_id } &&
              geometry.attr_bottom_y.to_i > bounds.y + bounds.height
             attr_lines = []
             geometry = compartment_geometry(bounds, size, attr_lines, op_lines,
@@ -123,6 +129,24 @@ module Ea
                                            marker_count: marker_lines_for(classifier).size,
                                            enum_literals_count: enum_row_count_for(classifier))
           end
+          # Real attributes grow the DRAWN box past the stored
+          # height instead of being dropped (0CABA7D7: stored h44
+          # draws at h59). Grown height = last row baseline + EA's
+          # ~8px bottom padding. Render-local: the diagram-level
+          # canvas still derives from stored bounds.
+          # content_bottom_y is nil when no compartment has rows;
+          # op_bottom_y is NOT a sentinel (it reports the op-divider
+          # position even with zero operations), so it must stay out
+          # of the max.
+          grown_bottom = geometry.content_bottom_y.to_i
+          if attr_lines.any? && grown_bottom.positive? &&
+             grown_bottom + 8 > bounds.y + bounds.height
+            bounds = Ea::Model::Bounds.new(
+              x: bounds.x, y: bounds.y,
+              width: bounds.width,
+              height: grown_bottom + 8 - bounds.y
+            )
+          end
           RenderContext.new(
             element: element,
             bounds: bounds,

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

@@ -44,7 +44,19 @@ module Ea
           !attr_lines.empty? || !op_lines.empty? ||
             enum_literals.any? || tagged_values.any? ||
             (constraints&.any?) ||
-            (!package_content_lines.nil? && !package_content_lines.empty?)
+            (!package_content_lines.nil? && !package_content_lines.empty?) ||
+            hidden_features_present?
+        end
+
+        # EA draws the header divider whenever the element HAS a
+        # feature compartment — even one whose rows are all hidden
+        # by visibility flags (10E3E08A: CodeList with 3 attributes
+        # toggled off still renders the divider over an empty body;
+        # only feature-less elements omit it).
+        def hidden_features_present?
+          return false unless classifier.respond_to?(:properties)
+
+          classifier.properties.any? || classifier.operations.any?
         end
       end
     end

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.31"
+  VERSION = "0.6.33"
 end

metadata

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