nsj-rest-lib2 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

nsj_rest_lib2/compiler/compiler.py

@@ -118,7 +118,7 @@ class EDLCompiler:
             ast_dto_attributes,
             ast_entity_attributes,
             props_pk,
-            enum_classes,
+            aux_classes,
             related_imports,
             relations_dependencies,
             fixed_filters,
@@ -171,7 +171,7 @@ class EDLCompiler:
         dto_class_name, code_dto = self._dto_compiler.compile(
             entity_model,
             ast_dto_attributes,
-            enum_classes,
+            aux_classes,
             related_imports,
             fixed_filters,
             prefx_class_name,
@@ -305,6 +305,16 @@ class EDLCompiler:
         if entity_model.trait_properties:
             properties_structure.trait_properties.update(entity_model.trait_properties)
 
+        if entity_model.extends_properties:
+            properties_structure.extends_properties.update(
+                entity_model.extends_properties
+            )
+
+        if entity_model.composed_properties:
+            properties_structure.composed_properties.update(
+                entity_model.composed_properties
+            )
+
         if entity_model.repository.properties:
             properties_structure.entity_properties.update(
                 entity_model.repository.properties

nsj_rest_lib2/compiler/compiler_structures.py

@@ -3,6 +3,7 @@ from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
 from nsj_rest_lib2.compiler.edl_model.index_model import IndexModel
 from nsj_rest_lib2.compiler.edl_model.property_meta_model import PropertyMetaModel
 from nsj_rest_lib2.compiler.edl_model.trait_property_meta_model import (
+    ExtendsPropertyMetaModel,
     TraitPropertyMetaModel,
 )
 
@@ -23,6 +24,8 @@ class PropertiesCompilerStructure:
         self.metric_label: list[str] = []
         self.entity_properties: dict[str, ColumnMetaModel] = {}
         self.trait_properties: dict[str, TraitPropertyMetaModel] = {}
+        self.extends_properties: dict[str, ExtendsPropertyMetaModel] = {}
+        self.composed_properties: dict[str, list[str]] = {}
 
 
 class ComponentsCompilerStructure:

nsj_rest_lib2/compiler/dto_compiler.py

@@ -16,7 +16,7 @@ class DTOCompiler:
         self,
         entity_model: EntityModelBase,
         ast_dto_attributes: list[ast.stmt],
-        enum_classes: list[ast.stmt],
+        aux_classes: list[ast.stmt],
         related_imports: list[tuple[str, str, str]],
         fixed_filters: list[tuple[str, BasicTypes]],
         prefx_class_name: str,
@@ -30,8 +30,8 @@ class DTOCompiler:
         :param ast_dto_attributes: Atributos do DTO
         :type ast_dto_attributes: list[ast.stmt]
 
-        :param enum_classes: Classes de enumeração
-        :type enum_classes: list[ast.stmt]
+        :param aux_classes: Classes auxiliares (enums, agregadores, etc.)
+        :type aux_classes: list[ast.stmt]
 
         :return: Código compilado do DTO
         :rtype: str
@@ -86,6 +86,12 @@ class DTOCompiler:
                 names=[ast.alias(name="DTOObjectField", asname=None)],
                 level=0,
             ),
+            # from nsj_rest_lib.descriptor import DTOAggregator
+            ast.ImportFrom(
+                module="nsj_rest_lib.descriptor",
+                names=[ast.alias(name="DTOAggregator", asname=None)],
+                level=0,
+            ),
         ]
 
         for import_ in related_imports:
@@ -135,7 +141,7 @@ class DTOCompiler:
 
         # Definindo o módulo
         module = ast.Module(
-            body=imports + enum_classes + [ast_class],
+            body=imports + aux_classes + [ast_class],
             type_ignores=[],
         )
         module = ast.fix_missing_locations(module)

nsj_rest_lib2/compiler/edl_model/entity_model_base.py

@@ -8,6 +8,7 @@ from typing import Dict, List, Optional
 from nsj_rest_lib2.compiler.edl_model.property_meta_model import PropertyMetaModel
 from nsj_rest_lib2.compiler.edl_model.repository_model import RepositoryModel
 from nsj_rest_lib2.compiler.edl_model.trait_property_meta_model import (
+    ExtendsPropertyMetaModel,
     TraitPropertyMetaModel,
 )
 
@@ -55,9 +56,17 @@ class EntityModelBase(BaseModel):
         None,
         description="Dicionário de propriedades condicionais da trait (isso é, especifica propriedades, e seus valores fixos, que serão usados como um tipo de filtro fixo usado como condição para que a propridade principal assum o papel daquele tipo de trait).",
     )
