nsj-rest-lib2 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

nsj_rest_lib2/compiler/property_compiler.py

@@ -88,6 +88,10 @@ class EDLPropertyCompiler:
         if properties_structure.properties is None:
             return (ast_dto_attributes, ast_entity_attributes, props_pk, aux_classes)
 
+        trait_fixed_filters = self._merge_trait_extends_properties(
+            properties_structure
+        )
+
         composed_properties = properties_structure.composed_properties or {}
 
         aggregator_class_names: dict[str, str] = {}
@@ -151,6 +155,9 @@ class EDLPropertyCompiler:
                     prefx_class_name,
                 )
 
+                if pkey in trait_fixed_filters:
+                    fixed_filters.append((pkey, trait_fixed_filters[pkey]))
+
             elif isinstance(prop.type, str):
                 # Tratando propriedade de relacionamento
                 external_match = re.match(REGEX_EXTERNAL_REF, prop.type)
@@ -193,40 +200,6 @@ class EDLPropertyCompiler:
                         f"Tipo da propriedade '{pkey}' não suportado: {prop.type}"
                     )
 
-        for pkey in properties_structure.trait_properties:
-            prop = properties_structure.trait_properties[pkey]
-
-            self._compile_trait_extends_property(
-                properties_structure,
-                map_unique_by_property,
-                pkey,
-                prop,
-                ast_dto_attributes,
-                ast_entity_attributes,
-                fixed_filters,
-                escopo,
-                entity_model,
-                aux_classes,
-                prefx_class_name,
-            )
-
-        for pkey in properties_structure.extends_properties:
-            prop = properties_structure.extends_properties[pkey]
-
-            self._compile_trait_extends_property(
-                properties_structure,
-                map_unique_by_property,
-                pkey,
-                prop,
-                ast_dto_attributes,
-                ast_entity_attributes,
-                fixed_filters,
-                escopo,
-                entity_model,
-                aux_classes,
-                prefx_class_name,
-            )
-
         for composed_key, class_name in aggregator_class_names.items():
             dto_attributes = aggregator_dto_attributes.get(composed_key, [])
 
@@ -254,199 +227,6 @@ class EDLPropertyCompiler:
             fixed_filters,
         )
 
