nsj-rest-lib2 0.0.29__py3-none-any.whl → 0.0.31__py3-none-any.whl

nsj_rest_lib2/compiler/compiler.py

@@ -1,5 +1,3 @@
-import re
-
 from typing import Any
 
 from nsj_rest_lib2.compiler.compiler_structures import (
@@ -18,7 +16,6 @@ from nsj_rest_lib2.compiler.function_model import (
 )
 from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
 from nsj_rest_lib2.compiler.edl_model.entity_model_root import EntityModelRoot
-from nsj_rest_lib2.compiler.edl_model.primitives import REGEX_EXTERNAL_REF
 from nsj_rest_lib2.compiler.entity_compiler import EntityCompiler
 from nsj_rest_lib2.compiler.model import CompilerResult, RelationDependency
 from nsj_rest_lib2.compiler.property_compiler import EDLPropertyCompiler
@@ -28,6 +25,7 @@ from nsj_rest_lib2.compiler.util.type_naming_util import (
     compile_entity_class_name,
     compile_namespace_keys,
 )
+from nsj_rest_lib2.compiler.util.relation_ref import RelationRefParser
 
 from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
 
@@ -496,6 +494,7 @@ class EDLCompiler:
         properties_structure: PropertiesCompilerStructure,
         entity_model: EntityModelBase,
         entity_models: dict[str, EntityModel],
+        relation_type: str = "self",
     ):
         if not entity_model:
             return
@@ -511,6 +510,7 @@ class EDLCompiler:
                     properties_structure,
                     mixin_model,
                     entity_models,
+                    relation_type="mixin",
                 )
 
         # Populando com as propriedades da superclasse (extends)
@@ -521,6 +521,7 @@ class EDLCompiler:
                 properties_structure,
                 super_model,
                 entity_models,
+                relation_type="extends",
             )
 
         # Populando com as propriedades do trait
@@ -531,10 +532,18 @@ class EDLCompiler:
                 properties_structure,
                 trait_model,
                 entity_models,
+                relation_type="trait",
             )
 
         # Populando com as propriedades da entidade atual
         properties_structure.properties.update(entity_model.properties)
+        for prop_name in entity_model.properties or {}:
+            # Preferimos não sobrescrever quando já marcado como 'self'
+            if (
+                prop_name not in properties_structure.property_origins
+                or relation_type == "self"
+            ):
+                properties_structure.property_origins[prop_name] = relation_type
         if entity_model.main_properties:
             for main_property in entity_model.main_properties:
                 if not isinstance(main_property, str):
@@ -706,10 +715,10 @@ class EDLCompiler:
             prop = entity_model.properties[pkey]
 
             if isinstance(prop.type, str):
-                external_match = re.match(REGEX_EXTERNAL_REF, prop.type)
-                if external_match:
-                    external_dependency = external_match.group(0)
-                    entities.append(external_dependency)
+                relation_ref = RelationRefParser.parse(prop.type)
+                if relation_ref and relation_ref.is_external:
+                    if relation_ref.entity_key:
+                        entities.append(relation_ref.entity_key)
 
         return entities
 

nsj_rest_lib2/compiler/compiler_structures.py

@@ -27,6 +27,7 @@ class PropertiesCompilerStructure:
         self.trait_properties: dict[str, TraitPropertyMetaModel] = {}
         self.extends_properties: dict[str, ExtendsPropertyMetaModel] = {}
         self.composed_properties: dict[str, list[str]] = {}
+        self.property_origins: dict[str, str] = {}
 
 
 class ComponentsCompilerStructure:

nsj_rest_lib2/compiler/dto_compiler.py

@@ -41,6 +41,11 @@ class DTOCompiler:
         imports = [
             # import datetime
             ast.Import(names=[ast.alias(name="datetime", asname=None)]),
+            # import dateutil
+            ast.ImportFrom(module="dateutil.relativedelta", 
+                           names=[ast.alias(name="relativedelta")], 
+                           level=0),
+            
             # import enum
             ast.Import(names=[ast.alias(name="enum", asname=None)]),
             # import uuid
@@ -81,10 +86,10 @@ class DTOCompiler:
                 names=[ast.alias(name="EntityRelationOwner", asname=None)],
                 level=0,
             ),
