pyVHDLModelTreesitter 0.5.0__tar.gz → 0.5.1__tar.gz

{pyvhdlmodeltreesitter-0.5.0 → pyvhdlmodeltreesitter-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyVHDLModelTreesitter
-Version: 0.5.0
+Version: 0.5.1
 Summary: An implementation of pyVHDLModel using treesitter
 Project-URL: Repository, https://gitlab.com/dawalters/pyVHDLModelTreesitter
 Author: Dominic Adam Walters

{pyvhdlmodeltreesitter-0.5.0 → pyvhdlmodeltreesitter-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyVHDLModelTreesitter"
-version = "0.5.0"
+version = "0.5.1"
 description = "An implementation of pyVHDLModel using treesitter"
 readme = "README.md"
 requires-python = ">=3.11"

{pyvhdlmodeltreesitter-0.5.0 → pyvhdlmodeltreesitter-0.5.1}/src/pyVHDLModelTreesitter/DesignUnit.py

@@ -120,7 +120,7 @@ class UseClause(TreesitterNodeMixin, VHDLModel_UseClause):  # noqa: D101
                 symbols.append(
                     PackageReferenceSymbol(selected_or_simple_name(selected_name)),
                 )
-            ret.append(cls(symbols, _treesitter_node=selected_name_node))
+            ret.append(cls(symbols, _treesitter_node=use_clause_node))
         return ret
 
     def __eq__(self, other: object) -> bool:  # noqa: D105

{pyvhdlmodeltreesitter-0.5.0 → pyvhdlmodeltreesitter-0.5.1}/src/pyVHDLModelTreesitter/_Document.py

@@ -21,7 +21,23 @@ from pyVHDLModelTreesitter.treesitter.query import PARSER, DesignUnits
 
 class Document(VHDLModel_Document):
     @classmethod
-    def from_file(cls, path: str | Path) -> Self:  # noqa: C901, PLR0912  # TODO: refactor
+    def from_file(cls, path: str | Path) -> Self:
+        """
+        Create a Document, and all ModelEntities it contains.
+
+        Nodes that are not recognised issue a `NotImplementedWarning`.
+        """
+        if isinstance(path, str):
+            path = Path(path)
+        path = path.resolve()
+        return cls.from_text(path.read_bytes(), path)
+
+    @classmethod
+    def from_text(  # noqa: C901, PLR0912  # TODO: refactor
+        cls,
+        text: str | bytes,
+        path: str | Path,
+    ) -> Self:
         """
         Create a Document, and all ModelEntities it contains.
 
@@ -34,13 +50,16 @@ class Document(VHDLModel_Document):
             - Any `design_unit` node has no children.
 
         """
+        if isinstance(text, str):
+            text = text.encode()
         if isinstance(path, str):
             path = Path(path)
         path = path.resolve()
         document = cls(path)
 
-        tree = PARSER.parse(path.read_bytes())
+        tree = PARSER.parse(text)
         node = tree.root_node
+
         captures = DesignUnits.capture(node)
         design_unit_captures = captures.get("design_unit")
         if design_unit_captures is None:
@@ -52,9 +71,6 @@ class Document(VHDLModel_Document):
             context_children = design_unit_capture.children[:-1]
             context_items: list[LibraryClause | UseClause] = []
             for context_child in context_children:
-                if context_child is None:
-                    # TODO: error type is wrong: should be "discovered child is empty"
-                    raise NodeMissingChildError(node, "design_unit")
                 if context_child.type == "library_clause":
                     context_items.extend(
                         LibraryClause.from_treesitter_node(context_child),
@@ -65,8 +81,6 @@ class Document(VHDLModel_Document):
                     )
                 else:
                     NotImplementedWarning.warn_child_type(context_child)
-            if design_unit_child is None:
-                raise NodeMissingChildError(node, "design_unit")
             if design_unit_child.type == "architecture_definition":
                 architecture = Architecture.from_treesitter_node(
                     node,