+    extends_properties: Optional[Dict[str, ExtendsPropertyMetaModel]] = Field(
+        None,
+        description="Dicionário de propriedades condicionais associadas ao uso de extends (especifica propriedades e seus valores fixos, usados como filtros quando a entidade é uma especialização via extends).",
+    )
     properties: Dict[str, PropertyMetaModel] = Field(
         ..., description="Dicionário de propriedades do modelo."
     )
+    composed_properties: Optional[Dict[str, List[str]]] = Field(
+        None,
+        description="Dicionário que define grupos de propriedades compostas, permitindo agrupar propriedades existentes em DTOs agregados.",
+    )
     components: Optional[Dict[str, "EntityModelBase"]] = Field(
         None,
         description="Entidades filhas, relacionadas por composição e definidas inline (evitando a criação de novos arquivos EDL para a definição de entidades componentes da entidade atual).",

nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py

@@ -14,3 +14,6 @@ class TraitPropertyMetaModel(BaseModel):
         None,
         description="Lista de valores permitidos.",
     )
+
+
+ExtendsPropertyMetaModel = TraitPropertyMetaModel

nsj_rest_lib2/compiler/property_compiler.py

@@ -80,17 +80,60 @@ class EDLPropertyCompiler:
         ast_dto_attributes = []
         ast_entity_attributes = []
         props_pk = []
-        enum_classes = []
+        aux_classes = []
         related_imports = []
         relations_dependencies = []
         fixed_filters = []
 
         if properties_structure.properties is None:
-            return (ast_dto_attributes, ast_entity_attributes, props_pk, enum_classes)
+            return (ast_dto_attributes, ast_entity_attributes, props_pk, aux_classes)
+
+        composed_properties = properties_structure.composed_properties or {}
+
+        aggregator_class_names: dict[str, str] = {}
+        aggregator_dto_attributes: dict[str, list[ast.stmt]] = {}
+        aggregated_property_to_group: dict[str, str] = {}
+
+        for composed_key, composed_list in composed_properties.items():
+            if not composed_list:
+                continue
+
+            composed_class_name = (
+                f"{CompilerStrUtil.to_pascal_case(escopo)}"
+                f"{CompilerStrUtil.to_pascal_case(prefx_class_name)}"
+                f"{CompilerStrUtil.to_pascal_case(entity_model.id)}"
+                f"{CompilerStrUtil.to_pascal_case(composed_key)}AggregatorDTO"
+            )
+
+            aggregator_class_names[composed_key] = composed_class_name
+            aggregator_dto_attributes[composed_key] = []
+
+            for composed_property in composed_list:
+                if composed_property in aggregated_property_to_group:
+                    raise Exception(
+                        f"Propriedade '{composed_property}' da entidade '{entity_model.id}' está associada a mais de um composed_property."
+                    )
+
+                if composed_property not in properties_structure.properties:
+                    raise Exception(
+                        f"Propriedade '{composed_property}' referenciada no composed_property '{composed_key}' não encontrada na entidade '{entity_model.id}'."
+                    )
+
+                aggregated_property_to_group[composed_property] = composed_key
 
         for pkey in properties_structure.properties:
             prop = properties_structure.properties[pkey]
 
+            composed_key = aggregated_property_to_group.get(pkey)
+            if composed_key:
+                if prop.pk:
+                    raise Exception(
+                        f"Propriedade '{pkey}' não pode ser utilizada em composed_properties por ser chave primária."
+                    )
+                target_dto_attributes = aggregator_dto_attributes[composed_key]
+            else:
+                target_dto_attributes = ast_dto_attributes
+
             # DTO
             if isinstance(prop.type, PrimitiveTypes):
                 # Tratando propriedade simples (não array, não object)
@@ -99,10 +142,10 @@ class EDLPropertyCompiler:
                     map_unique_by_property,
                     escopo,
                     entity_model,
-                    ast_dto_attributes,
+                    target_dto_attributes,
                     ast_entity_attributes,
                     props_pk,
-                    enum_classes,
+                    aux_classes,
                     pkey,
                     prop,
                     prefx_class_name,
@@ -124,7 +167,7 @@ class EDLPropertyCompiler:
                         entity_model,
                         entity_models,
                         properties_structure,
-                        ast_dto_attributes,
+                        target_dto_attributes,
                         ast_entity_attributes,
                         related_imports,
                         relations_dependencies,
@@ -139,7 +182,7 @@ class EDLPropertyCompiler:
                         related_entity_id,
                         entity_model,
                         properties_structure,
-                        ast_dto_attributes,
+                        target_dto_attributes,
                         ast_entity_attributes,
                         pkey,
                         prop,
@@ -153,7 +196,24 @@ class EDLPropertyCompiler:
         for pkey in properties_structure.trait_properties:
             prop = properties_structure.trait_properties[pkey]
 
-            self._compile_trait_property(
+            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,
@@ -163,21 +223,38 @@ class EDLPropertyCompiler:
                 fixed_filters,
                 escopo,
                 entity_model,
-                enum_classes,
+                aux_classes,
                 prefx_class_name,
             )
 
