strictdoc 0.0.60__tar.gz → 0.1.0__tar.gz

{strictdoc-0.0.60 → strictdoc-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strictdoc
-Version: 0.0.60
+Version: 0.1.0
 Summary: StrictDoc is open-source software for technical documentation and requirements management.
 Project-URL: Changelog, https://github.com/strictdoc-project/strictdoc/blob/main/CHANGELOG.md
 Project-URL: Homepage, https://strictdoc.readthedocs.io/en/stable/
@@ -33,6 +33,9 @@ Requires-Dist: selenium
 Requires-Dist: spdx-tools
 Requires-Dist: textx==3.*,>=3.0.0
 Requires-Dist: toml
+Requires-Dist: tree-sitter
+Requires-Dist: tree-sitter-c
+Requires-Dist: tree-sitter-python
 Requires-Dist: uvicorn[standard]>=0.14.0
 Requires-Dist: webdriver-manager
 Requires-Dist: websockets

{strictdoc-0.0.60 → strictdoc-0.1.0}/pyproject.toml

@@ -56,6 +56,11 @@ dependencies = [
     # Parsing and rendering RST.
     "docutils >= 0.16, == 0.*",
 
+    # Tree Sitter is used for language/AST-aware parsing of Python, C and other files.
+    "tree-sitter",
+    "tree-sitter-c",
+    "tree-sitter-python",
+
     # Requirements-to-source traceability. Colored syntax for source files.
     "pygments >= 2.10.0, == 2.*",
 

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/__init__.py

@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.0.60"
+__version__ = "0.1.0"
 
 
 environment = SDocRuntimeEnvironment(__file__)

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc/error_handling.py

@@ -1,4 +1,6 @@
 # mypy: disable-error-code="attr-defined,no-untyped-call,no-untyped-def,union-attr"
+from typing import Optional
+
 from textx import TextXSyntaxError
 
 from strictdoc.backend.sdoc.models.document import SDocDocument
@@ -25,7 +27,13 @@ def get_textx_syntax_error_message(exception: TextXSyntaxError):
 
 class StrictDocSemanticError(Exception):
     def __init__(
-        self, title, hint, example, line=None, col=None, filename=None
+        self,
+        title: str,
+        hint: Optional[str],
+        example: Optional[str],
+        line: Optional[int] = None,
+        col: Optional[int] = None,
+        filename: Optional[str] = None,
     ):
         super().__init__(title, hint, line, col, filename)
         self.title = title

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc/grammar/type_system.py

@@ -47,6 +47,8 @@ FileEntry[noskipws]:
   ('  FORMAT: ' g_file_format = FileEntryFormat '\n')?
    '  VALUE: ' g_file_path = /.*$/ '\n'
   ('  LINE_RANGE: ' g_line_range = /.*$/ '\n')?
+  ('  FUNCTION: ' function = /.*$/ '\n')?
+  ('  CLASS: ' clazz = /.*$/ '\n')?
 ;
 
 FileEntryFormat[noskipws]:

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/type_system.py

@@ -56,6 +56,8 @@ class FileEntry:
         g_file_format: Optional[str],
         g_file_path: str,
         g_line_range: Optional[str],
+        function: Optional[str],
+        clazz: Optional[str],
     ):
         self.parent = parent
 
@@ -85,6 +87,14 @@ class FileEntry:
                 int(range_components_str[1]),
             )
 
+        # textX parses an optional element as an empty string. We make it to None ourselves.
+        self.function: Optional[str] = (
+            function if function is not None and len(function) > 0 else None
+        )
+        self.clazz: Optional[str] = (
+            clazz if clazz is not None and len(clazz) > 0 else None
+        )
+
 
 class FileEntryFormat:
     SOURCECODE = "Sourcecode"

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc_source_code/grammar.py