-    def _compile_trait_extends_property(
-        self,
-        properties_structure: PropertiesCompilerStructure,
-        map_unique_by_property: dict[str, IndexCompilerStructure],
-        pkey: str,
-        prop: TraitPropertyMetaModel,
-        ast_dto_attributes: list[ast.stmt],
-        ast_entity_attributes: list[ast.stmt],
-        fixed_filters: list[tuple[str, BasicTypes]],
-        escopo: str,
-        entity_model: EntityModelBase,
-        aux_classes: list[ast.stmt],
-        prefx_class_name: str,
-    ):
-        enum_class_name = None
-        keywords = []
-
-        if (
-            properties_structure.main_properties
-            and pkey in properties_structure.main_properties
-        ):
-            keywords.append(ast.keyword(arg="resume", value=ast.Constant(True)))
-
-        if properties_structure.required and pkey in properties_structure.required:
-            keywords.append(ast.keyword(arg="not_null", value=ast.Constant(True)))
-
-        if (
-            properties_structure.partition_data
-            and pkey in properties_structure.partition_data
-        ):
-            keywords.append(ast.keyword(arg="partition_data", value=ast.Constant(True)))
-
-        if pkey in map_unique_by_property:
-            unique = map_unique_by_property[pkey].index_model
-            keywords.append(
-                ast.keyword(
-                    arg="unique",
-                    value=ast.Constant(unique.name),
-                )
-            )
-
-        if (
-            properties_structure.search_properties
-            and pkey in properties_structure.search_properties
-        ):
-            keywords.append(ast.keyword(arg="search", value=ast.Constant(True)))
-        else:
-            keywords.append(ast.keyword(arg="search", value=ast.Constant(False)))
-
-        if (
-            properties_structure.metric_label
-            and pkey in properties_structure.metric_label
-        ):
-            keywords.append(ast.keyword(arg="metric_label", value=ast.Constant(True)))
-
-        if prop.type == PrimitiveTypes.CPF:
-            keywords.append(
-                ast.keyword(
-                    arg="validator",
-                    value=ast.Attribute(
-                        value=ast.Call(
-                            func=ast.Name(id="DTOFieldValidators", ctx=ast.Load()),
-                            args=[],
-                            keywords=[],
-                        ),
-                        attr="validate_cpf",
-                        ctx=ast.Load(),
-                    ),
-                )
-            )
-        elif prop.type == PrimitiveTypes.CNPJ:
-            keywords.append(
-                ast.keyword(
-                    arg="validator",
-                    value=ast.Attribute(
-                        value=ast.Call(
-                            func=ast.Name(id="DTOFieldValidators", ctx=ast.Load()),
-                            args=[],
-                            keywords=[],
-                        ),
-                        attr="validate_cnpj",
-                        ctx=ast.Load(),
-                    ),
-                )
-            )
-        elif prop.type == PrimitiveTypes.CPF_CNPJ:
-            keywords.append(
-                ast.keyword(
-                    arg="validator",
-                    value=ast.Attribute(
-                        value=ast.Call(
-                            func=ast.Name(id="DTOFieldValidators", ctx=ast.Load()),
-                            args=[],
-                            keywords=[],
-                        ),
-                        attr="validate_cpf_or_cnpj",
-                        ctx=ast.Load(),
-                    ),
-                )
-            )
-        elif prop.type == PrimitiveTypes.EMAIL:
-            keywords.append(
-                ast.keyword(
-                    arg="validator",
-                    value=ast.Attribute(
-                        value=ast.Call(
-                            func=ast.Name(id="DTOFieldValidators", ctx=ast.Load()),
-                            args=[],
-                            keywords=[],
-                        ),
-                        attr="validate_email",
-                        ctx=ast.Load(),
-                    ),
-                )
-            )
-
-        # Trtando de uma definição de enum
-        if prop.domain_config:
-            result = self._compile_domain_config(
-                pkey, prop, escopo, entity_model, prefx_class_name
-            )
-            if not result:
-                raise Exception(f"Erro desconhecido ao compilar a propriedade {pkey}")
-
-            enum_class_name, ast_enum_class = result
-            aux_classes.append(ast_enum_class)
-
-        # Resolvendo o nome da propriedade no Entity
-        if (
-            properties_structure.entity_properties
-            and pkey in properties_structure.entity_properties
-        ):
-            entity_field_name = properties_structure.entity_properties[pkey].column
-        else:
-            entity_field_name = pkey
-
-        # Escrevendo, se necessário, o alias para o nome da entity
-        if entity_field_name != pkey:
-            keywords.append(
-                ast.keyword(
-                    arg="entity_field",
-                    value=ast.Constant(value=entity_field_name),
-                )
-            )
-
-        # Instanciando o atributo AST
-        if not isinstance(prop.type, PrimitiveTypes):
-            raise Exception(
-                f"Tipo da trait_property '{pkey}' não suportado: {prop.type} (deveria ser um Tipo Primitivo)"
-            )
-
-        # Instanciando o atributo AST
-        if enum_class_name:
-            prop_type = enum_class_name
-        else:
-            prop_type = TypeUtil.property_type_to_python_type(prop.type)
-
-        ast_attr = ast.AnnAssign(
-            target=ast.Name(id=CompilerStrUtil.to_snake_case(pkey), ctx=ast.Store()),
-            annotation=ast.Name(
-                id=prop_type,
-                ctx=ast.Load(),
-            ),
-            value=ast.Call(
-                func=ast.Name(id="DTOField", ctx=ast.Load()),
-                args=[],
-                keywords=keywords,
-            ),
-            simple=1,
-        )
-
-        ast_dto_attributes.append(ast_attr)
-
-        # Entity
-        ast_entity_attr = ast.AnnAssign(
-            target=ast.Name(
-                id=CompilerStrUtil.to_snake_case(entity_field_name),
-                ctx=ast.Store(),
-            ),
-            annotation=ast.Name(
-                id=TypeUtil.property_type_to_python_type(prop.type),
-                ctx=ast.Load(),
-            ),
-            value=ast.Constant(value=None),
-            simple=1,
-        )
-
-        ast_entity_attributes.append(ast_entity_attr)
-
-        # Guardando como um fixed_filter
-        # TODO Pensar em validações para esse value (se está de acordo com o tipo ou enum)
-        fixed_filters.append((pkey, prop.value))
-
     def _build_aggregator_class_ast(
         self,
         class_name: str,
@@ -1165,6 +945,47 @@ class EDLPropertyCompiler:
             ctx=ast.Load(),
         )
 
