@koalarx/nest 3.1.0 → 3.1.2

package/core/database/entity.base.js

@@ -41,10 +41,12 @@ class EntityBase {
                     (props[key] instanceof Array || Array.isArray(props[key]))) {
                     this[key] = new utils_1.KlArray(props[key]);
                 }
-                else if (propDefinitions?.type === 'KlDate' && props[key] instanceof Date) {
+                else if (propDefinitions?.type === 'KlDate' &&
+                    props[key] instanceof Date) {
                     this[key] = new utils_1.KlDate(props[key]);
                 }
-                else if (propDefinitions?.type === 'KlTime' && props[key] instanceof Date) {
+                else if (propDefinitions?.type === 'KlTime' &&
+                    props[key] instanceof Date) {
                     this[key] = new utils_1.KlTime(props[key].getHours(), props[key].getMinutes(), props[key].getSeconds(), props[key].getMilliseconds());
                 }
                 else if (EntityOnPropKey) {

package/core/database/repository.base.d.ts

@@ -20,7 +20,6 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private resetDeepIncludeCount;
     constructor({ context, modelName, deepIncludeLimit, }: RepositoryInitProps<TEntity, TContext>);
     private getConnectPrismaSchemaForRelation;
-    private autogenerateIncludeSchema;
     private getSelectRootPrismaSchema;
     private getPropNameFromEntitySource;
     private listRelationEntities;

package/core/database/repository.base.js

@@ -4,9 +4,10 @@ exports.RepositoryBase = void 0;
 const KlString_1 = require("@koalarx/utils/KlString");
 const pagination_dto_1 = require("../dtos/pagination.dto");
 const koala_global_vars_1 = require("../koala-global-vars");
+const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
+const generate_prisma_include_schema_1 = require("../utils/generate-prisma-include-schema");
 const list_1 = require("../utils/list");
 const entity_base_1 = require("./entity.base");
-const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
 class RepositoryBase {
     _context;
     _modelName;
@@ -21,9 +22,16 @@ class RepositoryBase {
         this._context = context;
         this._modelName = modelName;
         this.deepIncludeLimit = deepIncludeLimit ?? 5;
-        this._include = this.autogenerateIncludeSchema();
+        this._include = (0, generate_prisma_include_schema_1.generateIncludeSchema)({
+            deepLimit: deepIncludeLimit || 5,
+            entity: this._modelName,
+        });
         this.resetDeepIncludeCount();
-        this._includeFindMany = this.autogenerateIncludeSchema(true);
+        this._includeFindMany = (0, generate_prisma_include_schema_1.generateIncludeSchema)({
+            forList: true,
+            deepLimit: deepIncludeLimit || 1,
+            entity: this._modelName,
+        });
     }
     getConnectPrismaSchemaForRelation(entity, data) {
         const propIdName = this.getIdPropName(entity);
@@ -33,39 +41,6 @@ class RepositoryBase {
             },
         };
     }
-    autogenerateIncludeSchema(forList = false, relation) {
-        if (this.deepIncludeCount >= this.deepIncludeLimit) {
-            return true;
-        }
-        const includeSchema = {};
-        const entity = relation ? new relation() : new this._modelName();
-        Object.keys(entity)
-            .filter((key) => !['_id', '_action'].includes(key))
-            .forEach((key) => {
-            let includes;
-            if (entity[key] instanceof list_1.List) {
-                if (forList) {
-                    includeSchema[key] = true;
-                }
-                else {
-                    includes = this.autogenerateIncludeSchema(forList, entity[key].entityType);
-                }
-            }
-            else if (entity[key] instanceof entity_base_1.EntityBase) {
-                includes = this.autogenerateIncludeSchema(forList, entity[key].constructor);
-            }
-            if (includes) {
-                if (includes === true || Object.keys(includes).length > 0) {
-                    includeSchema[key] = includes;
-                }
-                else {
-                    includeSchema[key] = true;
-                }
-            }
-        });
-        this.deepIncludeCount += 1;
-        return includeSchema;
-    }
     getSelectRootPrismaSchema(entity) {
         const selectSchema = {};
         Object.keys(entity)

package/core/utils/generate-prisma-include-schema.d.ts

@@ -0,0 +1,9 @@
+import { Type } from '@nestjs/common';
+import { EntityBase } from '../database/entity.base';
+export interface GeneratePrismaIncludeSchemaOptions {
+    entity: Type<EntityBase<any>>;
+    deepLimit: number;
+    deepIncludeCount?: number;
+    forList?: boolean;
+}
+export declare function generateIncludeSchema({ forList, entity, deepIncludeCount, deepLimit, }: GeneratePrismaIncludeSchemaOptions): {};

package/core/utils/generate-prisma-include-schema.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateIncludeSchema = generateIncludeSchema;
+const entity_base_1 = require("../database/entity.base");
+const list_1 = require("./list");
+const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
+function generateIncludeSchema({ forList, entity, deepIncludeCount = 0, deepLimit, }) {
+    if (deepIncludeCount >= deepLimit) {
+        return true;
+    }
+    const includeSchema = {};
+    const entityInstance = new entity();
+    Object.keys(entityInstance)
+        .filter((key) => !['_id', '_action'].includes(key))
+        .forEach((key) => {
+        let includes;
+        if (entityInstance[key] instanceof list_1.List) {
+            if (forList) {
+                includeSchema[key] = true;
+            }
+            else {
+                includes = generateIncludeSchema({
+                    forList,
+                    entity: entityInstance[key].entityType,
+                    deepLimit,
+                    deepIncludeCount: deepIncludeCount > 0 ? deepIncludeCount + 1 : 1,
+                });
+            }
+        }
+        else {
+            const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(entityInstance.constructor, key);
+            if (propDefinitions) {
+                const source = auto_mapping_list_1.AutoMappingList.getSourceByName(propDefinitions.type);
+                if (source?.prototype instanceof entity_base_1.EntityBase) {
+                    includes = generateIncludeSchema({
+                        forList,
+                        entity: source,
+                        deepLimit,
+                        deepIncludeCount: deepIncludeCount > 0 ? deepIncludeCount + 1 : 1,
+                    });
+                }
+            }
+        }
+        if (includes) {
+            if (includes === true || Object.keys(includes).length > 0) {
+                includeSchema[key] = includes;
+            }
+            else {
+                includeSchema[key] = true;
+            }
+        }
+    });
+    return includeSchema;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "",
   "author": "Igor D. Rangel",
   "license": "MIT",