@koalarx/nest 1.18.4 → 1.18.6

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

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

package/core/controllers/pagination.request.d.ts

@@ -1,4 +1,4 @@
-import { QueryDirectionType } from '..';
+import type { QueryDirectionType } from '..';
 export type PaginatedRequestProps<T extends PaginationRequest> = Omit<{
     [K in keyof T as T[K] extends Function ? never : K]: T[K];
 }, '_id'>;

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

@@ -26,8 +26,8 @@ export declare abstract class RepositoryBase<TEntity extends EntityBase<TEntity>
     protected findMany<T>(where: T, pagination?: PaginationDto): Promise<TEntity[]>;
     protected findManyAndCount<T>(where: T, pagination?: PaginationDto): Promise<ListResponse<TEntity>>;
     protected saveChanges<TWhere = any>(entity: TEntity, updateWhere?: TWhere): Promise<TEntity>;
-    protected remove<TWhere = any>(where: TWhere, externalServices?: Promise<any>): Promise<any>;
-    protected removeMany<TWhere = any>(where: TWhere, externalServices?: Promise<any>): Promise<void>;
+    protected remove<TWhere = any>(where: TWhere, externalServices?: Promise<any>, notCascadeEntityProps?: Array<keyof TEntity>): Promise<any>;
+    protected removeMany<TWhere = any>(where: TWhere, externalServices?: Promise<any>, notCascadeEntityProps?: Array<keyof TEntity>): Promise<void>;
     private listToRelationActionList;
     private entityToPrisma;
     private context;

package/core/database/repository.base.js

@@ -98,14 +98,15 @@ class RepositoryBase {
             })).then(() => this.findFirst(where));
         }
     }