@@ -18,21 +18,36 @@ RangeMarker[noskipws]:
   // It is a hard-won result: it is important that the "@sdoc" is within the
   // regex. Putting it next to the regex as "@sdoc" does not work.
   // TODO: It would be great to check this with the TextX developers.
+  (
   /^.*?@sdoc/
   (begin_or_end = "[/" | begin_or_end = "[")
   (reqs_objs += Req[', ']) ']' '\n'?
+  )
+  |
+  (
+  /^.*?@relation/
+  '('
+  (reqs_objs += Req[', ']) ', scope=' scope=/(range_start|range_end)/ ')' '\n'?
+  )
 ;
 
 LineMarker[noskipws]:
   // It is a hard-won result: it is important that the "@sdoc" is within the
   // regex. Putting it next to the regex as "@sdoc" does not work.
   // TODO: It would be great to check this with the TextX developers.
+  (
   /^.*?@sdoc/
   "(" (reqs_objs += Req[', ']) ')' '\n'?
+  )
+  |
+  (
+  /^.*?@relation/
+  "(" (reqs_objs += Req[', ']) ', scope=line)' '\n'?
+  )
 ;
 
 Req[noskipws]:
-  uid = /[A-Za-z][A-Za-z0-9\\-]+/
+  uid = /(?!scope=)[A-Za-z][A-Za-z0-9\\-]+/
 ;
 
 SingleLineString[noskipws]:

strictdoc-0.1.0/strictdoc/backend/sdoc_source_code/marker_parser.py

@@ -0,0 +1,87 @@
+import re
+from typing import List, Union
+
+from strictdoc.backend.sdoc_source_code.models.function_range_marker import (
+    FunctionRangeMarker,
+)
+from strictdoc.backend.sdoc_source_code.models.range_marker import (
+    LineMarker,
+    RangeMarker,
+)
+from strictdoc.backend.sdoc_source_code.models.requirement_marker import Req
+
+REGEX_REQ = r"[A-Za-z][A-Za-z0-9\\-]+"
+# @relation(REQ-1, scope=function)
+REGEX_MARKER = rf"@relation\(({REGEX_REQ}(?:, {REGEX_REQ})*)\, scope=(file|class|function|line|range_start|range_end)\)"
+
+
+class MarkerParser:
+    @staticmethod
+    def parse(
+        input_string: str,
+        line_start: int,
+        line_end: int,
+        comment_line_start: int,
+        comment_column_start: int,
+    ) -> List[Union[FunctionRangeMarker, RangeMarker, LineMarker]]:
+        markers: List[Union[FunctionRangeMarker, RangeMarker, LineMarker]] = []
+        for input_line_idx_, input_line_ in enumerate(
+            input_string.splitlines()
+        ):
+            match = re.search(REGEX_MARKER, input_line_)
+            if match is None:
+                continue
+
+            assert match.lastindex is not None
+            marker_type = match.group(match.lastindex)
+            req_list = match.group(1)
+
+            first_requirement_index = match.start(1)
+
+            current_line = comment_line_start + input_line_idx_
+            first_requirement_column = first_requirement_index + 1
+            if input_line_idx_ == 0:
+                first_requirement_column += comment_column_start - 1
+            requirements = []
+            for req_match in re.finditer(REGEX_REQ, req_list):
+                req_item = req_match.group(0)  # Matched REQ-XXX item
+                # Calculate actual position relative to the original string
+                start_index = (
+                    req_match.start()
+                )  # Offset by where group 1 starts
+                requirement = Req(None, req_item)
+                requirement.ng_source_line = current_line
+                requirement.ng_source_column = (
+                    first_requirement_column + start_index
+                )
+                requirements.append(requirement)
+
+            if marker_type in ("file", "class", "function"):
+                function_marker = FunctionRangeMarker(None, requirements)
+                function_marker.ng_source_line_begin = line_start
+                function_marker.ng_range_line_begin = line_start
+                function_marker.ng_range_line_end = line_end
+                function_marker.ng_marker_line = current_line
+                function_marker.ng_marker_column = first_requirement_column
+                markers.append(function_marker)
+            elif marker_type in ("range_start", "range_end"):
+                start_or_end = marker_type == "range_start"
+                range_marker = RangeMarker(
+                    None, "[" if start_or_end else "[/", requirements
+                )
+                range_marker.ng_source_line_begin = line_start
+                range_marker.ng_source_column_begin = first_requirement_column
+                range_marker.ng_range_line_begin = line_start
+                range_marker.ng_range_line_end = line_end
+                range_marker.ng_is_language_parsed = True
+                markers.append(range_marker)
+            elif marker_type == "line":
+                line_marker = LineMarker(None, requirements)
+                line_marker.ng_source_line_begin = line_start
+                line_marker.ng_range_line_begin = line_start
+                line_marker.ng_range_line_end = line_end
+                markers.append(line_marker)
+            else:
+                continue
+
+        return markers