-            # from nsj_rest_lib.descriptor.dto_object_field import DTOObjectField
+            # from nsj_rest_lib.descriptor.dto_object_field import DTOOneToOneField
             ast.ImportFrom(
-                module="nsj_rest_lib.descriptor.dto_object_field",
-                names=[ast.alias(name="DTOObjectField", asname=None)],
+                module="nsj_rest_lib.descriptor.dto_one_to_one_field",
+                names=[ast.alias(name="DTOOneToOneField", asname=None), ast.alias(name="OTORelationType", asname=None) ],
                 level=0,
             ),
             # from nsj_rest_lib.descriptor import DTOAggregator
@@ -94,6 +99,7 @@ class DTOCompiler:
                 level=0,
             ),
         ]
+        
 
         for import_ in related_imports:
             imports.append(

nsj_rest_lib2/compiler/edl_model/primitives.py

@@ -4,15 +4,20 @@ from typing import Annotated, List, Union
 from pydantic import StringConstraints
 
 REGEX_EXTERNAL_REF = r"^(\w+)\/(\w+)$"
-REGEX_INTERNAL_REF = r"^#\/components\/(\w+)$"
+REGEX_EXTERNAL_COMPONENT_REF = r"^(\w+)\/(\w+)\/([\w\/#]+)$"
+REGEX_INTERNAL_REF = r"^#\/components\/([\w\/#]+)$"
 
 ExternalRefType = Annotated[str, StringConstraints(pattern=REGEX_EXTERNAL_REF)]
+ExternalComponentRefType = Annotated[
+    str, StringConstraints(pattern=REGEX_EXTERNAL_COMPONENT_REF)
+]
 InternalRefType = Annotated[str, StringConstraints(pattern=REGEX_INTERNAL_REF)]
 
 
 class PrimitiveTypes(enum.Enum):
     # TODO Validar esses tipos
     STRING = "string"
+    TEXT = "text"
     NUMBER = "number"
     INTEGER = "integer"
     BOOLEAN = "boolean"
@@ -25,12 +30,16 @@ class PrimitiveTypes(enum.Enum):
     EMAIL = "email"
     DATE = "date"
     DATETIME = "datetime"
+    DURATION = "duration"
 
 
-PropertyType = Union[PrimitiveTypes, ExternalRefType, InternalRefType]
+PropertyType = Union[
+    PrimitiveTypes, ExternalRefType, ExternalComponentRefType, InternalRefType
+]
 
 MAPPING_PRIMITIVE_TYPES_TO_PYTHON = {
     PrimitiveTypes.STRING: "str",
+    PrimitiveTypes.TEXT: "str",
     PrimitiveTypes.NUMBER: "float",
     PrimitiveTypes.INTEGER: "int",
     PrimitiveTypes.BOOLEAN: "bool",
@@ -43,6 +52,7 @@ MAPPING_PRIMITIVE_TYPES_TO_PYTHON = {
     PrimitiveTypes.EMAIL: "str",
     PrimitiveTypes.DATE: "datetime.date",
     PrimitiveTypes.DATETIME: "datetime.datetime",
+    PrimitiveTypes.DURATION: "relativedelta",
 }
 
 BasicTypes = int | bool | float | str
@@ -50,6 +60,7 @@ DefaultTypes = BasicTypes | List[BasicTypes]
 
 STR_BASED_TYPES = {
     PrimitiveTypes.STRING,
+    PrimitiveTypes.TEXT,
     PrimitiveTypes.EMAIL,
     PrimitiveTypes.CPF,
     PrimitiveTypes.CNPJ,

nsj_rest_lib2/compiler/entity_compiler.py

@@ -24,6 +24,10 @@ class EntityCompiler:
         imports = [
             # import datetime
             ast.Import(names=[ast.alias(name="datetime", asname=None)]),
+            # import dateutil
+            ast.ImportFrom(module="dateutil.relativedelta", 
+                           names=[ast.alias(name="relativedelta")], 
+                           level=0),
             # import uuid
             ast.Import(names=[ast.alias(name="uuid", asname=None)]),
             # from nsj_rest_lib.entity.entity_base import EntityBase