strictdoc 0.0.55__tar.gz → 0.0.55a2__tar.gz

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strictdoc
-Version: 0.0.55
+Version: 0.0.55a2
 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/

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/__init__.py

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

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/reqif/p01_sdoc/reqif_to_sdoc_converter.py

@@ -1,5 +1,5 @@
-# mypy: disable-error-code="no-untyped-def,union-attr,operator"
-from typing import Dict, List, Optional, Set, Union
+# mypy: disable-error-code="arg-type,no-untyped-call,no-untyped-def,union-attr,operator"
+from typing import Any, Dict, List, Optional, Set, Union
 
 from reqif.models.reqif_data_type import ReqIFDataTypeDefinitionEnumeration
 from reqif.models.reqif_spec_object import ReqIFSpecObject
@@ -22,47 +22,29 @@ from strictdoc.backend.sdoc.models.document_config import DocumentConfig
 from strictdoc.backend.sdoc.models.document_grammar import (
     DocumentGrammar,
     GrammarElement,
-    create_default_relations,
 )
 from strictdoc.backend.sdoc.models.free_text import FreeText
 from strictdoc.backend.sdoc.models.node import SDocNode, SDocNodeField
-from strictdoc.backend.sdoc.models.reference import (
-    ParentReqReference,
-    Reference,
-)
+from strictdoc.backend.sdoc.models.reference import ParentReqReference
 from strictdoc.backend.sdoc.models.section import SDocSection
 from strictdoc.backend.sdoc.models.type_system import (
     GrammarElementFieldMultipleChoice,
-    GrammarElementFieldReference,
     GrammarElementFieldSingleChoice,
     GrammarElementFieldString,
 )
 from strictdoc.helpers.string import unescape
 
 
-class P01_ReqIFToSDocBuildContext:
-    def __init__(self, *, enable_mid: bool, import_markup: Optional[str]):
-        self.enable_mid: bool = enable_mid
-        self.import_markup: Optional[str] = import_markup
-
-
-class P01_ReqIFToSDocConverter:
+class P01_ReqIFToSDocConverter:  # pylint: disable=invalid-name
     @staticmethod
-    def convert_reqif_bundle(
-        reqif_bundle: ReqIFBundle,
-        enable_mid: bool,
-        import_markup: str,
-    ) -> List[SDocDocument]:
-        context = P01_ReqIFToSDocBuildContext(
-            enable_mid=enable_mid, import_markup=import_markup
-        )
-
+    def convert_reqif_bundle(reqif_bundle: ReqIFBundle) -> List[SDocDocument]:
+        # TODO: Should we rather show an error that there are no specifications?
         if (
             reqif_bundle.core_content is None
             or reqif_bundle.core_content.req_if_content is None
             or len(reqif_bundle.core_content.req_if_content.specifications) == 0
         ):