strictdoc-0.1.0/strictdoc/backend/sdoc_source_code/models/function.py

@@ -0,0 +1,20 @@
+from typing import Any, List
+
+from strictdoc.helpers.auto_described import auto_described
+
+
+@auto_described
+class Function:
+    def __init__(
+        self,
+        parent: Any,
+        name: str,
+        line_begin: int,
+        line_end: int,
+        parts: List[Any],
+    ):
+        self.parent = parent
+        self.name = name
+        self.parts: List[Any] = parts
+        self.line_begin = line_begin
+        self.line_end = line_end

strictdoc-0.1.0/strictdoc/backend/sdoc_source_code/models/function_range_marker.py

@@ -0,0 +1,52 @@
+# mypy: disable-error-code="no-untyped-def,type-arg"
+from typing import List, Optional
+
+from strictdoc.backend.sdoc_source_code.models.requirement_marker import Req
+from strictdoc.helpers.auto_described import auto_described
+
+
+@auto_described
+class FunctionRangeMarker:
+    def __init__(self, parent, reqs_objs: List[Req]):
+        assert isinstance(reqs_objs, list)
+        self.parent = parent
+        self.reqs_objs: List[Req] = reqs_objs
+        self.reqs: List[str] = list(map(lambda req: req.uid, reqs_objs))
+
+        # Line number of the marker in the source code.
+        self.ng_source_line_begin: Optional[int] = None
+        self.ng_source_column_begin: Optional[int] = None
+
+        # Line number of the marker range in the source code:
+        # TODO: Improve description.
+        # For Begin ranges:
+        #   ng_range_line_begin == ng_source_line_begin  # noqa: ERA001
+        #   ng_range_line_end == ng_source_line_begin of the End marker  # noqa: ERA001, E501
+        # For End ranges:
+        #   ng_range_line_begin == ng_range_line_begin of the Begin marker  # noqa: ERA001, E501
+        #   ng_range_line_end == ng_source_line_begin  # noqa: ERA001
+        self.ng_range_line_begin: Optional[int] = None
+        self.ng_range_line_end: Optional[int] = None
+
+        self.ng_marker_line: Optional[int] = None
+        self.ng_marker_column: Optional[int] = None
+
+        self.ng_is_nodoc = "nosdoc" in self.reqs
+
+    def is_range_marker(self) -> bool:
+        return True
+
+    def is_line_marker(self) -> bool:
+        return False
+
+    def is_begin(self) -> bool:
+        return True
+
+    def is_end(self) -> bool:
+        return False
+
+
+@auto_described
+class ForwardFunctionRangeMarker(FunctionRangeMarker):
+    def __init__(self, parent, reqs_objs: List[Req]):
+        super().__init__(parent, reqs_objs)

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc_source_code/models/range_marker.py

@@ -1,5 +1,5 @@
 # mypy: disable-error-code="no-untyped-def,type-arg"
