@koalarx/nest 3.0.10 → 3.1.0

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

@@ -2,34 +2,35 @@ import { Type } from '@nestjs/common';
 import { ListResponse } from '..';
 import { PaginationDto } from '../dtos/pagination.dto';
 import { IComparableId } from '../utils/interfaces/icomparable';
-import { List } from '../utils/list';
 import { EntityBase } from './entity.base';
 import { PrismaTransactionalClient } from './prisma-transactional-client';
-type RepositoryInclude<TEntity> = Omit<{
-    [K in keyof TEntity as TEntity[K] extends Function ? never : K]?: boolean | (TEntity[K] extends List<infer U> ? RepositoryInclude<U> : RepositoryInclude<TEntity[K]>);
-}, '_id' | '_action'>;
 interface RepositoryInitProps<TEntity extends EntityBase<TEntity>, TContext extends PrismaTransactionalClient> {
     context: TContext;
     modelName: Type<TEntity>;
     transactionContext?: Type<TContext>;
-    include?: RepositoryInclude<TEntity>;
+    deepIncludeLimit?: number;
 }
 export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>, TContext extends PrismaTransactionalClient = PrismaTransactionalClient, TModelKey extends keyof TContext = keyof TContext> {
     protected _context: TContext;
     private readonly _modelName;
     private readonly _include?;
-    constructor({ context, modelName, include, }: RepositoryInitProps<TEntity, TContext>);
+    private readonly _includeFindMany?;
+    private readonly deepIncludeLimit;
+    private deepIncludeCount;
+    private resetDeepIncludeCount;
+    constructor({ context, modelName, deepIncludeLimit, }: RepositoryInitProps<TEntity, TContext>);
     private getConnectPrismaSchemaForRelation;
+    private autogenerateIncludeSchema;
     private getSelectRootPrismaSchema;
     private getPropNameFromEntitySource;
     private listRelationEntities;
     private listToRelationActionList;
     private entityToPrisma;
+    private getInclude;
     private findManySchema;
     private createEntity;
     private orphanRemoval;
     private getIdPropName;
-    private getInclude;
     private persistRelations;
     protected context(transactionalClient?: TContext): TContext[TModelKey];
     protected findById(id: IComparableId): Promise<TEntity | null>;

package/core/database/repository.base.js

@@ -11,10 +11,19 @@ class RepositoryBase {
     _context;
     _modelName;
     _include;
-    constructor({ context, modelName, include, }) {
+    _includeFindMany;
+    deepIncludeLimit;
+    deepIncludeCount = 0;
+    resetDeepIncludeCount() {
+        this.deepIncludeCount = 0;
+    }
+    constructor({ context, modelName, deepIncludeLimit, }) {
         this._context = context;
         this._modelName = modelName;
-        this._include = include;
+        this.deepIncludeLimit = deepIncludeLimit ?? 5;
+        this._include = this.autogenerateIncludeSchema();
+        this.resetDeepIncludeCount();
+        this._includeFindMany = this.autogenerateIncludeSchema(true);
     }
     getConnectPrismaSchemaForRelation(entity, data) {
         const propIdName = this.getIdPropName(entity);
@@ -24,10 +33,43 @@ 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)
-            .filter((key) => !['id', '_id', '_action'].includes(key))
+            .filter((key) => !['_id', '_action'].includes(key))
             .filter((key) => !(entity[key] instanceof Function || entity[key] instanceof list_1.List))
             .forEach((key) => {
             if (entity[key] instanceof entity_base_1.EntityBase) {
@@ -84,7 +126,7 @@ class RepositoryBase {
                 const entityInstance = list.entityType;
                 const modelName = entityInstance.name;
                 const parentModelName = entity.constructor.name;
-                const parentPropName = this.getPropNameFromEntitySource(new entityInstance(), entity.constructor) ?? parentModelName;
+                const parentPropName = this.getPropNameFromEntitySource(new entityInstance(), entity.constructor) ?? (0, KlString_1.toCamelCase)(parentModelName);
                 if (modelName) {
                     list.toArray('removed').forEach((item) => {
                         relationDeletes.push({
@@ -161,9 +203,24 @@ class RepositoryBase {
         });
         return prismaSchema;
     }
+    getInclude(include) {
+        include = include ?? this._include ?? {};
+        const result = {};
+        Object.keys(include).forEach((key) => {
+            if (typeof include[key] === 'boolean') {
+                result[key] = include[key];
+            }
+            else {
+                result[key] = {
+                    include: this.getInclude(include[key]),
+                };
+            }
+        });
+        return result;
+    }
     findManySchema(where, pagination) {
         return {
-            include: this.getInclude(),
+            include: this.getInclude(this._includeFindMany),
             where,
             orderBy: pagination?.generateOrderBy(),
             skip: pagination?.skip(),
@@ -186,21 +243,6 @@ class RepositoryBase {
     getIdPropName(entity) {
         return (Reflect.getMetadata('entity:id', entity ? entity.constructor.prototype : this._modelName.prototype) ?? 'id');
     }
-    getInclude(include) {
-        include = include ?? this._include ?? {};
-        const result = {};
-        Object.keys(include).forEach((key) => {
-            if (typeof include[key] === 'boolean') {
-                result[key] = include[key];
-            }
-            else {
-                result[key] = {
-                    include: this.getInclude(include[key]),
-                };
-            }
-        });
-        return result;
-    }
     persistRelations(transaction, entity) {
         const { relationCreates, relationUpdates, relationDeletes } = this.listToRelationActionList(entity);
         return Promise.all([
@@ -209,7 +251,8 @@ class RepositoryBase {
                 .then((response) => {
                 return Promise.all(relationCreate.relations.map((relation) => {
                     const relationPropName = this.getPropNameFromEntitySource(relation, relationCreate.entityInstance);
-                    if (relationPropName) {
+                    if (relationPropName &&
+                        !(relation[relationPropName] instanceof list_1.List)) {
                         relation[relationPropName] =
                             this.getConnectPrismaSchemaForRelation(relationCreate.entityInstance, response);
                     }

package/package.json

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