@koalarx/nest 1.1.0 → 1.2.2

package/core/constants/query-params.d.ts

@@ -1,4 +1,4 @@
-import { QueryDirectionType } from "..";
+import { QueryDirectionType } from '..';
 export declare const QUERY_FILTER_PARAMS: {
     direction: QueryDirectionType;
     page: number;

package/core/controllers/schemas/boolean.schema.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.booleanSchema = void 0;
 const zod_1 = require("zod");
 function booleanSchema() {
-    return zod_1.z.coerce
-        .string()
-        .transform((value) => {
+    return zod_1.z.coerce.string().transform((value) => {
         if (value !== undefined) {
             return value === 'true';
         }

package/core/database/entity.base.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityBase = void 0;
+const auto_mapping_list_1 = require("../mapping/auto-mapping-list");
 const list_1 = require("../utils/list");
 class EntityBase {
     _id;
     automap(props) {
         if (props) {
             for (const key of Object.keys(props)) {
+                const propDefinitions = auto_mapping_list_1.AutoMappingList.getPropDefinitions(this.constructor.prototype.constructor, key);
+                const EntityOnPropKey = auto_mapping_list_1.AutoMappingList.getSourceByName(propDefinitions?.type);
                 if (Array.isArray(props[key]) && this[key] instanceof list_1.List) {
                     let value = props[key];
                     if (this[key].entityType) {
@@ -18,12 +21,12 @@ class EntityBase {
                     }
                     this[key].setList(value);
                 }
-                else if (this[key] instanceof EntityBase) {
-                    const entity = new this[key].constructor();
+                else if (EntityOnPropKey) {
+                    const entity = new EntityOnPropKey();
                     entity.automap(props[key]);
                     this[key] = entity;
                 }
-                else {
+                else if (propDefinitions) {
                     if (key === 'id') {
                         this._id = props[key];
                     }

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

@@ -17,7 +17,7 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     protected _context: PrismaTransactionalClient;
     private readonly _modelName;
     private readonly _include?;
-    constructor({ context, modelName, include, }: RepositoryInitProps<TEntity>);
+    constructor({ context, modelName, include }: RepositoryInitProps<TEntity>);
     withTransaction(fn: (prisma: PrismaTransactionalClient) => Promise<any>): Promise<any>;
     protected findById(id: IComparableId): Promise<TEntity | null>;
     protected findFirst<T>(where: T): Promise<any>;
@@ -25,11 +25,12 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     protected findManyAndCount<T>(where: T, pagination?: PaginationDto): Promise<ListResponse<TEntity>>;
     protected insert(entity: TEntity): any;
     protected edit<TWhere = any>(entity: TEntity, updateWhere?: TWhere): Promise<any>;
-    protected remove<TWhere = any>(where: TWhere): any;
+    protected remove<TWhere = any>(where: TWhere): Promise<any>;
     private listToRelationActionList;
     private entityToPrisma;
     private context;
     private findManySchema;
     private createEntity;
+    private orphanRemoval;
 }
 export {};

package/core/database/repository.base.js

@@ -10,7 +10,7 @@ class RepositoryBase {
     _context;
     _modelName;
     _include;
-    constructor({ context, modelName, include, }) {
+    constructor({ context, modelName, include }) {
         this._context = context;
         this._modelName = modelName;
         this._include = include;
@@ -60,13 +60,13 @@ class RepositoryBase {
         return { items: [], count };
     }
     insert(entity) {
-        const prismaEntity = this.entityToPrisma(entity);
+        const prismaEntity = this.entityToPrisma(entity, true);
         return this.context().create({
             data: prismaEntity,
         });
     }
     edit(entity, updateWhere) {
-        const prismaEntity = this.entityToPrisma(entity);
+        const prismaEntity = this.entityToPrisma(entity, false);
         return this.withTransaction((client) => this.context(client)
             .update({
             where: updateWhere ?? { id: entity._id },
@@ -80,8 +80,17 @@ class RepositoryBase {
             ]);
         }));
     }
-    remove(where) {
-        return this.context().delete({ where });
+    async remove(where) {
+        const entity = await this.findFirst(where);
+        const relationEntity = [];
+        Object.keys(entity).forEach((key) => {
+            if (entity[key] instanceof entity_base_1.EntityBase) {
+                relationEntity.push(entity[key]);
+            }
+        });
+        return this.withTransaction((client) => this.context(client)
+            .delete({ where })
+            .then((response) => Promise.all(relationEntity.map((entity) => this.orphanRemoval(client, entity))).then(() => response)));
     }
     listToRelationActionList(entity) {
         const relationUpdates = [];
@@ -102,7 +111,7 @@ class RepositoryBase {
                             modelName: (0, string_1.toCamelCase)(modelName),
                             schema: {
                                 where: { id: item._id },
-                                data: this.entityToPrisma(item),
+                                data: this.entityToPrisma(item, false),
                             },
                         });
                     });
@@ -111,10 +120,10 @@ class RepositoryBase {
         });
         return { relationUpdates, relationDeletes };
     }
-    entityToPrisma(entity) {
+    entityToPrisma(entity, isCreate) {
         const prismaSchema = {};
         Object.keys(entity)
-            .filter((key) => key !== 'id' && key !== '_id')
+            .filter((key) => !['id', '_id'].includes(key))
             .filter((key) => !(entity[key] instanceof Function))
             .forEach((key) => {
             if (entity[key] instanceof list_1.List) {
@@ -122,14 +131,16 @@ class RepositoryBase {
                     prismaSchema[key] = {
                         createMany: {
                             data: entity[key].toArray('added').map((item) => {
-                                return this.entityToPrisma(item);
+                                return this.entityToPrisma(item, isCreate);
                             }),
                         },
                     };
                 }
             }
             else if (entity[key] instanceof entity_base_1.EntityBase) {
-                prismaSchema[key] = this.entityToPrisma(entity[key]);
+                prismaSchema[key] = isCreate
+                    ? { create: this.entityToPrisma(entity[key], isCreate) }
+                    : { update: this.entityToPrisma(entity[key], isCreate) };
             }
             else {
                 prismaSchema[key] = entity[key];
@@ -160,5 +171,12 @@ class RepositoryBase {
         entity.automap(data);
         return entity;
     }
+    orphanRemoval(client, entity) {
+        const where = {};
+        Object.keys(entity)
+            .filter((key) => key === 'id' || key.includes('Id'))
+            .forEach((key) => (where[key] = entity[key]));
+        return client[(0, string_1.toCamelCase)(entity.constructor.name)].delete({ where });
+    }
 }
 exports.RepositoryBase = RepositoryBase;

package/core/koala-app.js

@@ -56,13 +56,15 @@ class KoalaApp {
     useDoc(config) {
         const credentials = {
             username: process.env.SWAGGER_USERNAME ?? '',
-            password: process.env.SWAGGER_PASSWORD ?? ''
+            password: process.env.SWAGGER_PASSWORD ?? '',
         };
-        if (env_config_1.EnvConfig.isEnvDevelop && credentials.username && credentials.password) {
+        if (env_config_1.EnvConfig.isEnvDevelop &&
+            credentials.username &&
+            credentials.password) {
             this.app.use([config.endpoint], expressBasicAuth({
                 challenge: true,
                 users: {
-                    [credentials.username]: credentials.password
+                    [credentials.username]: credentials.password,
                 },
             }));
         }

package/core/koala-global-vars.d.ts

@@ -1,5 +1,5 @@
-import { Type } from "@nestjs/common";
-import { PrismaTransactionalClient } from "./database/prisma-transactional-client";
+import { Type } from '@nestjs/common';
+import { PrismaTransactionalClient } from './database/prisma-transactional-client';
 export declare class KoalaGlobalVars {
     static appName: string;
     static internalUserName: string;

package/core/koala-nest-database.module.d.ts

@@ -1,12 +1,13 @@
 import { DynamicModule, InjectionToken, Type } from '@nestjs/common';
 import { RepositoryBase } from '../core/database/repository.base';
 export declare const PRISMA_TOKEN = "PRISMA_SERVICE_TOKEN";
-export interface KoalaNestDatabaseRepositoryConfig {
+export interface KoalaNestDatabaseProviderConfig<T> {
     interface: InjectionToken;
-    class: Type<RepositoryBase<any>>;
+    class: Type<T>;
 }
 interface KoalaNestDatabaseModuleConfig {
-    repositories: KoalaNestDatabaseRepositoryConfig[];
+    repositories: KoalaNestDatabaseProviderConfig<RepositoryBase<any>>[];
+    services: KoalaNestDatabaseProviderConfig<any>[];
 }
 export declare class KoalaNestDatabaseModule {
     static register(config: KoalaNestDatabaseModuleConfig): DynamicModule;

package/core/koala-nest-database.module.js

@@ -19,6 +19,11 @@ let KoalaNestDatabaseModule = exports.KoalaNestDatabaseModule = KoalaNestDatabas
             provide: repository.interface,
             useClass: repository.class,
         })) ?? [];
+        const servicesToExport = config.services?.map((service) => service.interface) ?? [];
+        const servicesToProvide = config.services?.map((service) => ({
+            provide: service.interface,
+            useClass: service.class,
+        })) ?? [];
         return {
             module: KoalaNestDatabaseModule_1,
             providers: [
@@ -27,9 +32,10 @@ let KoalaNestDatabaseModule = exports.KoalaNestDatabaseModule = KoalaNestDatabas
                     useClass: prisma_service_1.PrismaService,
                 },
                 ...repositoriesToProvide,
+                ...servicesToProvide,
                 env_service_1.EnvService,
             ],
-            exports: [exports.PRISMA_TOKEN, ...repositoriesToExport],
+            exports: [exports.PRISMA_TOKEN, ...repositoriesToExport, ...servicesToExport],
         };
     }
 };

package/core/mapping/auto-mapping-list.d.ts

@@ -12,6 +12,13 @@ export declare class AutoMappingList {
     private static _mappingProfileList;
     static add(source: Type<any>, target: Type<any>, ...forMember: ForMemberDefinition<any, any>): void;
     static get(source: Type<any>, target: Type<any>): AutoMappingGetContext;
+    static getSourceByName(sourceName: string): Type<any> | undefined;
+    static getPropDefinitions(source: Type<any>, propName: string): {
+        name: string;
+        type: any;
+        compositionType?: Type<any> | undefined;
+        compositionAction?: "onlySet" | "addTo" | undefined;
+    } | null | undefined;
     static getTargets(source: Type<any>): Type<any>[];
     static addMappedProp(source: Type<any>, propName: string): void;
 }

package/core/mapping/auto-mapping-list.js

@@ -19,6 +19,15 @@ class AutoMappingList {
             propTargetContext: this._mappedPropList.find((mp) => mp.source === target),
         };
     }
+    static getSourceByName(sourceName) {
+        return this._mappingProfileList.find((mp) => mp.source.name === sourceName)
+            ?.source;
+    }
+    static getPropDefinitions(source, propName) {
+        return this._mappedPropList
+            .find((mp) => mp.source === source)
+            ?.props.find((prop) => prop.name === propName);
+    }
     static getTargets(source) {
         return this._mappingProfileList
             .filter((mp) => mp.source === source)

package/core/mapping/auto-mapping.decorator.js

@@ -17,7 +17,8 @@ function AutoMap(config) {
                     customMetadata = Array;
                 }
             }
-            if (!Reflect.getMetadata('design:type', target, propertyKey) || !isArray) {
+            if (!Reflect.getMetadata('design:type', target, propertyKey) ||
+                !isArray) {
                 Reflect.defineMetadata('design:type', customMetadata, target, propertyKey);
             }
         }

package/core/mapping/auto-mapping.service.js

@@ -46,6 +46,12 @@ let AutoMappingService = exports.AutoMappingService = class AutoMappingService {
                     else if (arrayToList) {
                         mappedValue = this.mapArrayToList(value, compositionType, compositionAction === 'onlySet');
                     }
+                    else {
+                        const propSourceInstance = this._contextList.getSourceByName(propSource.type);
+                        if (propSourceInstance) {
+                            mappedValue = this.mapNestedProp(value, propSourceInstance);
+                        }
+                    }
                     mappedTarget[targetProp.name] = mappedValue;
                 }
             }
@@ -65,9 +71,7 @@ let AutoMappingService = exports.AutoMappingService = class AutoMappingService {
         }
     }
     mapListToArray(value) {
-        return value
-            .toArray()
-            .map((item) => {
+        return value.toArray().map((item) => {
             const entityOnList = value.entityType?.prototype.constructor;
             if (entityOnList) {
                 return this.mapNestedProp(item, entityOnList) ?? {};

package/core/utils/assing-object.d.ts

@@ -1,2 +1,2 @@
-import { Type } from "@nestjs/common";
-export declare function assignObject<T>(target: Type<T>, source: T): T;
+import { Type } from '@nestjs/common';
+export declare function assignObject<T>(Target: Type<T>, source: T): T;

package/core/utils/assing-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assignObject = void 0;
-function assignObject(target, source) {
-    return Object.assign(new target(), source);
+function assignObject(Target, source) {
+    return Object.assign(new Target(), source);
 }
 exports.assignObject = assignObject;

package/core/utils/list.js

@@ -46,6 +46,7 @@ class List {
             this._list.splice(index, 1);
             if (!this.contains(item, this._removedItemsList)) {
                 this._removedItemsList.push(item);
+                console.log(this._removedItemsList);
             }
         }
         return this;

package/core/utils/list.spec.js

@@ -1,6 +1,16 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const entity_base_1 = require("../database/entity.base");
+const auto_mapping_decorator_1 = require("../mapping/auto-mapping.decorator");
 const list_1 = require("./list");
 class EntityTest extends entity_base_1.EntityBase {
     id;
@@ -10,6 +20,14 @@ class EntityTest extends entity_base_1.EntityBase {
         this.automap(props);
     }
 }
+__decorate([
+    (0, auto_mapping_decorator_1.AutoMap)(),
+    __metadata("design:type", Number)
+], EntityTest.prototype, "id", void 0);
+__decorate([
+    (0, auto_mapping_decorator_1.AutoMap)(),
+    __metadata("design:type", Number)
+], EntityTest.prototype, "value", void 0);
 describe('List test', () => {
     let entity;
     beforeEach(() => {

package/env/env.service.d.ts

@@ -1,14 +1,7 @@
 import { ConfigService } from '@nestjs/config';
 import { Env } from './env';
-export declare class EnvService {
+export declare class EnvService<TEnv = Env> {
     private readonly configService;
-    constructor(configService: ConfigService<Env, true>);
-    get<T extends keyof Env>(key: T): import("@nestjs/config").PathValue<{
-        NODE_ENV: "test" | "develop" | "staging" | "production";
-        PORT: number;
-        PRISMA_QUERY_LOG: boolean;
-        REDIS_CONNECTION_STRING: string;
-        SWAGGER_USERNAME?: string | undefined;
-        SWAGGER_PASSWORD?: string | undefined;
-    }, T>;
+    constructor(configService: ConfigService<TEnv, true>);
+    get<T extends keyof TEnv>(key: T): (string extends infer T_1 ? T_1 extends string ? T_1 extends keyof TEnv ? string extends infer T_2 ? T_2 extends string ? T_2 extends import("@nestjs/config").Path<TEnv[T_1]> ? import("@nestjs/config").PathValue<TEnv[T_1], T_2> : never : never : never : never : never : never) | (any extends infer T_3 ? T_3 extends any ? T_3 extends keyof TEnv ? TEnv[T_3] : never : never : never);
 }

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { Type } from "@nestjs/common";
+import { Type } from '@nestjs/common';
 interface KoalaAppTestDependenciesConfig {
     dependencies: any[];
 }

package/test/repositories/in-memory-base.repository.js

@@ -29,9 +29,7 @@ class InMemoryBaseRepository {
         };
     }
     async insert(item) {
-        const id = this.typeId === 'number'
-            ? this.getNewId()
-            : (0, node_crypto_1.randomUUID)();
+        const id = this.typeId === 'number' ? this.getNewId() : (0, node_crypto_1.randomUUID)();
         item.automap({ ...item, id });
         this.items.push(item);
         return { id: item._id };
@@ -51,7 +49,8 @@ class InMemoryBaseRepository {
     }
     getNewId() {
         return this.typeId === 'number'
-            ? (0, array_1.klArray)(this.items).orderBy('_id', true).getValue()[0]?._id ?? 0 + 1
+            ? (0, array_1.klArray)(this.items).orderBy('_id', true).getValue()[0]
+                ?._id ?? 0 + 1
             : (0, node_crypto_1.randomUUID)();
     }
 }

package/test/utils/create-e2e-database.js

@@ -13,7 +13,7 @@ function generateUniqueDatabaseURL() {
     url.searchParams.set('schema', schemaId);
     return {
         url: url.toString(),
-        schemaId
+        schemaId,
     };
 }
 function createE2EDatabase() {