-    async remove(where, externalServices) {
+    async remove(where, externalServices, notCascadeEntityProps) {
         const entity = await this.findUnique(where);
         if (!entity) {
             throw new Error(`Entity not found for where: ${JSON.stringify(where)}`);
         }
         const relationEntity = [];
         Object.keys(entity).forEach((key) => {
-            if (entity[key] instanceof entity_base_1.EntityBase) {
+            if (entity[key] instanceof entity_base_1.EntityBase &&
+                !notCascadeEntityProps?.includes(key)) {
                 relationEntity.push(entity[key]);
             }
         });
@@ -115,7 +116,7 @@ class RepositoryBase {
             .delete({ where })
             .then((response) => Promise.all(relationEntity.map((entity) => this.orphanRemoval(client, entity))).then(() => response))));
     }
-    async removeMany(where, externalServices) {
+    async removeMany(where, externalServices, notCascadeEntityProps) {
         const entities = await this.findMany(where);
         if (entities.length === 0) {
             throw new Error(`Entities not found for where: ${JSON.stringify(where)}`);
@@ -126,7 +127,8 @@ class RepositoryBase {
             const relationEntity = [];
             for (const entity of entities) {
                 Object.keys(entity).forEach((key) => {
-                    if (entity[key] instanceof entity_base_1.EntityBase) {
+                    if (entity[key] instanceof entity_base_1.EntityBase &&
+                        !notCascadeEntityProps?.includes(key)) {
                         relationEntity.push(entity[key]);
                     }
                 });

package/core/dtos/pagination.dto.d.ts

@@ -1,4 +1,4 @@
-import { QueryDirectionType } from '..';
+import type { QueryDirectionType } from '..';
 export declare class PaginationDto {
     page?: number;
     limit?: number;

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

@@ -10,6 +10,7 @@ interface AutoMappingGetContext {
 export declare class AutoMappingList {
     private static _mappedPropList;
     private static _mappingProfileList;
+    private static initializeLists;
     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;

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

@@ -6,9 +6,18 @@ const auto_mapping_class_context_1 = require("./auto-mapping-class-context");
 const auto_mapping_context_1 = require("./auto-mapping-context");
 const find_on_list_1 = require("../utils/find-on-list");
 class AutoMappingList {
-    static _mappedPropList = new list_1.List(auto_mapping_class_context_1.AutoMappingClassContext);
-    static _mappingProfileList = new list_1.List(auto_mapping_context_1.AutoMappingContext);
+    static _mappedPropList;
+    static _mappingProfileList;
+    static initializeLists() {
+        if (!this._mappedPropList) {
+            this._mappedPropList = new list_1.List(auto_mapping_class_context_1.AutoMappingClassContext);
+        }
+        if (!this._mappingProfileList) {
+            this._mappingProfileList = new list_1.List(auto_mapping_context_1.AutoMappingContext);
+        }
+    }
     static add(source, target, ...forMember) {
+        this.initializeLists();
         this._mappingProfileList.add(new auto_mapping_context_1.AutoMappingContext(source, target, forMember));
         this._mappedPropList.add(new auto_mapping_class_context_1.AutoMappingClassContext(source));
         this._mappedPropList.add(new auto_mapping_class_context_1.AutoMappingClassContext(target));
@@ -16,6 +25,7 @@ class AutoMappingList {
         this.addExtendedPropsIntoSubClass(target);
     }
     static get(source, target) {
+        this.initializeLists();
         return {
             mapContext: (0, find_on_list_1.findOnList)(this._mappingProfileList, (mp) => mp.source.name === source.name && mp.target.name === target.name, (mp) => Object.getPrototypeOf(mp.source.prototype.constructor) === source &&
                 mp.target.name === target.name),
@@ -24,22 +34,23 @@ class AutoMappingList {
         };
     }
     static getSourceByName(sourceName) {
+        this.initializeLists();
         return this._mappedPropList.find((mp) => mp.source.name === sourceName)
             ?.source;
     }
     static getPropDefinitions(source, propName) {
-        return this._mappedPropList
-            .find((mp) => mp.source.name === source.name)
-            ?.props.find((prop) => prop.name === propName);
+        this.initializeLists();
+        return this._mappedPropList.find((mp) => mp.source.name === source.name)?.props.find((prop) => prop.name === propName);
     }
     static getTargets(source) {
-        return this._mappingProfileList
-            .filter((mp) => mp.source.name === source.name ||
+        this.initializeLists();
+        return this._mappingProfileList.filter((mp) => mp.source.name === source.name ||
             Object.getPrototypeOf(mp.source.prototype.constructor) === source)
             .map((mp) => mp.target)
             .toArray();
     }
     static addMappedProp(source, propName) {
+        this.initializeLists();
         let mappedClass = this._mappedPropList.find((mp) => mp.source.name === source.name);
         if (!mappedClass) {
             mappedClass = new auto_mapping_class_context_1.AutoMappingClassContext(source);
@@ -61,6 +72,7 @@ class AutoMappingList {
         });
     }
     static addExtendedPropsIntoSubClass(source) {
+        this.initializeLists();
         const mappedExtendedClass = this._mappedPropList.find((mp) => mp.source === Object.getPrototypeOf(source.prototype.constructor));
         if (mappedExtendedClass) {
             const mappedClass = this._mappedPropList.find((mp) => mp.source.name === source.name);

package/package.json

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

package/test/utils/create-e2e-database.d.ts

@@ -1,2 +1,2 @@
 import 'dotenv/config';
-export declare function createE2EDatabase(): `${string}-${string}-${string}-${string}-${string}`;
+export declare function createE2EDatabase(runtime?: 'node' | 'bun'): Promise<`${string}-${string}-${string}-${string}-${string}`>;

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

@@ -4,6 +4,7 @@ exports.createE2EDatabase = createE2EDatabase;
 require("dotenv/config");
 const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = require("node:crypto");
+const pg_1 = require("pg");
 function generateUniqueDatabaseURL() {
     const schemaId = (0, node_crypto_1.randomUUID)();
     if (!process.env.DATABASE_URL) {
@@ -16,11 +17,31 @@ function generateUniqueDatabaseURL() {
         schemaId,
     };
 }
-function createE2EDatabase() {
+async function createE2EDatabase(runtime = 'node') {
     const { url, schemaId } = generateUniqueDatabaseURL();
     process.env.DATABASE_URL = url;
     process.env.DIRECT_URL = url;
     process.env.PRISMA_SCHEMA_DISABLE_ADVISORY_LOCK = 'true';
-    (0, node_child_process_1.execSync)('npx prisma migrate deploy', {});
+    try {
+        const baseUrl = new URL(process.env.DATABASE_URL);
+        baseUrl.pathname = '/postgres';
+        const pool = new pg_1.Pool({ connectionString: baseUrl.toString() });
+        try {
+            await pool.query(`CREATE DATABASE "${schemaId}"`);
+        }
+        finally {
+            await pool.end();
+        }
+        const env = { ...process.env, DATABASE_URL: url, DIRECT_URL: url };
+        (0, node_child_process_1.execSync)(`${runtime}x prisma migrate deploy`, {
+            cwd: process.cwd(),
+            env,
+            stdio: 'inherit',
+        });
+    }
+    catch (error) {
+        console.error('Erro ao criar banco de dados e2e:', error);
+        throw error;
+    }
     return schemaId;
 }

package/test/utils/drop-e2e-database.d.ts

@@ -1,2 +1,2 @@
 import 'dotenv/config';
-export declare function dropE2EDatabase(schemaId: string): Promise<number>;
+export declare function dropE2EDatabase(schemaId: string): Promise<void>;

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

@@ -1,17 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dropE2EDatabase = dropE2EDatabase;
-const adapter_pg_1 = require("@prisma/adapter-pg");
 require("dotenv/config");
 const pg_1 = require("pg");
-const client_1 = require("../../../../../prisma/generated/client");
-function dropE2EDatabase(schemaId) {
+async function dropE2EDatabase(schemaId) {
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    const baseUrl = new URL(process.env.DATABASE_URL || '');
+    baseUrl.pathname = '/postgres';
     const pool = new pg_1.Pool({
-        connectionString: process.env.DATABASE_URL,
+        connectionString: baseUrl.toString(),
+        idleTimeoutMillis: 100,
     });
-    const adapter = new adapter_pg_1.PrismaPg(pool);
-    const prisma = new client_1.PrismaClient({ adapter });
-    return prisma
-        .$executeRawUnsafe(`DROP SCHEMA IF EXISTS "${schemaId}" CASCADE`)
-        .finally(() => prisma.$disconnect());
+    try {
+        await pool.query(`
+      SELECT pg_terminate_backend(pg_stat_activity.pid)
+      FROM pg_stat_activity
+      WHERE pg_stat_activity.datname = '${schemaId}'
+      AND pid <> pg_backend_pid()
+    `);
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        await pool.query(`DROP DATABASE IF EXISTS "${schemaId}"`);
+    }
+    catch {
+    }
+    finally {
+        try {
+            await pool.end();
+        }
+        catch {
+        }
+    }
 }