-from typing import List
+from typing import Any, List, Optional
 
 from strictdoc.backend.sdoc_source_code.models.requirement_marker import Req
 from strictdoc.helpers.auto_described import auto_described
@@ -7,15 +7,30 @@ from strictdoc.helpers.auto_described import auto_described
 
 @auto_described
 class RangeMarker:
-    def __init__(self, parent, begin_or_end, reqs_objs: List[Req]):
+    def __init__(
+        self,
+        parent: Any,
+        begin_or_end: str,
+        reqs_objs: List[Req],
+        scope: str = "",
+    ):
         assert isinstance(reqs_objs, list)
-        self.parent = parent
-        self.begin_or_end = begin_or_end
+        self.parent: Any = parent
+        assert len(begin_or_end) > 0 or scope is not None
+
+        self.begin_or_end: str
+        if len(begin_or_end) > 0:
+            self.begin_or_end = begin_or_end
+        else:
+            assert scope in ("range_start", "range_end")
+            self.begin_or_end = "[" if scope == "range_start" else "[/"
+
         self.reqs_objs: List[Req] = reqs_objs
         self.reqs: List[str] = list(map(lambda req: req.uid, reqs_objs))
 
         # Line number of the marker in the source code.
-        self.ng_source_line_begin = None
+        self.ng_source_line_begin: Optional[int] = None
+        self.ng_source_column_begin: Optional[int] = None
 
         # Line number of the marker range in the source code:
         # TODO: Improve description.
@@ -25,50 +40,52 @@ class RangeMarker:
         # For End ranges:
         #   ng_range_line_begin == ng_range_line_begin of the Begin marker  # noqa: ERA001, E501
         #   ng_range_line_end == ng_source_line_begin  # noqa: ERA001
-        self.ng_range_line_begin = None
-        self.ng_range_line_end = None
+        self.ng_range_line_begin: Optional[int] = None
+        self.ng_range_line_end: Optional[int] = None
 
         self.ng_is_nodoc = "nosdoc" in self.reqs
+        self.ng_is_language_parsed = False
 
-    def is_begin(self):
+    def is_begin(self) -> bool:
         return self.begin_or_end == "["
 
-    def is_end(self):
+    def is_end(self) -> bool:
         return self.begin_or_end == "[/"
 
-    def is_range_marker(self):
+    def is_range_marker(self) -> bool:
         return True
 
-    def is_line_marker(self):
+    def is_line_marker(self) -> bool:
         return False
 
 
 @auto_described
 class LineMarker:
-    def __init__(self, parent, reqs_objs):
+    def __init__(self, parent: Any, reqs_objs: List[Req]) -> None:
         assert isinstance(reqs_objs, list)
         self.parent = parent
         self.reqs_objs = reqs_objs
         self.reqs = list(map(lambda req: req.uid, reqs_objs))
 
         # Line number of the marker in the source code.
-        self.ng_source_line_begin = None
+        self.ng_source_line_begin: Optional[int] = None
+        self.ng_source_column_begin: Optional[int] = None
 
-        self.ng_range_line_begin = None
-        self.ng_range_line_end = None
+        self.ng_range_line_begin: Optional[int] = None
+        self.ng_range_line_end: Optional[int] = None
 
         self.ng_is_nodoc = "nosdoc" in self.reqs
 
-    def is_begin(self):
+    def is_begin(self) -> bool:
         return True
 
-    def is_end(self):
+    def is_end(self) -> bool:
         return False
 
-    def is_range_marker(self):
+    def is_range_marker(self) -> bool:
         return False
 
-    def is_line_marker(self):
+    def is_line_marker(self) -> bool:
         return True
 
 
@@ -81,19 +98,21 @@ class ForwardRangeMarker:
         self.reqs_objs = reqs_objs
 
         # Line number of the marker in the source code.
-        self.ng_source_line_begin = None
+        self.ng_source_line_begin: Optional[int] = None
+
+        self.ng_range_line_begin: Optional[int] = None
+        self.ng_range_line_end: Optional[int] = None
 
