@flusys/nestjs-core 6.0.0-rc.1 → 6.0.1

package/cjs/migration/datasource.factory.js

@@ -28,17 +28,7 @@ function createMigrationDataSource(options) {
         console.log(`\n💡 Multi-tenant mode. Available tenants:`);
         config.tenants.forEach((t)=>console.log(`   - TENANT_ID=${t.id} → ${t.database}`));
     }
-    const dbConfig = tenant ? {
-        ...config.defaultDatabaseConfig,
-        host: tenant.host ?? config.defaultDatabaseConfig.host,
-        port: tenant.port ?? config.defaultDatabaseConfig.port,
-        username: tenant.username ?? config.defaultDatabaseConfig.username,
-        password: tenant.password ?? config.defaultDatabaseConfig.password,
-        database: tenant.database
-    } : {
-        ...config.defaultDatabaseConfig,
-        database
-    };
+    const dbConfig = (0, _datasourceconfigbuilder.resolveDatabaseConnection)(config, tenantId);
     const entities = (0, _datasourceconfigbuilder.resolveEntities)(config, tenantConfig);
     const dsOptions = (0, _datasourceconfigbuilder.buildDataSourceOptions)(dbConfig, entities, (0, _datasourceconfigbuilder.getMigrationsGlobPattern)(config.migrationsPath, tenantId), config.migrationsTableName);
     return new _typeorm.DataSource({

package/cjs/migration/index.js

@@ -24,6 +24,9 @@ _export(exports, {
     get migrationStatus () {
         return _migrationrunner.migrationStatus;
     },
+    get resetDatabase () {
+        return _migrationrunner.resetDatabase;
+    },
     get revertMigration () {
         return _migrationrunner.revertMigration;
     },

package/cjs/migration/migration.cli.js

@@ -64,6 +64,7 @@ Commands:
   generate --name=<Name>   Generate migration
   run                      Run pending migrations
   revert                   Revert last migration
+  reset                    Drop db, wipe migration files, recreate db, generate + run initial migration (dev only)
   status                   Show migration status
   run:all                  Run for all tenants
   revert:all               Revert for all tenants
@@ -72,6 +73,7 @@ Commands:
 Options:
   --config=<path>    Migration config file (default: src/persistence/migration.config.ts)
   --name=<Name>      Migration name (for generate command)
+  --force            Required to run 'reset' when MODE is not 'dev'
 
 Environment:
   TENANT_ID          Target tenant (default: uses default database)
@@ -82,6 +84,7 @@ Examples:
   npm run migration -- generate --name=CreateUsers --config=src/persistence/migration.config.ts
   TENANT_ID=tenant1 npm run migration run
   npm run migration run:all
+  npm run migration reset
 `);
 }
 function parseArgs() {
@@ -90,6 +93,7 @@ function parseArgs() {
     let name;
     let configPath;
     let datasourcePath;
+    let force = false;
     for(let i = 0; i < args.length; i++){
         const arg = args[i];
         if (arg.startsWith('--name=')) {
@@ -98,6 +102,8 @@ function parseArgs() {
             configPath = arg.split('=')[1];
         } else if (arg.startsWith('--datasource=')) {
             datasourcePath = arg.split('=')[1];
+        } else if (arg === '--force') {
+            force = true;
         } else if (!arg.startsWith('-') && !command) {
             command = arg;
         }
@@ -106,7 +112,8 @@ function parseArgs() {
         command,
         name,
         configPath,
-        datasourcePath
+        datasourcePath,
+        force
     };
 }
 async function loadConfig(configPath) {
@@ -117,7 +124,7 @@ async function loadConfig(configPath) {
     return module.migrationConfig || module.default?.migrationConfig || module;
 }
 async function runMigrationCli(configOrPath) {
-    const { command, name, configPath: argConfigPath, datasourcePath } = parseArgs();
+    const { command, name, configPath: argConfigPath, datasourcePath, force } = parseArgs();
     const tenantId = _config.envConfig.getTenantId() ?? undefined;
     // npm passes --name=X as npm_config_name
     const migrationName = _config.envConfig.tryGetValue('npm_config_name') || _config.envConfig.tryGetValue('MIGRATION_NAME') || name;
@@ -200,6 +207,19 @@ async function runMigrationCli(configOrPath) {
                 if (!result.success) process.exit(1);
                 break;
             }
+        case 'reset':
+            {
+                if (_config.envConfig.isProduction() && !force) {
+                    console.error('❌ Refusing to reset database outside dev mode. Pass --force to override.');
+                    process.exit(1);
+                }
+                const result = await (0, _migrationrunner.resetDatabase)(config, tenantId);
+                if (!result.success) process.exit(1);
+                await (0, _migrationrunner.generateMigration)(config, migrationName || 'Init', tenantId, dsPath);
+                const runResult = await (0, _migrationrunner.runMigrations)(config, tenantId);
+                if (!runResult.success) process.exit(1);
+                break;
+            }
         case 'status':
             await (0, _migrationrunner.migrationStatus)(config, tenantId);
             break;

package/cjs/migration/migration.runner.js

@@ -18,6 +18,9 @@ _export(exports, {
     get migrationStatus () {
         return migrationStatus;
     },
+    get resetDatabase () {
+        return resetDatabase;
+    },
     get revertMigration () {
         return revertMigration;
     },
@@ -31,6 +34,7 @@ _export(exports, {
 const _child_process = require("child_process");
 const _fs = /*#__PURE__*/ _interop_require_wildcard(require("fs"));
 const _path = /*#__PURE__*/ _interop_require_wildcard(require("path"));
+const _typeorm = require("typeorm");
 const _config = require("../config");
 const _utils = require("../utils");
 const _datasourcefactory = require("./datasource.factory");
@@ -166,6 +170,71 @@ async function revertMigration(config, tenantId) {
         return {};
     });
 }
+function clearMigrationFiles(basePath, tenantId, label) {
+    const folder = (0, _utils.getMigrationsFolderPath)(basePath, tenantId);
+    if (!_fs.existsSync(folder)) return;
+    const files = _fs.readdirSync(folder).filter((f)=>f.endsWith('.ts') || f.endsWith('.js'));
+    files.forEach((file)=>_fs.rmSync(_path.join(folder, file)));
+    console.log(`${label} ✓ Removed ${files.length} migration file(s) from ${folder}`);
+}
+async function dropAndRecreateDatabase(dbConfig, label) {
+    const { type, database } = dbConfig;
+    if (type === 'sqlite') {
+        if (database && _fs.existsSync(database)) _fs.rmSync(database);
+        console.log(`${label} ✓ Deleted sqlite file`);
+        return;
+    }
+    if (type !== 'mysql' && type !== 'mariadb' && type !== 'postgres') {
+        throw new Error(`Database reset is not supported for type '${type}'`);
+    }
+    const adminDs = new _typeorm.DataSource({
+        type,
+        host: dbConfig.host,
+        port: dbConfig.port,
+        username: dbConfig.username,
+        password: dbConfig.password,
+        database: type === 'postgres' ? 'postgres' : undefined
+    });
+    await adminDs.initialize();
+    try {
+        if (type === 'postgres') {
+            await adminDs.query(`SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1 AND pid <> pg_backend_pid()`, [
+                database
+            ]);
+            await adminDs.query(`DROP DATABASE IF EXISTS "${database}"`);
+            await adminDs.query(`CREATE DATABASE "${database}"`);
+        } else {
+            await adminDs.query(`DROP DATABASE IF EXISTS \`${database}\``);
+            await adminDs.query(`CREATE DATABASE \`${database}\` CHARACTER SET utf8mb4`);
+        }
+        console.log(`${label} ✓ Database '${database}' dropped and recreated`);
+    } finally{
+        await adminDs.destroy();
+    }
+}
+async function resetDatabase(config, tenantId) {
+    const { database } = (0, _utils.getDatabaseForTenant)(config, tenantId);
+    const label = getLabel(tenantId);
+    try {
+        clearMigrationFiles(config.migrationsPath, tenantId, label);
+        const dbConfig = (0, _utils.resolveDatabaseConnection)(config, tenantId);
+        await dropAndRecreateDatabase(dbConfig, label);
+        return {
+            tenantId,
+            database,
+            success: true
+        };
+    } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error(`${label} ✗ Failed: ${errorMessage}`);
+        return {
+            tenantId,
+            database,
+            success: false,
+            error: errorMessage
+        };
+    }
+}
 async function migrationStatus(config, tenantId) {
     return withDataSource(config, tenantId, async (ds, label)=>{
         const hasPending = await ds.showMigrations();

package/cjs/utils/datasource-config.builder.js

@@ -24,6 +24,9 @@ _export(exports, {
     get getMigrationsGlobPattern () {
         return getMigrationsGlobPattern;
     },
+    get resolveDatabaseConnection () {
+        return resolveDatabaseConnection;
+    },
     get resolveEntities () {
         return resolveEntities;
     }
@@ -75,6 +78,20 @@ function getDatabaseForTenant(config, tenantId) {
         tenantConfig: defaultTenantConfig
     };
 }
+function resolveDatabaseConnection(config, tenantId) {
+    const { database, tenant } = getDatabaseForTenant(config, tenantId);
+    return tenant ? {
+        ...config.defaultDatabaseConfig,
+        host: tenant.host ?? config.defaultDatabaseConfig.host,
+        port: tenant.port ?? config.defaultDatabaseConfig.port,
+        username: tenant.username ?? config.defaultDatabaseConfig.username,
+        password: tenant.password ?? config.defaultDatabaseConfig.password,
+        database: tenant.database
+    } : {
+        ...config.defaultDatabaseConfig,
+        database
+    };
+}
 function resolveEntities(config, tenantConfig) {
     if (typeof config.entities === 'function') {
         return config.entities(tenantConfig);

package/fesm/migration/datasource.factory.js

@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
 import { SnakeNamingStrategy } from 'typeorm-naming-strategies';
-import { buildDataSourceOptions, getDatabaseForTenant, getMigrationsGlobPattern, resolveEntities } from '../utils/datasource-config.builder';
+import { buildDataSourceOptions, getDatabaseForTenant, getMigrationsGlobPattern, resolveDatabaseConnection, resolveEntities } from '../utils/datasource-config.builder';
 export function createMigrationDataSource(options) {
     const { config, tenantId } = options;
     const { database, tenant, tenantConfig } = getDatabaseForTenant(config, tenantId);
@@ -10,17 +10,7 @@ export function createMigrationDataSource(options) {
         console.log(`\n💡 Multi-tenant mode. Available tenants:`);
         config.tenants.forEach((t)=>console.log(`   - TENANT_ID=${t.id} → ${t.database}`));
     }
-    const dbConfig = tenant ? {
-        ...config.defaultDatabaseConfig,
-        host: tenant.host ?? config.defaultDatabaseConfig.host,
-        port: tenant.port ?? config.defaultDatabaseConfig.port,
-        username: tenant.username ?? config.defaultDatabaseConfig.username,
-        password: tenant.password ?? config.defaultDatabaseConfig.password,
-        database: tenant.database
-    } : {
-        ...config.defaultDatabaseConfig,
-        database
-    };
+    const dbConfig = resolveDatabaseConnection(config, tenantId);
     const entities = resolveEntities(config, tenantConfig);
     const dsOptions = buildDataSourceOptions(dbConfig, entities, getMigrationsGlobPattern(config.migrationsPath, tenantId), config.migrationsTableName);
     return new DataSource({

package/fesm/migration/index.js

@@ -1,3 +1,3 @@
 export { createMigrationDataSource, initializeDataSource } from './datasource.factory';
 export { runMigrationCli } from './migration.cli';
-export { generateMigration, runMigrations, revertMigration, migrationStatus, runForAllTenants, ensureMigrationsFolder } from './migration.runner';
+export { generateMigration, runMigrations, revertMigration, resetDatabase, migrationStatus, runForAllTenants, ensureMigrationsFolder } from './migration.runner';

package/fesm/migration/migration.cli.js

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { envConfig } from '../config';
 import { getDatabaseForTenant, getMigrationsFolderPath } from '../utils';
-import { generateMigration, migrationStatus, revertMigration, runForAllTenants, runMigrations } from './migration.runner';
+import { generateMigration, migrationStatus, resetDatabase, revertMigration, runForAllTenants, runMigrations } from './migration.runner';
 function showHelp() {
     console.log(`
 Migration CLI
@@ -13,6 +13,7 @@ Commands:
   generate --name=<Name>   Generate migration
   run                      Run pending migrations
   revert                   Revert last migration
+  reset                    Drop db, wipe migration files, recreate db, generate + run initial migration (dev only)
   status                   Show migration status
   run:all                  Run for all tenants
   revert:all               Revert for all tenants
@@ -21,6 +22,7 @@ Commands:
 Options:
   --config=<path>    Migration config file (default: src/persistence/migration.config.ts)
   --name=<Name>      Migration name (for generate command)
+  --force            Required to run 'reset' when MODE is not 'dev'
 
 Environment:
   TENANT_ID          Target tenant (default: uses default database)
@@ -31,6 +33,7 @@ Examples:
   npm run migration -- generate --name=CreateUsers --config=src/persistence/migration.config.ts
   TENANT_ID=tenant1 npm run migration run
   npm run migration run:all
+  npm run migration reset
 `);
 }
 function parseArgs() {
@@ -39,6 +42,7 @@ function parseArgs() {
     let name;
     let configPath;
     let datasourcePath;
+    let force = false;
     for(let i = 0; i < args.length; i++){
         const arg = args[i];
         if (arg.startsWith('--name=')) {
@@ -47,6 +51,8 @@ function parseArgs() {
             configPath = arg.split('=')[1];
         } else if (arg.startsWith('--datasource=')) {
             datasourcePath = arg.split('=')[1];
+        } else if (arg === '--force') {
+            force = true;
         } else if (!arg.startsWith('-') && !command) {
             command = arg;
         }
@@ -55,7 +61,8 @@ function parseArgs() {
         command,
         name,
         configPath,
-        datasourcePath
+        datasourcePath,
+        force
     };
 }
 async function loadConfig(configPath) {
@@ -66,7 +73,7 @@ async function loadConfig(configPath) {
     return module.migrationConfig || module.default?.migrationConfig || module;
 }
 export async function runMigrationCli(configOrPath) {
-    const { command, name, configPath: argConfigPath, datasourcePath } = parseArgs();
+    const { command, name, configPath: argConfigPath, datasourcePath, force } = parseArgs();
     const tenantId = envConfig.getTenantId() ?? undefined;
     // npm passes --name=X as npm_config_name
     const migrationName = envConfig.tryGetValue('npm_config_name') || envConfig.tryGetValue('MIGRATION_NAME') || name;
@@ -149,6 +156,19 @@ export async function runMigrationCli(configOrPath) {
                 if (!result.success) process.exit(1);
                 break;
             }
+        case 'reset':
+            {
+                if (envConfig.isProduction() && !force) {
+                    console.error('❌ Refusing to reset database outside dev mode. Pass --force to override.');
+                    process.exit(1);
+                }
+                const result = await resetDatabase(config, tenantId);
+                if (!result.success) process.exit(1);
+                await generateMigration(config, migrationName || 'Init', tenantId, dsPath);
+                const runResult = await runMigrations(config, tenantId);
+                if (!runResult.success) process.exit(1);
+                break;
+            }
         case 'status':
             await migrationStatus(config, tenantId);
             break;

package/fesm/migration/migration.runner.js

@@ -1,8 +1,9 @@
 import { execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
+import { DataSource } from 'typeorm';
 import { envConfig } from '../config';
-import { getActiveTenants, getDatabaseForTenant, getMigrationsFolderPath } from '../utils';
+import { getActiveTenants, getDatabaseForTenant, getMigrationsFolderPath, resolveDatabaseConnection } from '../utils';
 import { initializeDataSource } from './datasource.factory';
 function getLabel(tenantId) {
     return tenantId ? `[${tenantId}]` : '[default]';
@@ -95,6 +96,71 @@ export async function revertMigration(config, tenantId) {
         return {};
     });
 }
+function clearMigrationFiles(basePath, tenantId, label) {
+    const folder = getMigrationsFolderPath(basePath, tenantId);
+    if (!fs.existsSync(folder)) return;
+    const files = fs.readdirSync(folder).filter((f)=>f.endsWith('.ts') || f.endsWith('.js'));
+    files.forEach((file)=>fs.rmSync(path.join(folder, file)));
+    console.log(`${label} ✓ Removed ${files.length} migration file(s) from ${folder}`);
+}
+async function dropAndRecreateDatabase(dbConfig, label) {
+    const { type, database } = dbConfig;
+    if (type === 'sqlite') {
+        if (database && fs.existsSync(database)) fs.rmSync(database);
+        console.log(`${label} ✓ Deleted sqlite file`);
+        return;
+    }
+    if (type !== 'mysql' && type !== 'mariadb' && type !== 'postgres') {
+        throw new Error(`Database reset is not supported for type '${type}'`);
+    }
+    const adminDs = new DataSource({
+        type,
+        host: dbConfig.host,
+        port: dbConfig.port,
+        username: dbConfig.username,
+        password: dbConfig.password,
+        database: type === 'postgres' ? 'postgres' : undefined
+    });
+    await adminDs.initialize();
+    try {
+        if (type === 'postgres') {
+            await adminDs.query(`SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1 AND pid <> pg_backend_pid()`, [
+                database
+            ]);
+            await adminDs.query(`DROP DATABASE IF EXISTS "${database}"`);
+            await adminDs.query(`CREATE DATABASE "${database}"`);
+        } else {
+            await adminDs.query(`DROP DATABASE IF EXISTS \`${database}\``);
+            await adminDs.query(`CREATE DATABASE \`${database}\` CHARACTER SET utf8mb4`);
+        }
+        console.log(`${label} ✓ Database '${database}' dropped and recreated`);
+    } finally{
+        await adminDs.destroy();
+    }
+}
+export async function resetDatabase(config, tenantId) {
+    const { database } = getDatabaseForTenant(config, tenantId);
+    const label = getLabel(tenantId);
+    try {
+        clearMigrationFiles(config.migrationsPath, tenantId, label);
+        const dbConfig = resolveDatabaseConnection(config, tenantId);
+        await dropAndRecreateDatabase(dbConfig, label);
+        return {
+            tenantId,
+            database,
+            success: true
+        };
+    } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error(`${label} ✗ Failed: ${errorMessage}`);
+        return {
+            tenantId,
+            database,
+            success: false,
+            error: errorMessage
+        };
+    }
+}
 export async function migrationStatus(config, tenantId) {
     return withDataSource(config, tenantId, async (ds, label)=>{
         const hasPending = await ds.showMigrations();

package/fesm/utils/datasource-config.builder.js

@@ -53,6 +53,22 @@
         tenantConfig: defaultTenantConfig
     };
 }
+/**
+ * Resolve full connection details for a tenant.
+ */ export function resolveDatabaseConnection(config, tenantId) {
+    const { database, tenant } = getDatabaseForTenant(config, tenantId);
+    return tenant ? {
+        ...config.defaultDatabaseConfig,
+        host: tenant.host ?? config.defaultDatabaseConfig.host,
+        port: tenant.port ?? config.defaultDatabaseConfig.port,
+        username: tenant.username ?? config.defaultDatabaseConfig.username,
+        password: tenant.password ?? config.defaultDatabaseConfig.password,
+        database: tenant.database
+    } : {
+        ...config.defaultDatabaseConfig,
+        database
+    };
+}
 /**
  * Resolve entities based on tenant config
  */ export function resolveEntities(config, tenantConfig) {

package/migration/index.d.ts

@@ -1,3 +1,3 @@
 export { createMigrationDataSource, initializeDataSource } from './datasource.factory';
 export { runMigrationCli } from './migration.cli';
-export { generateMigration, runMigrations, revertMigration, migrationStatus, runForAllTenants, ensureMigrationsFolder, } from './migration.runner';
+export { generateMigration, runMigrations, revertMigration, resetDatabase, migrationStatus, runForAllTenants, ensureMigrationsFolder, } from './migration.runner';

package/migration/migration.runner.d.ts

@@ -3,5 +3,6 @@ export declare function ensureMigrationsFolder(basePath: string, tenantId?: stri
 export declare function generateMigration(config: IMigrationConfig, name: string, tenantId?: string, datasourcePath?: string): Promise<void>;
 export declare function runMigrations(config: IMigrationConfig, tenantId?: string): Promise<IMigrationResult>;
 export declare function revertMigration(config: IMigrationConfig, tenantId?: string): Promise<IMigrationResult>;
+export declare function resetDatabase(config: IMigrationConfig, tenantId?: string): Promise<IMigrationResult>;
 export declare function migrationStatus(config: IMigrationConfig, tenantId?: string): Promise<IMigrationResult>;
 export declare function runForAllTenants(config: IMigrationConfig, command: 'run' | 'revert' | 'status'): Promise<IMigrationResult[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-core",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.1",
   "description": "Core types, interfaces, and constants for Flusys NestJS packages",
   "main": "cjs/index.js",
   "module": "fesm/index.js",

package/utils/datasource-config.builder.d.ts

@@ -8,5 +8,6 @@ export declare function getDatabaseForTenant(config: IMigrationConfig, tenantId?
     tenant?: ITenantDatabaseConfig;
     tenantConfig: ITenantDatabaseConfig;
 };
+export declare function resolveDatabaseConnection(config: IMigrationConfig, tenantId?: string): IDatabaseConfig;
 export declare function resolveEntities(config: IMigrationConfig, tenantConfig?: ITenantDatabaseConfig): any[];
 export declare function getActiveTenants(config: IMigrationConfig): ITenantDatabaseConfig[];