+    def _merge_trait_extends_properties(
+        self, properties_structure: PropertiesCompilerStructure
+    ) -> dict[str, BasicTypes]:
+        fixed_filters: dict[str, BasicTypes] = {}
+
+        trait_sources = (
+            properties_structure.trait_properties or {},
+            properties_structure.extends_properties or {},
+        )
+
+        for prop_dict in trait_sources:
+            for pkey, tprop in prop_dict.items():
+                if not isinstance(tprop.type, PrimitiveTypes):
+                    raise ValueError(
+                        f"Propriedade '{pkey}' definida em trait/extends precisa ser um tipo primitivo."
+                    )
+
+                base_prop = properties_structure.properties.get(pkey)
+
+                if base_prop:
+                    if base_prop.type != tprop.type:
+                        raise ValueError(
+                            f"Tipo da propriedade '{pkey}' em trait/extends não coincide com a definição existente."
+                        )
+
+                    base_prop.default = tprop.value
+
+                    if tprop.domain_config and not base_prop.domain_config:
+                        base_prop.domain_config = tprop.domain_config
+                else:
+                    base_prop = PropertyMetaModel(
+                        type=tprop.type,
+                        default=tprop.value,
+                        domain_config=tprop.domain_config,
+                    )
+                    properties_structure.properties[pkey] = base_prop
+
+                fixed_filters[pkey] = tprop.value
+
+        return fixed_filters
+
     def _build_primitive_default_value_ast(
         self,
         pkey: str,
@@ -1249,9 +1070,7 @@ class EDLPropertyCompiler:
             )
 
         value_to_convert = (
-            default_value.strip()
-            if isinstance(default_value, str)
-            else default_value
+            default_value.strip() if isinstance(default_value, str) else default_value
         )
 
         if forbid_fraction and isinstance(value_to_convert, float):

{nsj_rest_lib2-0.0.22.dist-info → nsj_rest_lib2-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.22
+Version: 0.0.23
 Summary: Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configuradas por meio de EDLs declarativos (em formato JSON).
 Home-page: https://github.com/Nasajon/nsj_rest_lib2
 Author: Nasajon Sistemas

{nsj_rest_lib2-0.0.22.dist-info → nsj_rest_lib2-0.0.23.dist-info}/RECORD

@@ -9,7 +9,7 @@ nsj_rest_lib2/compiler/compiler_structures.py,sha256=a_DF_nU4VgCt0sWJI03Ky6fPHvo
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=mvZo19owtpFTjanCE20T0jmBKjhKXIVUsnR5raiGoRM,6728
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=-mDA1-dHKYp0umQi1A4GbA0F1hlaC-gQRqj69vkADC4,6536
 nsj_rest_lib2/compiler/model.py,sha256=QDBoM26qoZdiNcykl1nvXCrFDhg-6Q__QzVq6uY1QzE,1460
-nsj_rest_lib2/compiler/property_compiler.py,sha256=3PIt0l8jrUeSxwTfM48X5fjwAYe0_0s0PGq9Z4cMmBQ,49713
+nsj_rest_lib2/compiler/property_compiler.py,sha256=pJMZb2JPfle_svOixuGD1JUnQUYhlWrNiay2tmTgl0Q,43600
 nsj_rest_lib2/compiler/edl_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/compiler/edl_model/ai_entity_edl.py,sha256=664QBDcOgVnyfwtUOXO1W7AKaZhueBG335x5DuogruY,7644
 nsj_rest_lib2/compiler/edl_model/api_model.py,sha256=pH0Uiq_64AGvkHqwY44TrulWWZXbi6M0EKJWUhSqKj0,837
@@ -30,7 +30,7 @@ nsj_rest_lib2/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nsj_rest_lib2/controller/dynamic_controller.py,sha256=XMqxe1NW-NE5XwomXb4pSNdALQHpP74Hc26R4fnmXqg,15194
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/service/entity_loader.py,sha256=-Adgj8shMkLXrIV4ZDAqpOLSN--B5k9Uokfy9nrQA4I,15585
-nsj_rest_lib2-0.0.22.dist-info/METADATA,sha256=-YyM5sMuF6_0dZ0r09vyzQuZoDcZb0FEsKzOBF31PjM,1094
-nsj_rest_lib2-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.22.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.22.dist-info/RECORD,,
+nsj_rest_lib2-0.0.23.dist-info/METADATA,sha256=ABA2f_Qw57RKKdb8BGZhZjiSjqIY1GDQH36U_l0k1G4,1094
+nsj_rest_lib2-0.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.23.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.23.dist-info/RECORD,,