sysmlpy 0.86.0__tar.gz → 0.88.0__tar.gz

{sysmlpy-0.86.0 → sysmlpy-0.88.0}/PKG-INFO

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

{sysmlpy-0.86.0 → sysmlpy-0.88.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "sysmlpy"
-version = "0.86.0"
+version = "0.88.0"
 description = ""
 authors = [{ name = "Jon R. Fox (mycr0ft)", email = "jon.fox@drfox.com" }]
 readme = "README.md"
@@ -38,3 +38,8 @@ sysmlpy-lsp = "sysmlpy.lsp.stdio:main"
 [tool.poetry.group.dev.dependencies]
 pytest = ">=8.0,<9.0"
 
+[tool.pytest.ini_options]
+markers = [
+    "conformance: OMG 2026-03 XPect parse conformance suite (slow; deselect with -m 'not conformance')",
+]
+

{sysmlpy-0.86.0 → sysmlpy-0.88.0}/src/sysmlpy/__init__.py

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

{sysmlpy-0.86.0 → sysmlpy-0.88.0}/src/sysmlpy/antlr_visitor.py

@@ -2383,7 +2383,7 @@ def _make_assert_constraint_usage_dict(acu_ctx, prefix=None):
         if hasattr(cud, 'valuePart') and cud.valuePart():
             vp = cud.valuePart()
             if hasattr(vp, 'ownedExpression') and vp.ownedExpression():
-                expr = _visit_expression(vp.ownedExpression())
+                expr = _visit_owned_expression(vp.ownedExpression())
                 if expr:
                     valuepart = {"name": "ValuePart", "ownedRelationship": expr}
         
@@ -2492,14 +2492,15 @@ def _make_satisfy_requirement_usage_dict(sru_ctx, prefix=None):
                 }
             }
     
-    # Extract valuePart
+    # Extract valuePart (``satisfy s1 : R = 3;``)
+    # valuePart : featureValue ; featureValue : (EQ | COLON_EQ |
+    # DEFAULT …) ownedExpression — use the shared extractor, which
+    # handles the featureValue wrapper and the EQ/COLON_EQ/DEFAULT
+    # flags (v0.88.0 — previously read vp.ownedExpression() directly,
+    # which is one level too high, so the value was dropped).
     valuepart = None
     if hasattr(sru_ctx, 'valuePart') and sru_ctx.valuePart():
-        vp = sru_ctx.valuePart()
-        if hasattr(vp, 'ownedExpression') and vp.ownedExpression():
-            expr = _visit_expression(vp.ownedExpression())
-            if expr:
-                valuepart = {"name": "ValuePart", "ownedRelationship": expr}
+        valuepart = _visit_value_part(sru_ctx.valuePart())
     
     # Extract satisfactionSubjectMember (after 'by')
     ssm = None
@@ -5024,30 +5025,48 @@ def _visit_entry_transition_member(ctx):
 
 
 def _visit_guarded_target_succession(ctx):
-    """Visit a guardedTargetSuccession context."""
+    """Visit a guardedTargetSuccession context.
+
+    guardedTargetSuccession : guardExpressionMember THEN transitionSuccessionMember
+
+    Emits the ``ownedRelationship`` member-list shape the
+    ``GuardedTargetSuccession`` grammar class loads (guard + target were
+    silently dropped before v0.87.0, and the old dict shape crashed the
+    class loader with a KeyError).
+    """
     if ctx is None:
         return None
-    
-    guard = None
-    if hasattr(ctx, 'guardExpression') and ctx.guardExpression():
-        guard_dict = _visit_expression(ctx.guardExpression())
-        guard = {
-            "name": "GuardExpression",
-            "expression": guard_dict
-        }
-    
-    succession = None
-    if hasattr(ctx, 'succession') and ctx.succession():
-        succ = ctx.succession()
-        if isinstance(succ, list):
-            succ = succ[0]
-        if succ:
-            succession = _visit_succession(succ)
-    
+
+    owned_relationship = []
+
+    gem = None
+    if hasattr(ctx, 'guardExpressionMember') and ctx.guardExpressionMember():
+        gem = ctx.guardExpressionMember()
+        if isinstance(gem, list):
+            gem = gem[0]
+        guard_member = _visit_guard_expression_member(gem)
+        if guard_member:
+            owned_relationship.append(guard_member)
+
+    tsm = None
+    if hasattr(ctx, 'transitionSuccessionMember') and ctx.transitionSuccessionMember():
+        tsm = ctx.transitionSuccessionMember()
+        if isinstance(tsm, list):
+            tsm = tsm[0]
+        ts = None
+        if hasattr(tsm, 'transitionSuccession') and tsm.transitionSuccession():
+            ts = tsm.transitionSuccession()
+            if isinstance(ts, list):
+                ts = ts[0]
+        if ts:
+            owned_relationship.append({
+                "name": "TransitionSuccessionMember",
+                "ownedRelatedElement": _visit_transition_succession(ts),
+            })
+
     return {
         "name": "GuardedTargetSuccession",
-        "guard": guard,
-        "ownedRelatedElement": succession
+        "ownedRelationship": owned_relationship,
     }
 
 
