sysmlpy 0.36.2__tar.gz → 0.36.3__tar.gz

{sysmlpy-0.36.2 → sysmlpy-0.36.3}/PKG-INFO

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

{sysmlpy-0.36.2 → sysmlpy-0.36.3}/pyproject.toml

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

{sysmlpy-0.36.2 → sysmlpy-0.36.3}/src/sysmlpy/__init__.py

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

{sysmlpy-0.36.2 → sysmlpy-0.36.3}/src/sysmlpy/definition.py

@@ -1168,23 +1168,11 @@ class Package(Searchable):
                 f.parent = self
                 self.children.append(f)
             elif inner_class == "ViewDefinition":
-                v = View(definition=True)
-                v.grammar = inner_element
-                if hasattr(inner_element, 'declaration') and inner_element.declaration:
-                    decl = inner_element.declaration
-                    if hasattr(decl, 'identification') and decl.identification:
-                        v.name = decl.identification.declaredName
+                v = View(definition=True).load_from_grammar(inner_element)
                 v.parent = self
                 self.children.append(v)
             elif inner_class == "ViewUsage":
-                v = View()
-                v.grammar = inner_element
-                if hasattr(inner_element, 'declaration') and inner_element.declaration:
-                    decl = inner_element.declaration
-                    if hasattr(decl, 'declaration') and decl.declaration:
-                        feat_decl = decl.declaration
-                        if hasattr(feat_decl, 'identification') and feat_decl.identification:
-                            v.name = feat_decl.identification.declaredName
+                v = View().load_from_grammar(inner_element)
                 v.parent = self
                 self.children.append(v)
             elif inner_class == "ViewpointDefinition":

{sysmlpy-0.36.2 → sysmlpy-0.36.3}/src/sysmlpy/usage.py

@@ -151,15 +151,24 @@ class Usage(Searchable):
             )
 
         if len(body) > 0:
-            target = getattr(self.grammar, subgrammar)
-            if hasattr(target, 'completion'):
+            # Most usages (Part, Item, Attribute, ...) nest their body under
+            # ``grammar.usage.completion.body.body`` (a DefinitionBody).  Prefixed
+            # usages such as ViewUsage carry the body directly on ``grammar.body``
+            # (a ViewBody / ViewDefinitionBody) whose ``children`` are the
+            # DefinitionBodyItem objects themselves.
+            target = getattr(self.grammar, subgrammar, None)
+            if target is not None and hasattr(target, 'completion'):
                 target.completion.body.body = DefinitionBody(
                     {"name": "DefinitionBody", "ownedRelatedElement": body}
                 )
-            else:
+            elif target is not None and hasattr(target, 'body'):
                 target.body = DefinitionBody(
                     {"name": "DefinitionBody", "ownedRelatedElement": body}
                 )
+            elif hasattr(self.grammar, 'body') and hasattr(self.grammar.body, 'children'):
+                self.grammar.body.children = [
+                    DefinitionBodyItem(item) for item in body
+                ]
         return self
 
     def usage_dump(self, child):
@@ -780,7 +789,29 @@ class Usage(Searchable):
             # Check direct identification (for RequirementDefinition, UseCaseDefinition)
             elif hasattr(decl, 'identification') and decl.identification:
                 u_name = decl.identification.declaredName
+            # Prefixed usages (e.g. ViewUsage, ViewDefinition) and other
+            # declaration-based types carry their body directly on
+            # ``grammar.body`` rather than nested under
+            # ``grammar.usage.completion.body.body``.  Extract children the
+            # same way the usage path does when the body exposes a
+            # ``children`` list (ViewBody / ViewDefinitionBody /
+            # DefinitionBody).  Bodies that use ``items`` instead
+            # (RequirementBody, CaseBody) are left untouched here.
             children = []
+            body = getattr(grammar, 'body', None)
+            if body is not None and hasattr(body, 'children') and body.children:
+                children_list = []
+                for body_item in body.children:
+                    if hasattr(body_item, 'children') and body_item.children:
+                        member = body_item.children[0]
+                        mc = member.children if isinstance(member.children, list) else [member.children]
+                        for inner in mc:
+                            if inner is None:
+                                continue
+                            if inner.__class__.__name__ == 'DefinitionElement' and hasattr(inner, 'children') and inner.children:
+                                inner = inner.children[0]
+                            children_list.append(inner)
+                children = children_list
         else:
             u_name = None
             children = []