sysmlpy 0.46.0__tar.gz → 0.47.0__tar.gz

{sysmlpy-0.46.0 → sysmlpy-0.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.46.0
+Version: 0.47.0
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)

{sysmlpy-0.46.0 → sysmlpy-0.47.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "sysmlpy"
-version = "0.46.0"
+version = "0.47.0"
 description = ""
 authors = [{ name = "Jon R. Fox (mycr0ft)", email = "jon.fox@drfox.com" }]
 readme = "README.md"

{sysmlpy-0.46.0 → sysmlpy-0.47.0}/src/sysmlpy/__init__.py

@@ -25,7 +25,7 @@ __all__ = [
     "render_state_transition_view_svg", "boxes_view",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.46.0"
+__version__ = "0.47.0"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,

{sysmlpy-0.46.0 → sysmlpy-0.47.0}/src/sysmlpy/antlr_visitor.py

@@ -7476,14 +7476,15 @@ def _make_nested_connection_usage_dict(ctx, prefix=None):
 
 def _build_connector_part_dict(ctx):
     """Build a ConnectorPart dictionary from a connectorPart context.
-    
+
     Grammar:
       connectorPart : binaryConnectorPart | naryConnectorPart ;
       binaryConnectorPart : connectorEndMember TO connectorEndMember ;
+      naryConnectorPart : LPAREN connectorEndMember (COMMA connectorEndMember)* RPAREN ;
     """
     if ctx is None:
         return None
-    
+
     if hasattr(ctx, 'binaryConnectorPart') and ctx.binaryConnectorPart():
         bcp = ctx.binaryConnectorPart()
         owned_rel = []
@@ -7495,7 +7496,7 @@ def _build_connector_part_dict(ctx):
                 end_dict = _visit_connector_end_member(end)
                 if end_dict:
                     owned_rel.append(end_dict)
-        
+
         return {
             "name": "ConnectorPart",
             "part": {
@@ -7503,7 +7504,27 @@ def _build_connector_part_dict(ctx):
                 "ownedRelationship": owned_rel
             }
         }
-    
+
+    if hasattr(ctx, 'naryConnectorPart') and ctx.naryConnectorPart():
+        ncp = ctx.naryConnectorPart()
+        owned_rel = []
+        if hasattr(ncp, 'connectorEndMember') and ncp.connectorEndMember():
+            ends = ncp.connectorEndMember()
+            if not isinstance(ends, list):
+                ends = [ends]
+            for end in ends:
+                end_dict = _visit_connector_end_member(end)
+                if end_dict:
+                    owned_rel.append(end_dict)
+
+        return {
+            "name": "ConnectorPart",
+            "part": {
+                "name": "NaryConnectorPart",
+                "ownedRelationship": owned_rel
+            }
+        }
+
     return None
 
 
@@ -7924,20 +7945,30 @@ def _make_concern_usage_dict(ctx, prefix=None):
 
 def _make_allocation_usage_dict(ctx, prefix=None):
     """Create an AllocationUsage dictionary.
-    
+
     allocationUsage: occurrenceUsagePrefix allocationUsageDeclaration usageBody
+    allocationUsageDeclaration
+        : ALLOCATION usageDeclaration? (ALLOCATE connectorPart)?
+        | ALLOCATE connectorPart
+        ;
+
+    Issue #5: the connector endpoints (`allocate X to Y`) were silently
+    dropped before reaching the dict. Mirror the InterfaceUsage pattern:
+    walk `aud.connectorPart()` (when present) and emit a ConnectorPart
+    dict with binary or nary ends.
     """
     name = None
     shortname = None
+    connector_part = None
     if ctx is not None:
         aud = None
         if hasattr(ctx, 'allocationUsageDeclaration') and ctx.allocationUsageDeclaration():
             aud = ctx.allocationUsageDeclaration()
-        
+
         ud = None
         if aud and hasattr(aud, 'usageDeclaration') and aud.usageDeclaration():
             ud = aud.usageDeclaration()
-        
+
         if ud and hasattr(ud, 'identification') and ud.identification():
             ident = ud.identification()
             if hasattr(ident, 'name'):
@@ -7949,7 +7980,13 @@ def _make_allocation_usage_dict(ctx, prefix=None):
                     elif len(name_list) == 1:
                         name_text = name_list[0].getText()
                         name, shortname = _extract_name_shortname(name_text)
-    
+
+        # Issue #5: capture the `allocate X to Y` (or `allocate X, Y to Z`)
+        # connector part. Either standalone or appended after the
+        # allocation keyword + optional usageDeclaration.
+        if aud and hasattr(aud, 'connectorPart') and aud.connectorPart():
+            connector_part = _build_connector_part_dict(aud.connectorPart())
+
     return {
         "name": "PackageMember",
         "prefix": None,
@@ -7974,6 +8011,7 @@ def _make_allocation_usage_dict(ctx, prefix=None):
                                 "specialization": None
                             }
                         },
+                        "connectorPart": connector_part,
                         "body": {
                             "name": "UsageBody",
                             "body": {

{sysmlpy-0.46.0 → sysmlpy-0.47.0}/src/sysmlpy/grammar/classes.py

@@ -7386,6 +7386,8 @@ class ConnectorPart:
         if valid_definition(definition, self.__class__.__name__):
             if definition["part"]["name"] == "BinaryConnectorPart":
                 self.part = BinaryConnectorPart(definition["part"])
+            elif definition["part"]["name"] == "NaryConnectorPart":
+                self.part = NaryConnectorPart(definition["part"])
             else:
                 print(f"ConnectorPart: unhandled {definition['part']['name']}")  # pragma: no cover
                 self.part = None  # pragma: no cover
@@ -7417,6 +7419,23 @@ class BinaryConnectorPart:
         }
 
 
+class NaryConnectorPart:
+    def __init__(self, definition):
+        if valid_definition(definition, self.__class__.__name__):
+            self.children = []
+            for relationship in definition["ownedRelationship"]:
+                self.children.append(ConnectorEndMember(relationship))
+
+    def dump(self):
+        return "(" + ", ".join([child.dump() for child in self.children]) + ")"
+
+    def get_definition(self):
+        return {
+            "name": self.__class__.__name__,
+            "ownedRelationship": [c.get_definition() for c in self.children],
+        }
+
+
 class ConnectorEndMember:
     def __init__(self, definition):
         if valid_definition(definition, self.__class__.__name__):
@@ -9862,8 +9881,39 @@ class _PrefixedUsageBase:
 
 class AllocationUsage(_PrefixedUsageBase):
     # allocationUsage : occurrenceUsagePrefix ALLOCATION usageDeclaration? usageBody
+    # allocationUsageDeclaration : ALLOCATION usageDeclaration? (ALLOCATE connectorPart)?
+    #                          | ALLOCATE connectorPart
     keyword = "allocation"
 
+    def __init__(self, definition=None):
+        super().__init__(definition)
+        self.connectorPart = None
+        if definition is not None and valid_definition(definition, self.__class__.__name__):
+            if definition.get("connectorPart") is not None:
+                self.connectorPart = ConnectorPart(definition["connectorPart"])
+
+    def dump(self):
+        parts = []
+        if self.prefix is not None:
+            parts.append(self.prefix.dump())
+        # Render as `allocation [name] [allocate X to Y]`
+        parts.append(self.keyword)
+        if self.declaration is not None:
+            decl_dump = self.declaration.dump()
+            if decl_dump:
+                parts.append(decl_dump)
+        if self.connectorPart is not None:
+            parts.append("allocate")
+            parts.append(self.connectorPart.dump())
+        if self.body is not None:
+            parts.append(self.body.dump())
+        return " ".join(parts)
+
+    def get_definition(self):
+        output = super().get_definition()
+        output["connectorPart"] = self.connectorPart.get_definition() if self.connectorPart else None
+        return output
+
 
 class RenderingUsage(_PrefixedUsageBase):
     # renderingUsage : occurrenceUsagePrefix RENDERING usage