@koalarx/nest 1.12.4 → 1.12.6

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

@@ -2,12 +2,13 @@ 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> = {
-    [key in keyof TEntity]?: boolean | RepositoryInclude<TEntity[keyof TEntity]>;
-};
-interface RepositoryInitProps<TEntity> {
+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>> {
     context: PrismaTransactionalClient;
     modelName: Type<TEntity>;
     transactionContext?: Type<PrismaTransactionalClient>;
@@ -33,5 +34,6 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     private createEntity;
     private orphanRemoval;
     private getIdPropName;
+    private getInclude;
 }
 export {};

package/core/database/repository.base.js

@@ -23,7 +23,7 @@ class RepositoryBase {
     async findById(id) {
         return this.context()
             .findFirst({
-            include: this._include,
+            include: this.getInclude(),
             where: { [this.getIdPropName()]: id },
         })
             .then((response) => {
@@ -36,7 +36,7 @@ class RepositoryBase {
     async findFirst(where) {
         return this.context()
             .findFirst({
-            include: this._include,
+            include: this.getInclude(),
             where,
         })
             .then((response) => {
@@ -49,7 +49,7 @@ class RepositoryBase {
     async findUnique(where) {
         return this.context()
             .findUnique({
-            include: this._include,
+            include: this.getInclude(),
             where,
         })
             .then((response) => {
@@ -78,7 +78,7 @@ class RepositoryBase {
             return this.context()
                 .create({
                 data: prismaEntity,
-                include: this._include,
+                include: this.getInclude(),
             })
                 .then((response) => this.createEntity(response));
         }
@@ -162,17 +162,23 @@ class RepositoryBase {
                     if (entity[key][this.getIdPropName()]) {
                         prismaSchema[key] = {
                             connectOrCreate: {
-                                where: { [this.getIdPropName()]: entity[key][this.getIdPropName()] },
+                                where: {
+                                    [this.getIdPropName()]: entity[key][this.getIdPropName()],
+                                },
                                 create: this.entityToPrisma(entity[key]),
-                            }
+                            },
                         };
                     }
                     else {
-                        prismaSchema[key] = { create: this.entityToPrisma(entity[key]) };
+                        prismaSchema[key] = {
+                            create: this.entityToPrisma(entity[key]),
+                        };
                     }
                 }
                 else {
-                    prismaSchema[key] = { update: this.entityToPrisma(entity[key]) };
+                    prismaSchema[key] = {
+                        update: this.entityToPrisma(entity[key]),
+                    };
                 }
             }
             else {
@@ -192,7 +198,7 @@ class RepositoryBase {
     }
     findManySchema(where, pagination) {
         return {
-            include: this._include,
+            include: this.getInclude(),
             where,
             orderBy: pagination?.generateOrderBy(),
             skip: pagination?.skip(),
@@ -215,5 +221,20 @@ class RepositoryBase {
     getIdPropName() {
         return Reflect.getMetadata('entity:id', 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;
+    }
 }
 exports.RepositoryBase = RepositoryBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "1.12.4",
+  "version": "1.12.6",
   "description": "",
   "repository": {
     "type": "git",

package/test/koala-app-test.d.ts

@@ -1,13 +1,15 @@
-import { INestApplication, Type } from '@nestjs/common';
+import { CanActivate, INestApplication, Type } from '@nestjs/common';
 import { BaseExceptionFilter } from '@nestjs/core';
 import { PrismaTransactionalClient } from '../core/database/prisma-transactional-client';
 export declare class KoalaAppTest {
     private readonly app;
+    private _guards;
     private _globalExceptionFilter;
     private _prismaValidationExceptionFilter;
     private _domainExceptionFilter;
     private _zodExceptionFilter;
     constructor(app: INestApplication<any>);
+    addGlobalGuard(Guard: Type<CanActivate>): this;
     addCustomGlobalExceptionFilter(filter: BaseExceptionFilter): this;
     addCustomPrismaValidationExceptionFilter(filter: BaseExceptionFilter): this;
     addCustomDomainExceptionFilter(filter: BaseExceptionFilter): this;

package/test/koala-app-test.js

@@ -10,6 +10,7 @@ const zod_errors_filter_1 = require("../filters/zod-errors.filter");
 const ilogging_service_1 = require("../services/logging/ilogging.service");
 class KoalaAppTest {
     app;
+    _guards = [];
     _globalExceptionFilter;
     _prismaValidationExceptionFilter;
     _domainExceptionFilter;
@@ -25,6 +26,10 @@ class KoalaAppTest {
         this._domainExceptionFilter = new domain_errors_filter_1.DomainErrorsFilter(loggingService);
         this._zodExceptionFilter = new zod_errors_filter_1.ZodErrorsFilter(loggingService);
     }
+    addGlobalGuard(Guard) {
+        this._guards.push((0, instanciate_class_with_dependencies_injection_1.instanciateClassWithDependenciesInjection)(this.app, Guard));
+        return this;
+    }
     addCustomGlobalExceptionFilter(filter) {
         this._globalExceptionFilter = filter;
         return this;
@@ -63,6 +68,9 @@ class KoalaAppTest {
     }
     build() {
         this.app.useGlobalFilters(this._globalExceptionFilter, this._prismaValidationExceptionFilter, this._domainExceptionFilter, this._zodExceptionFilter);
+        for (const guard of this._guards) {
+            this.app.useGlobalGuards(guard);
+        }
         return this.app;
     }
 }