sysmlpy 0.46.0__tar.gz → 0.48.0__tar.gz

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

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

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

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

{sysmlpy-0.46.0 → sysmlpy-0.48.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.48.0"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,

{sysmlpy-0.46.0 → sysmlpy-0.48.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": {
@@ -9764,6 +9802,16 @@ def _visit_nested_occurrence_usage(occ_elem):
         elif hasattr(struct_elem, 'connectionUsage') and struct_elem.connectionUsage():
             ctx = struct_elem.connectionUsage()
             return _make_nested_connection_usage_dict(ctx, None)
+        elif hasattr(struct_elem, 'allocationUsage') and struct_elem.allocationUsage():
+            # Phase 0: allocation usages inside a definition body.
+            ctx = struct_elem.allocationUsage()
+            result = _make_allocation_usage_dict(ctx, None)
+            if result and result.get("name") == "PackageMember":
+                # Unwrap the PackageMember -> UsageElement chain so the
+                # body builder sees an OccurrenceUsageElement at the
+                # expected position.
+                return result.get("ownedRelatedElement")
+            return result
         elif hasattr(struct_elem, 'portionUsage') and struct_elem.portionUsage():
             ctx = struct_elem.portionUsage()
             name, shortname = _get_usage_identification(ctx)
@@ -9983,6 +10031,24 @@ def _visit_nested_occurrence_usage(occ_elem):
             if result and result.get("name") == "PackageMember":
                 return result.get("ownedRelatedElement")
             return result
+        elif hasattr(behav_elem, 'stateUsage') and behav_elem.stateUsage():
+            # Phase 0: state usages live in a BehaviorUsageElement too.
+            ctx = behav_elem.stateUsage()
+            result = _make_state_usage_dict(ctx, None)
+            if result and result.get("name") == "PackageMember":
+                inner = result.get("ownedRelatedElement", {})
+                return inner
+            return result
+        elif hasattr(behav_elem, 'allocationUsage') and behav_elem.allocationUsage():
+            # Phase 0: allocation usages inside a definition body.
+            ctx = behav_elem.allocationUsage()
+            result = _make_allocation_usage_dict(ctx, None)
+            if result and result.get("name") == "PackageMember":
+                # Unwrap the PackageMember -> UsageElement chain so the
+                # body builder sees an OccurrenceUsageElement at the
+                # expected position.
+                return result.get("ownedRelatedElement")
+            return result
     
     # print(f"DEBUG: No match found in _visit_nested_occurrence_usage")
     # Fall through to check structure usage elements

{sysmlpy-0.46.0 → sysmlpy-0.48.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

{sysmlpy-0.46.0 → sysmlpy-0.48.0}/src/sysmlpy/usage.py

@@ -798,23 +798,23 @@ class Usage(Searchable):
         self.__init__()
         self.grammar = grammar
         children = []
-        
+
         # Check if this is a definition or usage
         # Some definition types use 'definition' (PartDefinition, AttributeDefinition)
         # Others use 'declaration' directly (RequirementDefinition, UseCaseDefinition)
         # PartDefinition: has .definition which is a Definition object
         # Usage: has .declaration directly
-        
+
         # First check if grammar has 'definition' (for definitions like PartDefinition)
         defn = getattr(grammar, 'definition', None)
         if defn:
             # This type uses 'definition' (PartDefinition, etc.)
             # Get name from definition.declaration.identification.declaredName
             u_name = defn.declaration.identification.declaredName
-            
+
             # Get body from definition.body
             body = defn.body if hasattr(defn, 'body') else None
-            
+
             # body is DefinitionBody with .children
             if body and hasattr(body, 'children') and body.children:
                 children_list = []
@@ -847,7 +847,7 @@ class Usage(Searchable):
                     u_name = None
             else:
                 u_name = None
-            
+
             # Extract children from usage body: grammar.usage.completion.body.body.children
             # This mirrors the PartDefinition path: grammar.definition.body.children
             try:
@@ -874,7 +874,7 @@ class Usage(Searchable):
             # This type uses 'declaration' directly (RequirementDefinition, UseCaseDefinition, some usages)
             decl = grammar.declaration
             u_name = None
-            
+
             # Check nested declaration for Usage (UsageDeclaration -> FeatureDeclaration)
             nested_decl = getattr(decl, 'declaration', None)
             if nested_decl and hasattr(nested_decl, 'identification') and nested_decl.identification:
@@ -922,10 +922,10 @@ class Usage(Searchable):
                 sc = child.children if hasattr(child, 'children') else child
             else:
                 continue
-                
+
             # Process the child
             class_name = sc.__class__.__name__ if not hasattr(sc, '__class__') else sc.__class__.__name__
-            
+
             if class_name == "PartDefinition":
                 c = Part(definition=True).load_from_grammar(sc)
                 c.parent = self
@@ -977,10 +977,37 @@ class Usage(Searchable):
                         c = Flow().load_from_grammar(inner)
                         c.parent = self
                         self.children.append(c)
+                    elif inner.__class__.__name__ == "AllocationUsage":
+                        # Phase 0: allocation usages inside a definition
+                        # body live in StructureUsageElement -> AllocationUsage.
+                        a = Allocation()
+                        a.grammar = inner
+                        a.parent = self
+                        self.children.append(a)
                     elif inner.__class__.__name__ == "PortionUsage":
                         c = Part().load_from_grammar(inner)
                         c.parent = self
                         self.children.append(c)
+            elif class_name == "BehaviorUsageElement":
+                # Phase 0 of docs/v0.46.0_expression_capture_plan.md:
+                # assert / constraint / calc / state / action / requirement /
+                # satisfy / allocation usages live inside a BehaviorUsageElement
+                # when they appear in a definition body. The previous
+                # dispatch dropped the entire BehaviorUsageElement.
+                if hasattr(sc, 'children'):
+                    inner = sc.children
+                    inner_name = inner.__class__.__name__
+                    c = _load_behavior_child(self, inner, inner_name)
+                    if c is not None:
+                        c.parent = self
+                        self.children.append(c)
+            elif class_name == "InterfaceUsage":
+                # Same phase 0: interface usages are wrapped as
+                # OccurrenceUsageElement -> InterfaceUsage directly (not
+                # through StructureUsageElement).
+                c = Interface().load_from_grammar(sc)
+                c.parent = self
+                self.children.append(c)
             elif class_name == "StructureDefinitionElement":
                 if hasattr(sc, 'children'):
                     inner = sc.children
@@ -1039,6 +1066,113 @@ class Usage(Searchable):
     #         raise AttributeError("Invalid Feature Name or Chain")
 
 
+def _load_behavior_child(parent, inner, inner_name):
+    """Construct a public-API element for a usage that lives inside a
+    ``BehaviorUsageElement`` when it appears in a definition body.
+
+    Phase 0 of docs/v0.46.0_expression_capture_plan.md: this helper
+    closes the gap that caused ``assert constraint``, ``constraint``,
+    ``calc``, ``state``, ``action``, ``requirement``, ``satisfy``, and
+    ``allocate`` usages to be silently dropped when they appeared inside
+    a ``part def``, ``item def``, etc. body.
+
+    Parameters
+    ----------
+    parent : Usage
+        The Part / Item / / etc. that owns the new child (for ``.parent``).
+    inner : object
+        The inner grammar element (e.g. ``AssertConstraintUsage``,
+        ``ConstraintUsage``, ``CalculationUsage`` ...). Used for
+        ``.grammar`` so the existing round-trip machinery keeps working.
+    inner_name : str
+        Class name of ``inner`` — selects which public-API class to
+        instantiate.
+
+    Returns
+    -------
+    Usage or None
+        A fresh public-API element (e.g. ``Constraint``, ``Calculation``,
+        ``State``, ``Action``, ``Requirement``, ``Allocation``) with
+        ``.grammar`` wired up and ``.parent`` set. Returns ``None`` if
+        the inner kind is unknown to this helper — the caller treats that
+        as a no-op.
+    """
+    def _name_from_declaration(elem):
+        """Extract a human-readable name from an element's declaration,
+        mirroring the pattern at definition.py:1269-1290."""
+        if not hasattr(elem, "declaration") or elem.declaration is None:
+            return None
+        decl = elem.declaration
+        # AssertConstraintUsage has a different layout: declaration may
+        # be wrapped under .usageDeclaration.
+        if hasattr(decl, "usageDeclaration") and decl.usageDeclaration():
+            inner_decl = decl.usageDeclaration()
+            if hasattr(inner_decl, "identification") and inner_decl.identification:
+                ident = inner_decl.identification
+                if hasattr(ident, "declaredName"):
+                    return ident.declaredName
+                if hasattr(ident, "name"):
+                    name_obj = ident.name()
+                    if name_obj:
+                        if isinstance(name_obj, list):
+                            return name_obj[-1].getText()
+                        return name_obj.getText()
+        if hasattr(decl, "declaration") and decl.declaration:
+            feat_decl = decl.declaration
+            if hasattr(feat_decl, "identification") and feat_decl.identification:
+                ident = feat_decl.identification
+                if hasattr(ident, "declaredName"):
+                    return ident.declaredName
+                if hasattr(ident, "name"):
+                    name_obj = ident.name()
+                    if name_obj:
+                        if isinstance(name_obj, list):
+                            return name_obj[-1].getText()
+                        return name_obj.getText()
+        return None
+
+    if inner_name == "AssertConstraintUsage":
+        c = Constraint()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "ConstraintUsage":
+        c = Constraint()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "CalculationUsage":
+        c = Calculation()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "StateUsage":
+        c = State()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "ActionUsage":
+        c = Action(grammar=inner).load_from_grammar(inner)
+        return c
+    if inner_name == "RequirementUsage":
+        c = Requirement()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "SatisfyRequirementUsage":
+        c = Requirement()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    if inner_name == "AllocationUsage":
+        c = Allocation()
+        c.grammar = inner
+        c.name = _name_from_declaration(inner)
+        return c
+    return None
+
+
+
 class Attribute(Usage):
     """SysML v2 Attribute usage/definition.