-        self.ng_range_line_begin = None
-        self.ng_range_line_end = None
+        self.ng_is_nodoc = False
 
-    def is_begin(self):
+    def is_begin(self) -> bool:
         return self.start_or_end
 
-    def is_end(self):
+    def is_end(self) -> bool:
         return not self.start_or_end
 
-    def is_range_marker(self):
+    def is_range_marker(self) -> bool:
         return True
 
-    def is_line_marker(self):
+    def is_line_marker(self) -> bool:
         return False

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc_source_code/models/requirement_marker.py

@@ -1,15 +1,16 @@
-# mypy: disable-error-code="no-untyped-def"
+from typing import Any, Optional
+
 from strictdoc.helpers.auto_described import auto_described
 
 
 @auto_described
 class Req:
-    def __init__(self, parent, uid: str):
+    def __init__(self, parent: Any, uid: str):
         assert isinstance(uid, str)
         assert len(uid) > 0
 
         self.parent = parent
         self.uid: str = uid
 
-        self.ng_source_line = None
-        self.ng_source_column = None
+        self.ng_source_line: Optional[int] = None
+        self.ng_source_column: Optional[int] = None

{strictdoc-0.0.60 → strictdoc-0.1.0}/strictdoc/backend/sdoc_source_code/models/source_file_info.py

@@ -1,6 +1,10 @@
 # mypy: disable-error-code="no-untyped-def,type-arg,var-annotated"
 from typing import List, Union
 
+from strictdoc.backend.sdoc_source_code.models.function import Function
+from strictdoc.backend.sdoc_source_code.models.function_range_marker import (
+    FunctionRangeMarker,
+)
 from strictdoc.backend.sdoc_source_code.models.range_marker import (
     ForwardRangeMarker,
     LineMarker,
@@ -20,34 +24,33 @@ class SourceFileTraceabilityInfo:
         """
 
         self.parts: List = parts
+        self.functions: List[Function] = []
 
         """
         {
-          2: RangeMarker(...),
-          4: RangeMarker(...),
-        }
-        """
-        self.ng_map_lines_to_markers = {}
-
-        """
-        {
-         "REQ-001": RangeMarker(...),
-         "REQ-002": RangeMarker(...),
+         "REQ-001": [RangeMarker(...), ...],
+         "REQ-002": [RangeMarker(...), ...],
         }
         """
         self.ng_map_reqs_to_markers = {}
 
         self.ng_lines_total = 0
         self.ng_lines_covered = 0
-        self._coverage = 0
+        self._coverage: float = 0
         self.markers: List[
-            Union[LineMarker, RangeMarker, ForwardRangeMarker]
+            Union[
+                FunctionRangeMarker, LineMarker, RangeMarker, ForwardRangeMarker
+            ]
         ] = []
 
     def get_coverage(self):
         return self._coverage
 
-    def set_coverage_stats(self, lines_total, lines_covered):
+    def set_coverage_stats(self, lines_total: int, lines_covered: int) -> None:
         self.ng_lines_total = lines_total
         self.ng_lines_covered = lines_covered
-        self._coverage = round(lines_covered / lines_total * 100, 1)
+        self._coverage = (
+            round(lines_covered / lines_total * 100, 1)
+            if lines_total != 0
+            else 0
+        )

strictdoc-0.1.0/strictdoc/backend/sdoc_source_code/parse_context.py

@@ -0,0 +1,12 @@
+from typing import Any, Dict, List
+
+from strictdoc.backend.sdoc_source_code.models.range_marker import RangeMarker
+
+
+class ParseContext:
+    def __init__(self, filename: str, lines_total: int) -> None:
+        self.filename: str = filename
+        self.lines_total: int = lines_total
+        self.markers: List[Any] = []
+        self.marker_stack: List[RangeMarker] = []
+        self.map_reqs_to_markers: Dict[str, Any] = {}