+        for composed_key, class_name in aggregator_class_names.items():
+            dto_attributes = aggregator_dto_attributes.get(composed_key, [])
+
+            aux_classes.append(
+                self._build_aggregator_class_ast(
+                    class_name=class_name,
+                    dto_attributes=dto_attributes,
+                )
+            )
+
+            ast_dto_attributes.append(
+                self._build_dto_aggregator_ast(
+                    name=composed_key,
+                    class_name=class_name,
+                )
+            )
+
         return (
             ast_dto_attributes,
             ast_entity_attributes,
             props_pk,
-            enum_classes,
+            aux_classes,
             related_imports,
             relations_dependencies,
             fixed_filters,
         )
 
-    def _compile_trait_property(
+    def _compile_trait_extends_property(
         self,
         properties_structure: PropertiesCompilerStructure,
         map_unique_by_property: dict[str, IndexCompilerStructure],
@@ -188,7 +265,7 @@ class EDLPropertyCompiler:
         fixed_filters: list[tuple[str, BasicTypes]],
         escopo: str,
         entity_model: EntityModelBase,
-        enum_classes: list[ast.stmt],
+        aux_classes: list[ast.stmt],
         prefx_class_name: str,
     ):
         enum_class_name = None
@@ -302,7 +379,7 @@ class EDLPropertyCompiler:
                 raise Exception(f"Erro desconhecido ao compilar a propriedade {pkey}")
 
             enum_class_name, ast_enum_class = result
-            enum_classes.append(ast_enum_class)
+            aux_classes.append(ast_enum_class)
 
         # Resolvendo o nome da propriedade no Entity
         if (
@@ -370,6 +447,49 @@ class EDLPropertyCompiler:
         # 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,
+        dto_attributes: list[ast.stmt],
+    ):
+        body = dto_attributes if dto_attributes else [ast.Pass()]
+
+        return ast.ClassDef(
+            name=class_name,
+            bases=[ast.Name(id="DTOBase", ctx=ast.Load())],
+            keywords=[],
+            decorator_list=[
+                ast.Call(
+                    func=ast.Name(id="DTO", ctx=ast.Load()),
+                    args=[],
+                    keywords=[],
+                )
+            ],
+            body=body,
+        )
+
+    def _build_dto_aggregator_ast(
+        self,
+        name: str,
+        class_name: str,
+    ):
+        return ast.AnnAssign(
+            target=ast.Name(
+                id=CompilerStrUtil.to_snake_case(name),
+                ctx=ast.Store(),
+            ),
+            annotation=ast.Name(
+                id=class_name,
+                ctx=ast.Load(),
+            ),
+            value=ast.Call(
+                func=ast.Name(id="DTOAggregator", ctx=ast.Load()),
+                args=[ast.Name(id=class_name, ctx=ast.Load())],
+                keywords=[],
+            ),
+            simple=1,
+        )
+
     def _compile_external_relation(
         self,
         related_entity_id: str,
@@ -757,7 +877,7 @@ class EDLPropertyCompiler:
         ast_dto_attributes,
         ast_entity_attributes,
         props_pk,
-        enum_classes,
+        aux_classes,
         pkey,
         prop,
         prefx_class_name: str,
@@ -936,7 +1056,7 @@ class EDLPropertyCompiler:
                 raise Exception(f"Erro desconhecido ao compilar a propriedade {pkey}")
 
             enum_class_name, ast_enum_class = result
-            enum_classes.append(ast_enum_class)
+            aux_classes.append(ast_enum_class)
 
         # Resolvendo o nome da propriedade no Entity
         if (

{nsj_rest_lib2-0.0.16.dist-info → nsj_rest_lib2-0.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.16
+Version: 0.0.18
 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
@@ -31,3 +31,6 @@ Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configur
 * Rever modo de usar o InjectFactory (talvez dando ciência, ao RestLib, do padrão multibanco)
 * Implementar e documentar campos join
 * Implementar e documentar conjuntos
+* Dar erro ao haver conflito de nomes das propriedades (por qualquer tipo de herança)
+* Rotas para o inline
+* inline será para composição (arquivo externo é agregação)

{nsj_rest_lib2-0.0.16.dist-info → nsj_rest_lib2-0.0.18.dist-info}/RECORD

@@ -4,24 +4,24 @@ nsj_rest_lib2/redis_config.py,sha256=4KLcvYS3nJO7PMQgF6F9_j6r-TyqcS7TBbd3LEQuKDU
 nsj_rest_lib2/settings.py,sha256=Hn_o1HZmievnYb8D1kNT2Nq-OEjxbyNjOiOpbnFsMwE,367
 nsj_rest_lib2/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/compiler/ai_compiler.py,sha256=shAtN4T0ai_52qh15L3mK1QbeC6glHOR6C3J3gj14II,9029
-nsj_rest_lib2/compiler/compiler.py,sha256=mZVZlFF5Na1w4p-MMytIvk2jt1gOFrEEJu4V6TL3PP4,18303
-nsj_rest_lib2/compiler/compiler_structures.py,sha256=ZUeWnO-23f3JHq4bOfTcqszMDDXwuFEtMRhqMN7GeWQ,1214
-nsj_rest_lib2/compiler/dto_compiler.py,sha256=KDdfzoghbsO0RpWAhuhZ4gsb11aoxgci-93dwxWNMuY,5400
+nsj_rest_lib2/compiler/compiler.py,sha256=xz1xYP7mY1hqzuuwDo-ATlU1X-8ldhGmFwEIUtQbOeo,18638
+nsj_rest_lib2/compiler/compiler_structures.py,sha256=cgA4ldqOoBYH8qxS99G2hd5Tgo7M1yzN0O_VIVpw3TI,1378
+nsj_rest_lib2/compiler/dto_compiler.py,sha256=qK0LHmXAlY_snm6QncIO0S4GiRtHYgtd74xSodK8MQA,5670
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=A0fiLFF7dGXM2uH5cknmAX-cQ-9nu4Ubujp-m5NmgYE,4780
 nsj_rest_lib2/compiler/model.py,sha256=QDBoM26qoZdiNcykl1nvXCrFDhg-6Q__QzVq6uY1QzE,1460
-nsj_rest_lib2/compiler/property_compiler.py,sha256=0EbjI2quxE8fD7vn8UjF8FkeCuTAeCKA8Mz__WgLGOA,36163
+nsj_rest_lib2/compiler/property_compiler.py,sha256=G4xY8cX9TU2c5oNLRRKlU4sQ4b4bzR2KAjBleQmrX6Y,40471
 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
 nsj_rest_lib2/compiler/edl_model/column_meta_model.py,sha256=s0sEVkoW1hV2_hto1mws4XhzKGH_b4NzhaOiwFH25Ks,694
 nsj_rest_lib2/compiler/edl_model/entity_model.py,sha256=Yc6wvjsiwacmz796mZIU-i9hxzNV9yuLPdULGKYHNbM,854
-nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=A1HLuG1Z5SOUMpINZDkJA7kuPmevJcj28QQl4KgwX8c,3588
+nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=7AVyxmYtwZYVm6hNXQm-EBO3LMYkMHPf1ZFQrt0wZ3Q,4160
 nsj_rest_lib2/compiler/edl_model/entity_model_root.py,sha256=VinsxFlNyCaKKk37ZzcbmWaWgoUP2-dZBG61Ke7NvVs,231
 nsj_rest_lib2/compiler/edl_model/index_model.py,sha256=cXWlu0hxtro5vvYoirkDW4R3PCnBW5oCCWjRJ6AX5zE,508
 nsj_rest_lib2/compiler/edl_model/primitives.py,sha256=GTo8e1mf9munvl_J1-fmaXgSJ8yQvGX56f2rwS85M1Y,1459
 nsj_rest_lib2/compiler/edl_model/property_meta_model.py,sha256=ie3roNZAqYTwz7q0TTdceMjY5khnBiED2yp0XBqqk7E,3909
 nsj_rest_lib2/compiler/edl_model/repository_model.py,sha256=Vt1HxlaoifP4w5ij1laKDkD1-COBihE8EX1HkdEDUSo,977
-nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py,sha256=SBSfiu4v0PMsWRsGDySR3P2tkabLbDZxx_FFy_3rGXA,605
+nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py,sha256=NtMVZeOPu3LJwXI-8tCOLVuQiGua_0t7kL1h9gL7HuM,657
 nsj_rest_lib2/compiler/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/compiler/util/str_util.py,sha256=lVP1yHhj1pOd6ULtTnkcfX6Gqrpe4yCBratHUhBNGcI,843
 nsj_rest_lib2/compiler/util/type_naming_util.py,sha256=wTfxPCezCTt-ltSg_hkaYNH7Z05k-mlJKZd-9AMA9ac,768
@@ -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=uB0xXih9Px2jSTMdZNIu6_3dngE37K7adKX03cYSRug,15660
-nsj_rest_lib2-0.0.16.dist-info/METADATA,sha256=ImDS5PybQMuExp4Wn1DCNS9cbFPUUN1qDdYBC9Gd0yE,1410
-nsj_rest_lib2-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.16.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.16.dist-info/RECORD,,
+nsj_rest_lib2-0.0.18.dist-info/METADATA,sha256=5HB_H5qhmsBFRU6DI9uMmXYyzLobZe-2aLUMFIMM_qc,1585
+nsj_rest_lib2-0.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.18.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.18.dist-info/RECORD,,