sysmlpy 0.27.2__tar.gz → 0.27.4__tar.gz

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.27.2
+Version: 0.27.4
 Summary: SysML v2.0 Parser
 License: MIT License
          

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "sysmlpy"
-version = "0.27.2"
+version = "0.27.4"
 description = "SysML v2.0 Parser"
 authors = [
   { name="Jon R. Fox (mycr0ft)", email="jon.fox@drfox.com" },
@@ -114,7 +114,7 @@ build_command = "pip install poetry && poetry build"
 
 [tool.poetry]
 name = "sysmlpy"
-version = "0.27.2"
+version = "0.27.4"
 description = ""
 authors = ["Jon R. Fox (mycr0ft) <jon.fox@drfox.com>"]
 readme = "README.md"

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/src/sysmlpy/__init__.py

@@ -19,7 +19,7 @@ __all__ = [
     "analyze", "SemanticIssue", "SemanticAnalyzer",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.27.2"
+__version__ = "0.27.4"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/src/sysmlpy/antlr_parser.py

@@ -59,16 +59,34 @@ def parse(source, library=None):
     SysMLSyntaxError
         If the source contains syntax errors.
     """
+    from pathlib import Path
+    
     # Handle string or file input
     if hasattr(source, 'read'):
         content = source.read()
     else:
         content = source
     
-    # TODO: If library path is provided, load library files and prepend to content
-    # For now, just parse the source directly
-    # Library loading would involve reading .sysml files from the library path
-    # and making them available for import resolution
+    # Load library files if library path is provided
+    if library is not None:
+        library_paths = [library] if isinstance(library, (str, Path)) else library
+        library_content = []
+        
+        for lib_path in library_paths:
+            lib_path = Path(lib_path)
+            if lib_path.exists() and lib_path.is_dir():
+                # Load all .sysml and .kerml files from library directory
+                for ext in ['*.sysml', '*.kerml']:
+                    for lib_file in lib_path.glob(f'**/{ext}'):
+                        try:
+                            lib_content = lib_file.read_text(encoding='utf-8')
+                            library_content.append(lib_content)
+                        except Exception:
+                            pass  # Skip files that can't be read
+        
+        # Prepend library content to main content
+        if library_content:
+            content = '\n\n'.join(library_content) + '\n\n' + content
     
     # Create input stream
     input_stream = InputStream(content)

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/src/sysmlpy/antlr_visitor.py

@@ -18,6 +18,46 @@ def _extract_name_shortname(name_text):
     return name_text, None
 
 
+def _extract_name_from_ident(ident):
+    """Extract (name, shortname) from an Identification context.
+    
+    Parameters
+    ----------
+    ident : antlr4 ParserRuleContext
+        Identification context from ANTLR parser.
+    
+    Returns
+    -------
+    tuple
+        (name, shortname) tuple. Returns (None, None) if no name found.
+    
+    Handles:
+    - `name` → (name, None)
+    - `<shortname> name` → (name, shortname)
+    """
+    name = None
+    shortname = None
+    if ident is None:
+        return name, shortname
+    
+    if hasattr(ident, 'name'):
+        name_list = ident.name()
+        if name_list and isinstance(name_list, list):
+            if len(name_list) == 2:
+                # <shortname> name pattern
+                shortname = name_list[0].getText()
+                name = name_list[1].getText()
+            elif len(name_list) == 1:
+                name_text = name_list[0].getText()
+                # Check for explicit angle brackets: <name> → shortname only
+                if hasattr(ident, 'LT') and ident.LT() is not None:
+                    shortname = name_text
+                else:
+                    name = name_text
+    
+    return name, shortname
+
+
 def _get_usage_identification(ctx):
     """Extract (name, shortname) from a usage context by navigating to usageDeclaration().identification().
     
@@ -40,18 +80,7 @@ def _get_usage_identification(ctx):
     
     if usage_decl and hasattr(usage_decl, 'identification') and usage_decl.identification():
         ident = usage_decl.identification()
-        if hasattr(ident, 'name'):
-            name_list = ident.name()
-            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()
-                    if hasattr(ident, 'LT') and ident.LT() is not None:
-                        shortname = name_text
-                    else:
-                        name = name_text
+        name, shortname = _extract_name_from_ident(ident)
     
     return name, shortname
 
@@ -127,19 +156,7 @@ def _get_definition_identification(ctx):
     
     if dd and hasattr(dd, 'identification') and dd.identification():
         ident = dd.identification()
-        if hasattr(ident, 'name'):
-            name_list = ident.name()
-            if name_list and isinstance(name_list, list):
-                if len(name_list) == 2:
-                    # LT name GT name: first is short name, second is long name
-                    shortname = name_list[0].getText()
-                    name = name_list[1].getText()
-                elif len(name_list) == 1:
-                    name_text = name_list[0].getText()
-                    if hasattr(ident, 'LT') and ident.LT() is not None:
-                        shortname = name_text
-                    else:
-                        name = name_text
+        name, shortname = _extract_name_from_ident(ident)
     
     return name, shortname
 
@@ -157,20 +174,7 @@ def _build_identification_dict(ident_ctx):
     shortname = None
     
     if hasattr(ident_ctx, 'name'):
-        name_list = ident_ctx.name()
-        if name_list and isinstance(name_list, list):
-            if len(name_list) == 2:
-                # LT name GT name: first is short name, second is long name
-                shortname = name_list[0].getText()
-                name = name_list[1].getText()
-            elif len(name_list) == 1:
-                name_text = name_list[0].getText()
-                # Check for explicit angle brackets: <name> → shortname only
-                has_lt = hasattr(ident_ctx, 'LT') and ident_ctx.LT() is not None
-                if has_lt:
-                    shortname = name_text
-                else:
-                    name = name_text
+        name, shortname = _extract_name_from_ident(ident_ctx)
     
     if name is None and shortname is None:
         return None
@@ -314,21 +318,7 @@ def _visit_package_dict(tree):
             ident = decl.identification()
             if ident:
                 # Handle identification: LT name GT name | LT name GT | name
-                if hasattr(ident, 'name'):
-                    name_list = ident.name()
-                    if name_list and isinstance(name_list, list):
-                        if len(name_list) == 2:
-                            # LT name GT name: first is short name, second is long name
-                            pkg_shortname = name_list[0].getText()
-                            pkg_name = name_list[1].getText()
-                        elif len(name_list) == 1:
-                            name_text = name_list[0].getText()
-                            # Check for explicit < > angle brackets
-                            if hasattr(ident, 'LT') and ident.LT() is not None:
-                                pkg_shortname = name_text
-                            else:
-                                pkg_name = name_text
-                        # If len(name_list) == 0, leave both as None
+                pkg_name, pkg_shortname = _extract_name_from_ident(ident)
 
     # Build package body elements
     body_elements = []
@@ -828,19 +818,8 @@ def _make_nested_package_dict(ctx, prefix=None):
         decl = ctx.packageDeclaration()
         if hasattr(decl, 'identification'):
             ident = decl.identification()
-            if ident and hasattr(ident, 'name'):
-                name_list = ident.name()
-                if name_list and isinstance(name_list, list):
-                    if len(name_list) == 2:
-                        pkg_shortname = name_list[0].getText()
-                        pkg_name = name_list[1].getText()
-                    elif len(name_list) == 1:
-                        name_text = name_list[0].getText()
-                        # Explicit angle brackets <name> → shortname; bare name → declaredName
-                        if hasattr(ident, 'LT') and ident.LT() is not None:
-                            pkg_shortname = name_text
-                        else:
-                            pkg_name = name_text
+            if ident:
+                pkg_name, pkg_shortname = _extract_name_from_ident(ident)
     
     # Process body elements
     body_elements = []
@@ -2497,6 +2476,28 @@ def _visit_send_node(ctx):
                         "specialization": None
                     }
                 }