-            return []
+            return [P01_ReqIFToSDocConverter.create_document(title=None)]
 
         documents: List[SDocDocument] = []
         for (
@@ -71,7 +53,6 @@ class P01_ReqIFToSDocConverter:
             document = P01_ReqIFToSDocConverter._create_document_from_reqif_specification(
                 specification=specification,
                 reqif_bundle=reqif_bundle,
-                context=context,
             )
             documents.append(document)
         return documents
@@ -107,15 +88,45 @@ class P01_ReqIFToSDocConverter:
             return REQIF_MAP_TO_SDOC_FIELD_MAP[field_name]
         return field_name
 
+    @staticmethod
+    def _iterate(
+        specification: ReqIFSpecification,
+        reqif_bundle: ReqIFBundle,
+        root_node: Any,
+        get_level_lambda,
+        node_lambda,
+    ):
+        section_stack: List[Union[SDocDocument, SDocSection]] = [root_node]
+
+        for current_hierarchy in reqif_bundle.iterate_specification_hierarchy(
+            specification
+        ):
+            current_section = section_stack[-1]
+            section_level = get_level_lambda(current_section)
+
+            if current_hierarchy.level <= section_level:
+                for _ in range(
+                    0,
+                    (section_level - current_hierarchy.level) + 1,
+                ):
+                    assert len(section_stack) > 0
+                    section_stack.pop()
+
+            current_section = section_stack[-1]
+            converted_node, converted_node_is_section = node_lambda(
+                current_hierarchy, current_section
+            )
+            if converted_node_is_section:
+                section_stack.append(converted_node)
+
     @staticmethod
     def _create_document_from_reqif_specification(
         *,
         specification: ReqIFSpecification,
         reqif_bundle: ReqIFBundle,
-        context: P01_ReqIFToSDocBuildContext,
     ):
         document = P01_ReqIFToSDocConverter.create_document(
-            specification=specification, context=context
+            title=specification.long_name
         )
         elements: List[GrammarElement] = []
         document.section_contents = []
@@ -139,16 +150,14 @@ class P01_ReqIFToSDocConverter:
             if is_section:
                 converted_node = (
                     P01_ReqIFToSDocConverter.create_section_from_spec_object(
-                        spec_object=spec_object,
-                        context=context,
-                        level=current_hierarchy_.level,
+                        spec_object,
+                        current_hierarchy_.level,
                         reqif_bundle=reqif_bundle,
                     )
                 )
             else:
                 converted_node = P01_ReqIFToSDocConverter.create_requirement_from_spec_object(
                     spec_object=spec_object,
-                    context=context,
                     parent_section=current_section_,
                     reqif_bundle=reqif_bundle,
                     level=current_hierarchy_.level,
@@ -157,8 +166,9 @@ class P01_ReqIFToSDocConverter:
 
             return converted_node, is_section
 
-        reqif_bundle.iterate_specification_hierarchy_for_conversion(
+        P01_ReqIFToSDocConverter._iterate(
             specification,
+            reqif_bundle,
             document,
             lambda s: s.ng_level,
             node_converter_lambda,
@@ -191,7 +201,6 @@ class P01_ReqIFToSDocConverter:
                     reqif_bundle=reqif_bundle,
                 )
                 elements.append(grammar_element)
-        grammar: DocumentGrammar
         if len(elements) > 0:
             grammar = DocumentGrammar(parent=document, elements=elements)
             grammar.is_default = False
@@ -207,14 +216,7 @@ class P01_ReqIFToSDocConverter:
         spec_object_type: ReqIFSpecObjectType,
         reqif_bundle: ReqIFBundle,
     ):
-        fields: List[
-            Union[
-                GrammarElementFieldString,
-                GrammarElementFieldMultipleChoice,
-                GrammarElementFieldSingleChoice,
-                GrammarElementFieldReference,
-            ]
-        ] = []
+        fields = []
         for attribute in spec_object_type.attribute_definitions:
             field_name = (
                 P01_ReqIFToSDocConverter.convert_requirement_field_from_reqif(
@@ -281,34 +283,15 @@ class P01_ReqIFToSDocConverter:
         requirement_element = GrammarElement(
             parent=None, tag="REQUIREMENT", fields=fields, relations=[]
         )
-        requirement_element.relations = create_default_relations(
-            requirement_element
-        )
         return requirement_element
 
     @staticmethod
-    def create_document(
-        *,
-        specification: ReqIFSpecification,
-        context: P01_ReqIFToSDocBuildContext,
-    ) -> SDocDocument:
+    def create_document(title: Optional[str]) -> SDocDocument:
         document_config = DocumentConfig.default_config(None)
-        document_config.enable_mid = (
-            context.enable_mid if context.enable_mid else None
-        )
-        document_title = (
-            specification.long_name
-            if specification.long_name is not None
-            else "<No title>"
-        )
+        document_title = title if title else "<No title>"
         document = SDocDocument(
             None, document_title, document_config, None, None, [], []
         )
-        if context.enable_mid:
-            document.reserved_mid = specification.identifier
-        if context.import_markup is not None:
-            document_config.markup = context.import_markup
-
         document.grammar = DocumentGrammar.create_default(document)
         # FIXME: One day this will go away.
         document.ng_at_least_one_relations_field = False
@@ -316,11 +299,7 @@ class P01_ReqIFToSDocConverter:
 
     @staticmethod
     def create_section_from_spec_object(
-        *,
-        spec_object: ReqIFSpecObject,
-        context: P01_ReqIFToSDocBuildContext,
-        level: int,
-        reqif_bundle: ReqIFBundle,
+        spec_object: ReqIFSpecObject, level, reqif_bundle: ReqIFBundle
     ) -> SDocSection:
         spec_object_type = reqif_bundle.lookup.get_spec_type_by_ref(
             spec_object.spec_object_type
@@ -360,12 +339,9 @@ class P01_ReqIFToSDocConverter:
         #                 Some value
         #               </THE-VALUE>
         section_title = section_title.strip().replace("\n", " ")
-
-        section_mid = spec_object.identifier if context.enable_mid else None
-
         section = SDocSection(
             parent=None,
-            mid=section_mid,
+            mid=None,
             uid=None,
             custom_level=None,
             title=section_title,
@@ -379,7 +355,6 @@ class P01_ReqIFToSDocConverter:
     @staticmethod
     def create_requirement_from_spec_object(
         spec_object: ReqIFSpecObject,
-        context: P01_ReqIFToSDocBuildContext,
         parent_section: Union[SDocSection, SDocDocument],
         reqif_bundle: ReqIFBundle,
         level,
@@ -471,23 +446,21 @@ class P01_ReqIFToSDocConverter:
                     field_value_references=None,
                 )
             )
-
-        requirement_mid = spec_object.identifier if context.enable_mid else None
         requirement = SDocNode(
             parent=parent_section,
             requirement_type="REQUIREMENT",
-            mid=requirement_mid,
+            mid=None,
             fields=fields,
         )
         requirement.ng_level = level
         # FIXME: One day this will go away.
-        requirement.ng_uses_old_refs_field = False
+        requirement.ng_uses_old_refs_field = True
 
         if foreign_key_id_or_none is not None:
             spec_object_parents = reqif_bundle.get_spec_object_parents(
                 spec_object.identifier
             )
-            parent_refs: List[Reference] = []
+            parent_refs = []
             for spec_object_parent in spec_object_parents:
                 parent_spec_object_parent = (
                     reqif_bundle.lookup.get_spec_object_by_ref(

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/reqif/p01_sdoc/sdoc_to_reqif_converter.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-untyped-call,no-untyped-def,type-arg,union-attr"
+# mypy: disable-error-code="arg-type,no-untyped-call,no-untyped-def,type-arg,union-attr"
 import datetime
 import uuid
 from enum import Enum
@@ -66,32 +66,26 @@ def generate_unique_identifier(element_type: str) -> str:
     return f"{element_type}-{uuid.uuid4()}"
 
 
-class P01_SDocToReqIFBuildContext:
-    def __init__(self, *, multiline_is_xhtml: bool, enable_mid: bool):
-        self.multiline_is_xhtml: bool = multiline_is_xhtml
-        self.enable_mid: bool = enable_mid
-        self.map_uid_to_spec_objects: Dict[str, ReqIFSpecObject] = {}
-        self.map_uid_to_parent_uids: Dict[str, List[str]] = {}
+class P01_SDocToReqIFBuildContext:  # pylint: disable=invalid-name
+    def __init__(self):
+        self.map_uid_to_spec_objects = {}
+        self.map_uid_to_parent_uids = {}
 
 
-class P01_SDocToReqIFObjectConverter:
+class P01_SDocToReqIFObjectConverter:  # pylint: disable=invalid-name
     @classmethod
     def convert_document_tree(
-        cls,
-        document_tree: DocumentTree,
-        multiline_is_xhtml: bool,
-        enable_mid: bool,
+        cls, document_tree: DocumentTree, multiline_is_xhtml: bool
     ):
         creation_time = datetime.datetime.now(
             datetime.datetime.now().astimezone().tzinfo
         ).isoformat()
 
+        # TODO
         namespace = "http://www.omg.org/spec/ReqIF/20110401/reqif.xsd"
+        configuration = "https://github.com/strictdoc-project/strictdoc"
 
-        context: P01_SDocToReqIFBuildContext = P01_SDocToReqIFBuildContext(
-            multiline_is_xhtml=multiline_is_xhtml, enable_mid=enable_mid
-        )
-
+        context: P01_SDocToReqIFBuildContext = P01_SDocToReqIFBuildContext()
         spec_types: List = []
         spec_objects: List[ReqIFSpecObject] = []
         spec_relations: List[ReqIFSpecRelation] = []
@@ -216,7 +210,7 @@ class P01_SDocToReqIFObjectConverter:
                         raise NotImplementedError(field) from None
 
             document_spec_types = cls._convert_document_grammar_to_spec_types(
-                grammar=assert_cast(document.grammar, DocumentGrammar),
+                grammar=document.grammar,
                 data_types_lookup=data_types_lookup,
                 document_spec_object_type=document_spec_object_type,
                 multiline_is_xhtml=multiline_is_xhtml,
@@ -291,9 +285,9 @@ class P01_SDocToReqIFObjectConverter:
                     spec_object = (
                         P01_SDocToReqIFObjectConverter
                         ._convert_section_to_spec_object(
-                            section=node,
-                            context=context,
-                            document_spec_object_type=document_spec_object_type,
+                            node,
+                            document_spec_object_type,
+                            multiline_is_xhtml=multiline_is_xhtml
                         )
                     )
                     # fmt: on
@@ -328,11 +322,12 @@ class P01_SDocToReqIFObjectConverter:
                 elif node.is_requirement:
                     spec_object = cls._convert_requirement_to_spec_object(
                         requirement=node,
-                        grammar=assert_cast(document.grammar, DocumentGrammar),
+                        grammar=document.grammar,
                         context=context,
                         document_spec_object_type=document_spec_object_type,
                         data_types=data_types,
                         data_types_lookup=data_types_lookup,
+                        multiline_is_xhtml=multiline_is_xhtml,
                     )
                     spec_objects.append(spec_object)
                     hierarchy = ReqIFSpecHierarchy(
@@ -354,18 +349,10 @@ class P01_SDocToReqIFObjectConverter:
                         current_hierarchy = parents[current_hierarchy]
                     parents[hierarchy] = current_hierarchy
                     current_hierarchy.add_child(hierarchy)
-
-            specification_identifier: str
-            if context.enable_mid and document.reserved_mid is not None:
-                specification_identifier = document.reserved_mid
-            else:
-                specification_identifier = generate_unique_identifier(
-                    "SPECIFICATION"
-                )
             specification = ReqIFSpecification(
                 xml_node=None,
                 description=None,
-                identifier=specification_identifier,
+                identifier=generate_unique_identifier("SPECIFICATION"),
                 last_change=None,
                 long_name=document.title,
                 values=None,
@@ -409,13 +396,14 @@ class P01_SDocToReqIFObjectConverter:
             doctype_is_present=True,
             encoding="UTF-8",
             namespace=namespace,
-            configuration=None,
+            configuration=configuration,
             namespace_id=None,
-            namespace_xhtml="http://www.w3.org/1999/xhtml",
+            namespace_xhtml=None,
             schema_namespace=None,
             schema_location=None,
             language=None,
         )
+
         req_reqif_header = ReqIFReqIFHeader(
             identifier=generate_unique_identifier("REQ-IF-HEADER"),
             creation_time=creation_time,
@@ -490,10 +478,9 @@ class P01_SDocToReqIFObjectConverter:
     @classmethod
     def _convert_section_to_spec_object(
         cls,
-        *,
         section: SDocSection,
-        context: P01_SDocToReqIFBuildContext,
         document_spec_object_type: str,
+        multiline_is_xhtml: bool,
     ) -> ReqIFSpecObject:
         assert isinstance(section, SDocSection)
         attributes = []
@@ -508,7 +495,7 @@ class P01_SDocToReqIFObjectConverter:
             free_text_value = (
                 SDWriter.print_free_text_content(section.free_texts[0])
             ).rstrip()
-            if context.multiline_is_xhtml:
+            if multiline_is_xhtml:
                 attribute_type = SpecObjectAttributeType.XHTML
             else:
                 attribute_type = SpecObjectAttributeType.STRING
@@ -521,22 +508,10 @@ class P01_SDocToReqIFObjectConverter:
                 value=free_text_value,
             )
             attributes.append(free_text_attribute)
-
-        """
-        If MIDs is enabled and this section has an MID, use it for
-        SPEC-OBJECT IDENTIFIER.
-        """
-        enable_mid = context.enable_mid and section.document.config.enable_mid
-        section_identifier: str
-        if enable_mid and section.reserved_mid is not None:
-            section_identifier = section.reserved_mid
-        else:
-            section_identifier = generate_unique_identifier("SECTION")
-
         spec_object = ReqIFSpecObject(
             xml_node=None,
             description=None,
-            identifier=section_identifier,
+            identifier=generate_unique_identifier("SECTION"),
             last_change=None,
             long_name=None,
             spec_object_type=document_spec_object_type,
@@ -553,28 +528,19 @@ class P01_SDocToReqIFObjectConverter:
         data_types: List,
         data_types_lookup: Dict[str, str],
         document_spec_object_type: str,
+        multiline_is_xhtml: bool,
     ) -> ReqIFSpecObject:
-        enable_mid = (
-            context.enable_mid and requirement.document.config.enable_mid
-        )
-
-        requirement_identifier: str
-        if enable_mid and requirement.reserved_mid is not None:
-            requirement_identifier = requirement.reserved_mid
-        else:
-            requirement_identifier = generate_unique_identifier("REQUIREMENT")
-
+        requirement_identifier = generate_unique_identifier("REQUIREMENT")
         grammar_element = grammar.elements_by_type[requirement.requirement_type]
 
         attributes: List[SpecObjectAttribute] = []
         for field in requirement.fields_as_parsed:
             if field.field_name == RequirementFieldName.REFS:
-                parent_references: List[str] = []
+                parent_references = []
                 for reference in field.field_value_references:
                     if reference.ref_type != ReferenceType.PARENT:
                         continue
                     parent_references.append(reference.ref_uid)
-                    assert requirement.reserved_uid is not None
                     context.map_uid_to_parent_uids[requirement.reserved_uid] = (
                         parent_references
                     )
@@ -633,7 +599,7 @@ class P01_SDocToReqIFObjectConverter:
                 )
 
                 attribute_type: str
-                if context.multiline_is_xhtml:
+                if multiline_is_xhtml:
                     attribute_type = (
                         SpecObjectAttributeType.XHTML
                         if is_multiline_field
@@ -661,10 +627,7 @@ class P01_SDocToReqIFObjectConverter:
             spec_object_type=document_spec_object_type,
             attributes=attributes,
         )
-        if requirement.reserved_uid is not None:
-            context.map_uid_to_spec_objects[requirement.reserved_uid] = (
-                spec_object
-            )
+        context.map_uid_to_spec_objects[requirement.reserved_uid] = spec_object
         return spec_object
 
     @classmethod

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/reqif/p11_polarion/reqif_to_sdoc_converter.py

@@ -41,8 +41,6 @@ class P11_ReqIFToSDocConverter:  # pylint: disable=invalid-name
     @staticmethod
     def convert_reqif_bundle(
         reqif_bundle: ReqIFBundle,
-        enable_mid: bool,  # noqa: ARG004
-        import_markup: bool,  # noqa: ARG004
     ) -> List[SDocDocument]:
         # TODO: Should we rather show an error that there are no specifications?
         if (

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/reqif/reqif_export.py

@@ -27,7 +27,6 @@ class ReqIFExport:
             reqif_bundle = P01_SDocToReqIFObjectConverter.convert_document_tree(
                 document_tree=traceability_index.document_tree,
                 multiline_is_xhtml=project_config.reqif_multiline_is_xhtml,
-                enable_mid=project_config.reqif_enable_mid,
             )
         else:
             raise NotImplementedError(

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/reqif/reqif_import.py

@@ -13,13 +13,12 @@ from strictdoc.backend.reqif.p11_polarion.reqif_to_sdoc_converter import (
 from strictdoc.backend.reqif.sdoc_reqif_fields import ReqIFProfile
 from strictdoc.backend.sdoc.models.document import SDocDocument
 from strictdoc.cli.cli_arg_parser import ImportReqIFCommandConfig
-from strictdoc.core.project_config import ProjectConfig
 
 
 class ReqIFImport:
     @staticmethod
     def import_from_file(
-        import_config: ImportReqIFCommandConfig, project_config: ProjectConfig
+        import_config: ImportReqIFCommandConfig,
     ) -> List[SDocDocument]:
         converter = ReqIFImport.select_reqif_profile(import_config)
 
@@ -29,24 +28,14 @@ class ReqIFImport:
             )
             assert len(reqifz_bundle.reqif_bundles) > 0
             documents: List[SDocDocument] = converter.convert_reqif_bundle(
-                next(iter(reqifz_bundle.reqif_bundles.values())),
-                enable_mid=import_config.reqif_enable_mid
-                or project_config.reqif_enable_mid,
-                import_markup=import_config.reqif_import_markup
-                if import_config.reqif_import_markup is not None
-                else project_config.reqif_import_markup,
+                next(iter(reqifz_bundle.reqif_bundles.values()))
             )
         else:
             reqif_bundle: ReqIFBundle = ReqIFParser.parse(
                 import_config.input_path
             )
             documents: List[SDocDocument] = converter.convert_reqif_bundle(
-                reqif_bundle,
-                enable_mid=import_config.reqif_enable_mid
-                or project_config.reqif_enable_mid,
-                import_markup=import_config.reqif_import_markup
-                if import_config.reqif_import_markup is not None
-                else project_config.reqif_import_markup,
+                reqif_bundle
             )
         return documents
 

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/sdoc/grammar_reader.py

@@ -7,9 +7,6 @@ from textx import metamodel_from_str
 from strictdoc.backend.sdoc.error_handling import StrictDocSemanticError
 from strictdoc.backend.sdoc.grammar.grammar_builder import SDocGrammarBuilder
 from strictdoc.backend.sdoc.models.constants import GRAMMAR_MODELS
-from strictdoc.backend.sdoc.models.document_grammar import DocumentGrammar
-from strictdoc.backend.sdoc.pickle_cache import PickleCache
-from strictdoc.helpers.cast import assert_cast
 from strictdoc.helpers.textx import drop_textx_meta
 
 
@@ -36,22 +33,12 @@ class SDocGrammarReader:
         return grammar
 
     def read_from_file(self, file_path):
-        unpickled_content = PickleCache.read_from_cache(
-            file_path, self.path_to_output_root
-        )
-        if unpickled_content:
-            return assert_cast(unpickled_content, DocumentGrammar)
-
         with open(file_path, encoding="utf8") as file:
             grammar_content = file.read()
 
         try:
-            grammar = self.read(grammar_content, file_path=file_path)
-            PickleCache.save_to_cache(
-                grammar, file_path, self.path_to_output_root
-            )
-
-            return grammar
+            ssec = self.read(grammar_content, file_path=file_path)
+            return ssec
         except NotImplementedError:
             traceback.print_exc()
             sys.exit(1)

{strictdoc-0.0.55 → strictdoc-0.0.55a2}/strictdoc/backend/sdoc/models/document_grammar.py

@@ -6,9 +6,7 @@ from typing import Dict, List, Optional, Set, Union
 from strictdoc.backend.sdoc.models.type_system import (
     RESERVED_NON_META_FIELDS,
     GrammarElementField,
-    GrammarElementFieldMultipleChoice,
     GrammarElementFieldReference,
-    GrammarElementFieldSingleChoice,
     GrammarElementFieldString,
     GrammarElementRelationChild,
     GrammarElementRelationFile,
@@ -49,26 +47,12 @@ class GrammarElement:
         self,
         parent,
         tag: str,
-        fields: List[
-            Union[
-                GrammarElementFieldString,
-                GrammarElementFieldMultipleChoice,
-                GrammarElementFieldSingleChoice,
-                GrammarElementFieldReference,
-            ]
-        ],
+        fields: List[GrammarElementField],
         relations: List,
     ):
         self.parent = parent
         self.tag: str = tag
-        self.fields: List[
-            Union[
-                GrammarElementFieldString,
-                GrammarElementFieldMultipleChoice,
-                GrammarElementFieldSingleChoice,
-                GrammarElementFieldReference,
-            ]
-        ] = fields
+        self.fields: List[GrammarElementField] = fields
         self.relations: List[
             Union[
                 GrammarElementRelationParent,
@@ -188,7 +172,7 @@ class DocumentGrammar:
         elements: List[GrammarElement],
         import_from_file: Optional[str] = None,
         parent=None,
-    ) -> None:
+    ):
         self.parent = parent
         self.elements: List[GrammarElement] = elements
 
@@ -206,16 +190,9 @@ class DocumentGrammar:
         self.is_default = False
 
     @staticmethod
-    def create_default(parent) -> "DocumentGrammar":
+    def create_default(parent):
         # @sdoc[SDOC-SRS-132]
-        fields: List[
-            Union[
-                GrammarElementFieldString,
-                GrammarElementFieldSingleChoice,
-                GrammarElementFieldMultipleChoice,
-                GrammarElementFieldReference,
-            ]
-        ] = [
+        fields = [
             GrammarElementFieldString(
                 parent=None,
                 title=RequirementFieldName.UID,