@@ -5548,6 +5567,8 @@ def _visit_payload_feature(ctx):
     PayloadFeature class expects:
       identification, valuepart, multiplicity1, multiplicity2, ownedRelationship (OwnedFeatureTyping), pfsp
     For 'accept VehicleStartSignal': ownedRelationship contains the type name.
+    For 'accept msg : M': identification + pfsp (v0.88.0 — previously
+    hardcoded to None, so the member's name and typing were dropped).
     """
     if ctx is None:
         return None
@@ -5580,14 +5601,49 @@ def _visit_payload_feature(ctx):
                     }
                 }
     
+    # identification (``accept msg : M`` — first grammar alternative:
+    # ``identification payloadFeatureSpecializationPart valuePart?``)
+    identification = None
+    if hasattr(ctx, 'identification') and ctx.identification():
+        ident = ctx.identification()
+        if ident:
+            name_list = ident.name() if hasattr(ident, 'name') else None
+            if name_list and isinstance(name_list, list):
+                if len(name_list) == 2:
+                    shortname = name_list[0].getText()
+                    name = name_list[1].getText()
+                elif len(name_list) == 1:
+                    name_text = name_list[0].getText()
+                    name = name_text
+                    shortname = None
+                else:
+                    name = None
+                    shortname = None
+                identification = {
+                    "name": "Identification",
+                    "declaredShortName": shortname,
+                    "declaredName": name
+                }
+    
+    # pfsp (the ``: M[1]`` specializations after the name)
+    pfsp = None
+    if hasattr(ctx, 'payloadFeatureSpecializationPart') and ctx.payloadFeatureSpecializationPart():
+        pfsp = _build_pfsp_from_ctx(ctx.payloadFeatureSpecializationPart())
+    
+    # valuePart (``accept msg = 3`` — ``identification valuePart``
+    # alternative)
+    valuepart = None
+    if hasattr(ctx, 'valuePart') and ctx.valuePart():
+        valuepart = _visit_value_part(ctx.valuePart())
+    
     return {
         "name": "PayloadFeature",
-        "identification": None,
-        "valuepart": None,
+        "identification": identification,
+        "valuepart": valuepart,
         "multiplicity1": None,
         "multiplicity2": None,
         "ownedRelationship": owned_rel,
-        "pfsp": None
+        "pfsp": pfsp
     }
 
 
@@ -6661,6 +6717,10 @@ def _make_connection_usage_dict(ctx, prefix=None):
     """Create a ConnectionUsage dictionary."""
     name, shortname = _get_usage_identification(ctx)
 
+    # Typed-by etc. on the connection declaration (e.g.
+    # ``connection cn1 : CD``) — previously hardcoded to None.
+    specialization = _build_full_specialization_from_ctx(ctx)
+
     # Parse the connector part (``connect X to Y``) so endpoints survive
     # into the grammar object tree (v0.67.0 — fixes the "part": None stub)
     # connectionUsage: occurrenceUsagePrefix ( CONNECTION usageDeclaration?
@@ -6731,7 +6791,7 @@ def _make_connection_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "part": conn_part_dict,
@@ -8050,6 +8110,9 @@ def _make_view_usage_dict(ctx, prefix=None):
     body_items = []
     if hasattr(ctx, 'viewBody') and ctx.viewBody():
         body_items = _visit_view_body_dict(ctx.viewBody())
+    # Typed-by / redefinition / subsets on the view declaration
+    # (e.g. ``view v : Engine``) — previously hardcoded to None.
+    specialization = _build_full_specialization_from_ctx(ctx)
     return {
         "name": "PackageMember",
         "prefix": None,
@@ -8071,7 +8134,7 @@ def _make_view_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "body": {
@@ -8092,6 +8155,7 @@ def _make_viewpoint_usage_dict(ctx, prefix=None):
     """
     name = None
     shortname = None
+    specialization = None
     if ctx is not None:
         cud = None
         if hasattr(ctx, 'constraintUsageDeclaration') and ctx.constraintUsageDeclaration():
@@ -8112,6 +8176,11 @@ def _make_viewpoint_usage_dict(ctx, prefix=None):
                     elif len(name_list) == 1:
                         name_text = name_list[0].getText()
                         name, shortname = _extract_name_shortname(name_text)
+        
+        # Typed-by etc. on the viewpoint declaration (e.g.
+        # ``viewpoint v : R``) — previously dropped.
+        if ud is not None:
+            specialization = _build_full_specialization_from_ud(ud)
     
     return {
         "name": "PackageMember",
@@ -8134,7 +8203,7 @@ def _make_viewpoint_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "body": {
@@ -8158,6 +8227,7 @@ def _make_concern_usage_dict(ctx, prefix=None):
     """
     name = None
     shortname = None
+    specialization = None
     if ctx is not None:
         cud = None
         if hasattr(ctx, 'constraintUsageDeclaration') and ctx.constraintUsageDeclaration():
@@ -8178,6 +8248,10 @@ def _make_concern_usage_dict(ctx, prefix=None):
                     elif len(name_list) == 1:
                         name_text = name_list[0].getText()
                         name, shortname = _extract_name_shortname(name_text)
+        
+        # Typed-by etc. on the concern declaration — previously dropped.
+        if ud is not None:
+            specialization = _build_full_specialization_from_ud(ud)
     
     return {
         "name": "PackageMember",
@@ -8200,7 +8274,7 @@ def _make_concern_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "body": {
@@ -8236,6 +8310,7 @@ def _make_allocation_usage_dict(ctx, prefix=None):
     name = None
     shortname = None
     connector_part = None
+    specialization = None
     if ctx is not None:
         aud = None
         if hasattr(ctx, 'allocationUsageDeclaration') and ctx.allocationUsageDeclaration():
@@ -8263,6 +8338,11 @@ def _make_allocation_usage_dict(ctx, prefix=None):
         if aud and hasattr(aud, 'connectorPart') and aud.connectorPart():
             connector_part = _build_connector_part_dict(aud.connectorPart())
 
+        # Typed-by etc. on the allocation declaration (e.g.
+        # ``allocation a1 : AD``) — previously dropped.
+        if ud is not None:
+            specialization = _build_full_specialization_from_ud(ud)
+
     return {
         "name": "PackageMember",
         "prefix": None,
@@ -8284,7 +8364,7 @@ def _make_allocation_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "part": connector_part,
@@ -8309,6 +8389,7 @@ def _make_rendering_usage_dict(ctx, prefix=None):
     """
     name = None
     shortname = None
+    specialization = None
     if ctx is not None:
         # RenderingUsage uses just `usage` (not usageDeclaration)
         usage = None
@@ -8330,6 +8411,12 @@ def _make_rendering_usage_dict(ctx, prefix=None):
                     elif len(name_list) == 1:
                         name_text = name_list[0].getText()
                         name, shortname = _extract_name_shortname(name_text)
+        
+        # Typed-by etc. on the rendering declaration (e.g.
+        # ``rendering r1 : RD``) — previously dropped. The rendering
+        # usage ctx carries ``usage`` directly, so the ctx-based
+        # builder works here.
+        specialization = _build_full_specialization_from_ctx(ctx)
     
     return {
         "name": "PackageMember",
@@ -8352,7 +8439,7 @@ def _make_rendering_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "body": {
@@ -8376,6 +8463,7 @@ def _make_individual_usage_dict(ctx, prefix=None):
     """
     name = None
     shortname = None
+    specialization = None
     if ctx is not None:
         # individualUsage has `usage` at the end
         usage = None
@@ -8397,6 +8485,9 @@ def _make_individual_usage_dict(ctx, prefix=None):
                     elif len(name_list) == 1:
                         name_text = name_list[0].getText()
                         name, shortname = _extract_name_shortname(name_text)
+        
+        # Typed-by etc. on the individual declaration — previously dropped.
+        specialization = _build_full_specialization_from_ctx(ctx)
     
     # Use IndividualUsageSimple per our simplified model
     return {
@@ -8420,7 +8511,7 @@ def _make_individual_usage_dict(ctx, prefix=None):
                                     "declaredShortName": shortname,
                                     "declaredName": name
                                 },
-                                "specialization": None
+                                "specialization": specialization
                             }
                         },
                         "body": {
@@ -8992,7 +9083,7 @@ def _make_view_rendering_member_dict(ctx, prefix=None):
                             "declaredShortName": shortname,
                             "declaredName": name
                         },
-                        "specialization": None
+                        "specialization": _build_full_specialization_from_ctx(usage_ctx)
                     }
                 },
                 "completion": None
@@ -9074,6 +9165,102 @@ def _make_render_state_member_dict(ctx, prefix=None):
     }
 
 
+def _make_element_filter_member_dict(ctx):
+    """Visit an elementFilterMember context and return its dict.
+
+    elementFilterMember : memberPrefix FILTER ownedExpression SEMI
+
+    e.g. ``filter @e1;`` — the element filter of a view.
+    """
+    if ctx is None:
+        return None
+
+    prefix = None
+    if hasattr(ctx, 'memberPrefix') and ctx.memberPrefix():
+        mp = ctx.memberPrefix()
+        if hasattr(mp, 'visibilityIndicator') and mp.visibilityIndicator():
+            prefix = {
+                "name": "MemberPrefix",
+                "visibility": _visit_visibility_indicator_dict(mp.visibilityIndicator()),
+            }
+
+    expr = None
+    if hasattr(ctx, 'ownedExpression') and ctx.ownedExpression():
+        expr = _visit_owned_expression(ctx.ownedExpression())
+
+    return {
+        "name": "ElementFilterMember",
+        "prefix": prefix,
+        "ownedRelatedElement": expr,
+    }
+
+
+def _make_expose_dict(ctx):
+    """Visit an expose context and return its dict.
+
+    expose : EXPOSE ( membershipExpose | namespaceExpose ) relationshipBody
+    membershipExpose : membershipImport
+    namespaceExpose : namespaceImport
+
+    e.g. ``expose e;`` (membership form) or ``expose P::*;`` (namespace
+    form).  The membership/namespace payload reuses the Import dict
+    shapes (without the import prefix).
+    """
+    if ctx is None:
+        return None
+
+    relationship = None
+
+    if hasattr(ctx, 'membershipExpose') and ctx.membershipExpose():
+        me = ctx.membershipExpose()
+        if not hasattr(me, 'membershipImport') or me.membershipImport() is None:
+            print("[visitor] expose: unsupported membershipExpose form, skipped")
+            return None
+        mi = me.membershipImport()
+        qn_text = mi.qualifiedName().getText()
+        is_recursive = mi.STAR_STAR() is not None
+        relationship = {
+            "name": "MembershipExpose",
+            "membership": {
+                "name": "ImportedMembership",
+                "importedMembership": {
+                    "name": "QualifiedName",
+                    "names": qn_text.split("::"),
+                },
+                "isRecursive": is_recursive,
+            },
+        }
+
+    elif hasattr(ctx, 'namespaceExpose') and ctx.namespaceExpose():
+        ne = ctx.namespaceExpose()
+        if not hasattr(ne, 'namespaceImport') or ne.namespaceImport() is None:
+            print("[visitor] expose: unsupported namespaceExpose form, skipped")
+            return None
+        ns = ne.namespaceImport()
+        if ns.filterPackage() is not None:
+            print("[visitor] expose: filterPackage form not supported, skipped")
+            return None
+        qn_text = ns.qualifiedName().getText()
+        is_recursive = ns.STAR_STAR() is not None
+        relationship = {
+            "name": "NamespaceExpose",
+            "namespace": {
+                "name": "ImportedNamespace",
+                "namespace": {"name": "QualifiedName", "names": qn_text.split("::")},
+                "isRecursive": is_recursive,
+            },
+        }
+
+    if relationship is None:
+        return None
+
+    return {
+        "name": "Expose",
+        "body": {"name": "RelationshipBody", "ownedRelationship": []},
+        "ownedRelationship": relationship,
+    }
+
+
 def _visit_view_definition_body_dict(body_ctx):
     """Visit a viewDefinitionBody and return a list of body item dicts.
     
@@ -9107,7 +9294,9 @@ def _visit_view_definition_body_dict(body_ctx):
                 if item_dict:
                     items.append(item_dict)
             elif hasattr(item_ctx, 'elementFilterMember') and item_ctx.elementFilterMember():
-                pass  # TODO: handle elementFilterMember
+                item_dict = _make_element_filter_member_dict(item_ctx.elementFilterMember())
+                if item_dict:
+                    items.append(item_dict)
     
     return items
 
@@ -9146,9 +9335,13 @@ def _visit_view_body_dict(body_ctx):
                 if item_dict:
                     items.append(item_dict)
             elif hasattr(item_ctx, 'elementFilterMember') and item_ctx.elementFilterMember():
-                pass  # TODO: handle elementFilterMember
+                item_dict = _make_element_filter_member_dict(item_ctx.elementFilterMember())
+                if item_dict:
+                    items.append(item_dict)
             elif hasattr(item_ctx, 'expose') and item_ctx.expose():
-                pass  # TODO: handle expose
+                item_dict = _make_expose_dict(item_ctx.expose())
+                if item_dict:
+                    items.append(item_dict)
     
     return items
 
@@ -9853,6 +10046,21 @@ def _visit_definition_body_item_dict(item_ctx, is_interface=False):
     inner_element = None
     wrapper = None
     
+    # Check for importRule first (first grammar alternative).
+    # Imports are legal in every body — usage bodies included
+    # (``part p1 { private import Q::*; }``).  Reuse the package-body
+    # Import dict shape and wrap it directly as the body item's
+    # relationship (DefinitionBodyItem dispatches on item["name"],
+    # same convention as RootNamespace) — previously silently
+    # dropped (v0.88.0).
+    if hasattr(item_ctx, 'importRule') and item_ctx.importRule():
+        import_dict = _visit_import_rule_dict(item_ctx.importRule())
+        if import_dict is not None:
+            return {
+                "name": "InterfaceBodyItem" if is_interface else "DefinitionBodyItem",
+                "ownedRelationship": [import_dict],
+            }
+    
     # Check for occurrenceUsageElement (part, item, port, action, etc.)
     if hasattr(item_ctx, 'occurrenceUsageElement') and item_ctx.occurrenceUsageElement():
         occ_elem = item_ctx.occurrenceUsageElement()
@@ -13976,6 +14184,22 @@ def _build_full_specialization_from_ctx(ctx):
         if isinstance(ud, list):
             ud = ud[0] if ud else None
     
+    if ud is None and hasattr(ctx, 'usageDeclaration') and ctx.usageDeclaration():
+        # Some usage contexts (e.g. viewUsage) carry the usageDeclaration
+        # directly instead of through a nested ``usage`` element.
+        ud = ctx.usageDeclaration()
+        if isinstance(ud, list):
+            ud = ud[0] if ud else None
+    
+    if ud is None:
+        return None
+    
+    return _build_full_specialization_from_ud(ud)
+
+
+def _build_full_specialization_from_ud(ud):
+    """Build a full FeatureSpecializationPart dict from a usageDeclaration
+    ANTLR context (the shared core of the ctx-based variant above)."""
     if ud is None:
         return None
     
@@ -13997,6 +14221,24 @@ def _build_full_specialization_from_ctx(ctx):
     if not specs and multiplicity is None:
         return None
     
+    specialization_list = _feature_specialization_dicts(specs)
+
+    return {
+        "name": "FeatureSpecializationPart",
+        "specialization": specialization_list,
+        "multiplicity": multiplicity,
+        "specialization2": [],
+        "multiplicity2": None,
+    }
+
+
+def _feature_specialization_dicts(specs):
+    """Build FeatureSpecialization dicts from featureSpecialization ctxs.
+
+    Shared core for the FeatureSpecializationPart (usages) and
+    PayloadFeatureSpecializationPart (payload features, e.g. accept
+    members) builders.  Handles typings, redefinitions, subsettings and
+    references."""
     specialization_list = []
     
     for spec in specs:
@@ -14121,12 +14363,43 @@ def _build_full_specialization_from_ctx(ctx):
                     }
                 })
 
+    return specialization_list
+
+
+def _build_pfsp_from_ctx(psp_ctx):
+    """Build a PayloadFeatureSpecializationPart dict from a
+    payloadFeatureSpecializationPart context.
+
+    Grammar: ``featureSpecialization+ multiplicityPart?
+    featureSpecialization* | multiplicityPart featureSpecialization+``.
+    Used by payload features (e.g. ``accept msg : M[1]``) — v0.88.0,
+    previously hardcoded to None so the member's typing was dropped.
+    """
+    if psp_ctx is None:
+        return None
+
+    first_group = []
+    second_group = []
+    seen_multiplicity = False
+    for child in psp_ctx.children or []:
+        child_name = type(child).__name__
+        if child_name == 'MultiplicityPartContext':
+            seen_multiplicity = True
+        elif child_name == 'FeatureSpecializationContext':
+            (second_group if seen_multiplicity else first_group).append(child)
+
+    specs = first_group + second_group
+    specialization_list = _feature_specialization_dicts(specs)
+    mp = _get_multiplicity_part(psp_ctx)
+
+    if not specialization_list and mp is None:
+        return None
+
     return {
-        "name": "FeatureSpecializationPart",
-        "specialization": specialization_list,
-        "multiplicity": multiplicity,
-        "specialization2": [],
-        "multiplicity2": None,
+        "name": "PayloadFeatureSpecializationPart",
+        "ownedRelationship": _feature_specialization_dicts(first_group),
+        "ownedRelationship2": _feature_specialization_dicts(second_group),
+        "mp": mp,
     }