@koalarx/nest 1.12.3 → 1.12.5

package/core/database/entity.decorator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = Entity;
 function Entity(id) {
     return function (target) {
-        const originalConstructor = target;
         class NewConstructor extends target {
             constructor(...args) {
                 super(...args);
@@ -12,13 +11,6 @@ function Entity(id) {
                 }
             }
         }
-        const newConstructor = function (...args) {
-            const instance = Reflect.construct(originalConstructor, args, newConstructor);
-            if (typeof instance.automap === 'function') {
-                instance.automap(args[0]);
-            }
-            return instance;
-        };
         Object.setPrototypeOf(NewConstructor.prototype, target.prototype);
         Object.setPrototypeOf(NewConstructor, target);
         Object.defineProperty(NewConstructor, 'name', {

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));
         }
@@ -158,10 +158,28 @@ class RepositoryBase {
                 }
             }
             else if (entity[key] instanceof entity_base_1.EntityBase) {
-                prismaSchema[key] =
-                    entity[key]._action === entity_base_1.EntityActionType.create
-                        ? { create: this.entityToPrisma(entity[key]) }
-                        : { update: this.entityToPrisma(entity[key]) };
+                if (entity[key]._action === entity_base_1.EntityActionType.create) {
+                    if (entity[key][this.getIdPropName()]) {
+                        prismaSchema[key] = {
+                            connectOrCreate: {
+                                where: {
+                                    [this.getIdPropName()]: entity[key][this.getIdPropName()],
+                                },
+                                create: this.entityToPrisma(entity[key]),
+                            },
+                        };
+                    }
+                    else {
+                        prismaSchema[key] = {
+                            create: this.entityToPrisma(entity[key]),
+                        };
+                    }
+                }
+                else {
+                    prismaSchema[key] = {
+                        update: this.entityToPrisma(entity[key]),
+                    };
+                }
             }
             else {
                 prismaSchema[key] = entity[key];
@@ -180,7 +198,7 @@ class RepositoryBase {
     }
     findManySchema(where, pagination) {
         return {
-            include: this._include,
+            include: this.getInclude(),
             where,
             orderBy: pagination?.generateOrderBy(),
             skip: pagination?.skip(),
@@ -203,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.3",
+  "version": "1.12.5",
   "description": "",
   "repository": {
     "type": "git",