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

nsj_rest_lib2/compiler/compiler.py

@@ -305,6 +305,11 @@ 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.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,7 @@ 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] = {}
 
 
 class ComponentsCompilerStructure:

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,6 +56,10 @@ 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."
     )

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

@@ -153,7 +153,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,
+                enum_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,
@@ -177,7 +194,7 @@ class EDLPropertyCompiler:
             fixed_filters,
         )
 
-    def _compile_trait_property(
+    def _compile_trait_extends_property(
         self,
         properties_structure: PropertiesCompilerStructure,
         map_unique_by_property: dict[str, IndexCompilerStructure],

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.16
+Version: 0.0.17
 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.17.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/compiler.py,sha256=J5ggkuYi-wQDra8t2R9riP3rqaKl2AQgnRqXZMX1QXE,18470
+nsj_rest_lib2/compiler/compiler_structures.py,sha256=2rLC21vMsLWURlRlQP4XGW51TRajmYY_guE6OBcoGBA,1318
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=KDdfzoghbsO0RpWAhuhZ4gsb11aoxgci-93dwxWNMuY,5400
 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=OOXEXGxXsEkvGcE_QKcasCoAkQ7qRUkWvPhd0c7yFuA,36717
 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=ICZ0m3t-_Wv8Di5Grb5UJIN7-3belcBf4IUYsceWX1I,3933
 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.17.dist-info/METADATA,sha256=cesW5YRcvKWDcfyVo9yIzPnYL7sAG_0-BF57Ww_LMEs,1585
+nsj_rest_lib2-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.17.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.17.dist-info/RECORD,,