@nauth-toolkit/database-typeorm-postgres 0.1.25 → 0.1.26

package/dist/utils/run-migrations.d.ts

@@ -1,10 +1,16 @@
-import type { DataSource } from 'typeorm';
+import { DataSource } from 'typeorm';
 import type { NAuthConfig, NAuthLogger } from '@nauth-toolkit/core';
 /**
  * Run nauth-toolkit migrations for Postgres.
  *
  * @remarks
- * This is invoked automatically by the core/nestjs packages at startup.
+ * This creates a completely isolated DataSource instance for nauth migrations,
+ * ensuring zero interference with consumer migrations. The consumer's DataSource
+ * is never modified or accessed for migration purposes.
+ *
+ * @param dataSource - Consumer's DataSource (only used to extract connection config)
+ * @param logger - NAuth logger instance
+ * @param config - NAuth configuration
  */
 export declare function runNAuthMigrations(dataSource: DataSource, logger: NAuthLogger, config: NAuthConfig): Promise<void>;
 //# sourceMappingURL=run-migrations.d.ts.map

package/dist/utils/run-migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-migrations.d.ts","sourceRoot":"","sources":["../../src/utils/run-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAUpE;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CA8Bf"}
+{"version":3,"file":"run-migrations.d.ts","sourceRoot":"","sources":["../../src/utils/run-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AA+DpE;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CA8Cf"}

package/dist/utils/run-migrations.js

@@ -1,36 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNAuthMigrations = runNAuthMigrations;
+const typeorm_1 = require("typeorm");
 const migrations_1 = require("../migrations");
+const entities_1 = require("../entities");
 function getMigrationsTableName(config) {
     const tablePrefix = config.tablePrefix ?? 'nauth_';
     return `${tablePrefix}migrations`;
 }
+/**
+ * Extracts connection configuration from consumer DataSource without touching it.
+ *
+ * @remarks
+ * This function only reads connection options and never modifies the consumer's DataSource.
+ * It supports both connection URL and individual connection parameters.
+ *
+ * @param dataSource - Consumer's DataSource instance
+ * @returns Connection configuration object
+ */
+function extractConnectionConfig(dataSource) {
+    const options = dataSource.options;
+    const opts = options;
+    // If connection URL is provided, use it (takes precedence)
+    if (opts.url) {
+        return {
+            type: 'postgres',
+            url: opts.url,
+            extra: opts.extra,
+        };
+    }
+    // Otherwise, use individual connection parameters
+    return {
+        type: 'postgres',
+        host: opts.host,
+        port: opts.port,
+        username: opts.username,
+        password: opts.password,
+        database: opts.database,
+        extra: opts.extra,
+    };
+}
 /**
  * Run nauth-toolkit migrations for Postgres.
  *
  * @remarks
- * This is invoked automatically by the core/nestjs packages at startup.
+ * This creates a completely isolated DataSource instance for nauth migrations,
+ * ensuring zero interference with consumer migrations. The consumer's DataSource
+ * is never modified or accessed for migration purposes.
+ *
+ * @param dataSource - Consumer's DataSource (only used to extract connection config)
+ * @param logger - NAuth logger instance
+ * @param config - NAuth configuration
  */
 async function runNAuthMigrations(dataSource, logger, config) {
     const migrationsTableName = getMigrationsTableName(config);
     logger.log(`[nauth-toolkit] Ensuring database schema via migrations (@nauth-toolkit/database-typeorm-postgres)...`);
-    const existing = Array.isArray(dataSource.options.migrations) ? dataSource.options.migrations : [];
-    const merged = [...existing, ...migrations_1.migrations];
-    // Inject our migrations into the DataSource options, then rebuild metadatas so TypeORM creates Migration instances.
-    // (Setting options alone is not enough after initialization; TypeORM uses `dataSource.migrations` built in buildMetadatas()).
-    dataSource.options.migrations = merged;
-    dataSource.options.migrationsTableName = migrationsTableName;
-    await dataSource.buildMetadatas();
-    logger.log(`[nauth-toolkit] Injecting ${migrations_1.migrations.length} NAuth migration(s) into DataSource (existing runtime: ${existing.length})`);
-    logger.log('[nauth-toolkit] Checking for pending migrations...');
-    const executed = (await dataSource.runMigrations({ transaction: 'all' }));
-    if (!executed.length) {
-        logger.log('[nauth-toolkit] No pending migrations.');
-        return;
+    // Extract connection config from consumer DataSource (read-only, no modifications)
+    const connectionConfig = extractConnectionConfig(dataSource);
+    // Create a completely separate DataSource instance for nauth migrations only
+    // This ensures hard separation - consumer migrations are never touched
+    const nauthDataSource = new typeorm_1.DataSource({
+        ...connectionConfig,
+        entities: [...(0, entities_1.getNAuthEntities)(), ...(0, entities_1.getNAuthTransientStorageEntities)()],
+        migrations: migrations_1.migrations,
+        migrationsTableName,
+        synchronize: false,
+        logging: false,
+    });
+    try {
+        // Initialize the isolated nauth DataSource
+        await nauthDataSource.initialize();
+        logger.log(`[nauth-toolkit] Running ${migrations_1.migrations.length} NAuth migration(s) using isolated DataSource (table: ${migrationsTableName})`);
+        logger.log('[nauth-toolkit] Checking for pending migrations...');
+        // Run migrations on the isolated DataSource
+        const executed = (await nauthDataSource.runMigrations({
+            transaction: 'all',
+        }));
+        if (!executed.length) {
+            logger.log('[nauth-toolkit] No pending migrations.');
+            return;
+        }
+        logger.log(`[nauth-toolkit] Executed ${executed.length} migration(s):`);
+        for (const m of executed)
+            logger.log(`  ${m.name}`);
+    }
+    finally {
+        // Always destroy the isolated DataSource to clean up connections
+        if (nauthDataSource.isInitialized) {
+            await nauthDataSource.destroy();
+        }
     }
-    logger.log(`[nauth-toolkit] Executed ${executed.length} migration(s):`);
-    for (const m of executed)
-        logger.log(`  ${m.name}`);
 }
 //# sourceMappingURL=run-migrations.js.map

package/dist/utils/run-migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-migrations.js","sourceRoot":"","sources":["../../src/utils/run-migrations.ts"],"names":[],"mappings":";;AAiBA,gDAkCC;AAjDD,8CAA2C;AAI3C,SAAS,sBAAsB,CAAC,MAAmB;IACjD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC;IACnD,OAAO,GAAG,WAAW,YAAY,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,MAAmB,EACnB,MAAmB;IAEnB,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAE3D,MAAM,CAAC,GAAG,CAAC,uGAAuG,CAAC,CAAC;IAEpH,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IACnG,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,uBAAU,CAAC,CAAC;IAE5C,oHAAoH;IACpH,8HAA8H;IAC7H,UAAU,CAAC,OAAsC,CAAC,UAAU,GAAG,MAAmB,CAAC;IACnF,UAAU,CAAC,OAA4C,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnG,MAAO,UAAiE,CAAC,cAAc,EAAE,CAAC;IAE1F,MAAM,CAAC,GAAG,CACR,6BAA6B,uBAAU,CAAC,MAAM,0DAA0D,QAAQ,CAAC,MAAM,GAAG,CAC3H,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;IAEjE,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,KAAK,EAEpE,CAAC,CAAuB,CAAC;IAE1B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACrD,OAAO;IACT,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,4BAA4B,QAAQ,CAAC,MAAM,gBAAgB,CAAC,CAAC;IACxE,KAAK,MAAM,CAAC,IAAI,QAAQ;QAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"run-migrations.js","sourceRoot":"","sources":["../../src/utils/run-migrations.ts"],"names":[],"mappings":";;AA4EA,gDAkDC;AA9HD,qCAAqC;AAErC,8CAA2C;AAC3C,0CAAiF;AAIjF,SAAS,sBAAsB,CAAC,MAAmB;IACjD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC;IACnD,OAAO,GAAG,WAAW,YAAY,CAAC;AACpC,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,uBAAuB,CAAC,UAAsB;IAUrD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,IAAI,GAAG,OAQZ,CAAC;IAEF,2DAA2D;IAC3D,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC;IAED,kDAAkD;IAClD,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,MAAmB,EACnB,MAAmB;IAEnB,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAE3D,MAAM,CAAC,GAAG,CAAC,uGAAuG,CAAC,CAAC;IAEpH,mFAAmF;IACnF,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAE7D,6EAA6E;IAC7E,uEAAuE;IACvE,MAAM,eAAe,GAAG,IAAI,oBAAU,CAAC;QACrC,GAAG,gBAAgB;QACnB,QAAQ,EAAE,CAAC,GAAG,IAAA,2BAAgB,GAAE,EAAE,GAAG,IAAA,2CAAgC,GAAE,CAAC;QACxE,UAAU,EAAV,uBAAU;QACV,mBAAmB;QACnB,WAAW,EAAE,KAAK;QAClB,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,2CAA2C;QAC3C,MAAM,eAAe,CAAC,UAAU,EAAE,CAAC;QAEnC,MAAM,CAAC,GAAG,CACR,2BAA2B,uBAAU,CAAC,MAAM,yDAAyD,mBAAmB,GAAG,CAC5H,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;QAEjE,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,CAAC,MAAM,eAAe,CAAC,aAAa,CAAC;YACpD,WAAW,EAAE,KAAK;SACkB,CAAC,CAAuB,CAAC;QAE/D,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,4BAA4B,QAAQ,CAAC,MAAM,gBAAgB,CAAC,CAAC;QACxE,KAAK,MAAM,CAAC,IAAI,QAAQ;YAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;YAAS,CAAC;QACT,iEAAiE;QACjE,IAAI,eAAe,CAAC,aAAa,EAAE,CAAC;YAClC,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nauth-toolkit/database-typeorm-postgres",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "PostgreSQL TypeORM adapter for nauth-toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
     "format:check": "prettier --check \"src/**/*.ts\""
   },
   "peerDependencies": {
-    "@nauth-toolkit/core": "^0.1.25",
+    "@nauth-toolkit/core": "^0.1.26",
     "typeorm": "^0.3.20",
     "pg": "^8.0.0"
   },