+    elif hasattr(ctx, 'actionUsageDeclaration') and ctx.actionUsageDeclaration():
+        aud = ctx.actionUsageDeclaration()
+        action_node_decl = {
+            "name": "ActionNodeUsageDeclaration",
+            "declaration": None
+        }
+        if hasattr(aud, 'usageDeclaration') and aud.usageDeclaration():
+            ud = aud.usageDeclaration()
+            if ud:
+                name, shortname = _get_usage_identification_from_ud(ud)
+                action_node_decl["declaration"] = {
+                    "name": "UsageDeclaration",
+                    "declaration": {
+                        "name": "FeatureDeclaration",
+                        "identification": {
+                            "name": "Identification",
+                            "declaredShortName": shortname,
+                            "declaredName": name
+                        },
+                        "specialization": None
+                    }
+                }
 
     node_param = None
     if hasattr(ctx, 'nodeParameterMember') and ctx.nodeParameterMember():
@@ -4055,18 +4056,7 @@ def _get_usage_identification_from_ud(ud):
     shortname = None
     if ud and hasattr(ud, 'identification') and ud.identification():
         ident = ud.identification()
-        if hasattr(ident, 'name'):
-            name_list = ident.name()
-            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()
-                    if hasattr(ident, 'LT') and ident.LT() is not None:
-                        shortname = name_text
-                    else:
-                        name = name_text
+        name, shortname = _extract_name_from_ident(ident)
     return name, shortname
 
 

{sysmlpy-0.27.2 → sysmlpy-0.27.4}/src/sysmlpy/definition.py

@@ -559,10 +559,10 @@ class Package(Searchable):
                 "prefix": None,
             }
 
-        # Add the typed by definition to the package output
+        # Packages cannot be typed; they should import from other packages.
+        # If typedby is set, print a warning and ignore it.
         if self.typedby is not None:
-            # Packages cannot be typed, they should import from other packages
-            raise NotImplementedError
+            print(f"[Package] Warning: Packages cannot be typed. Ignoring typedby '{self.typedby.name}'. Use imports instead.")  # pragma: no cover
 
         return package
 
@@ -1221,8 +1221,7 @@ class Package(Searchable):
                 r.parent = self
                 self.children.append(r)
             else:
-                print(f"Unknown class: {inner_class}")
-                raise NotImplementedError
+                print(f"[Package.load_from_grammar] Unknown class: {inner_class} - skipping")  # pragma: no cover
         
         return self