@sqb/migrator 4.5.5 → 4.6.0

package/cjs/db-migrator.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbMigrator = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const postgresql_client_1 = require("postgresql-client");
 const load_task_files_js_1 = require("./load-task-files.js");
 const ignoreEventListener = () => 0;
 class DbMigrator {
     async execute(options) {
         const { connection, schema } = options;
-        const migrationPackage = DbMigrator.loadMigrationPackage(options.migrationPackage);
+        const migrationPackage = await DbMigrator.loadMigrationPackage(options.migrationPackage);
         const targetVersion = Math.min(options.targetVersion || Number.MAX_SAFE_INTEGER, migrationPackage.maxVersion);
         if (targetVersion && targetVersion < migrationPackage.minVersion)
             throw new Error(`Version mismatch. Target schema version (${targetVersion}) is lower than ` +
@@ -91,12 +91,12 @@ class DbMigrator {
         emit('finish');
         return true;
     }
-    static loadMigrationPackage(pkg) {
-        const migarr = typeof pkg.migrations === 'function' ? pkg.migrations() : pkg.migrations;
+    static async loadMigrationPackage(pkg) {
+        const migarr = typeof pkg.migrations === 'function' ? await pkg.migrations() : pkg.migrations;
         const migrations = [];
         for (const x of migarr) {
             if (typeof x === 'string')
-                locateMigrations(migrations, x);
+                await locateMigrations(migrations, x);
             else
                 migrations.push(x);
         }
@@ -190,26 +190,26 @@ insert into ${schema}.${infTable} (status) values ('init');
     }
 }
 exports.DbMigrator = DbMigrator;
-function locateMigrations(trg, dir) {
+async function locateMigrations(trg, dir) {
     for (const f of ['migration.ts', 'migration.js', 'migration.json']) {
-        const filename = path_1.default.join(dir, f);
-        if (fs_1.default.existsSync(filename)) {
-            const x = require(filename);
-            const fileDir = path_1.default.dirname(filename);
+        const filename = node_path_1.default.join(dir, f);
+        if (node_fs_1.default.existsSync(filename)) {
+            const x = await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
+            const fileDir = node_path_1.default.dirname(filename);
             const obj = x.default || x;
             if (obj.version && obj.tasks) {
                 const migration = { ...obj };
-                migration.tasks = obj.tasks.map(k => (typeof k === 'string' ? path_1.default.resolve(fileDir, k) : k));
+                migration.tasks = obj.tasks.map(k => (typeof k === 'string' ? node_path_1.default.resolve(fileDir, k) : k));
                 trg.push(migration);
             }
             return;
         }
     }
-    const files = fs_1.default.readdirSync(dir);
+    const files = node_fs_1.default.readdirSync(dir);
     for (const f of files) {
-        const dirname = path_1.default.join(dir, f);
-        if (fs_1.default.statSync(dirname).isDirectory()) {
-            locateMigrations(trg, dirname);
+        const dirname = node_path_1.default.join(dir, f);
+        if (node_fs_1.default.statSync(dirname).isDirectory()) {
+            await locateMigrations(trg, dirname);
         }
     }
 }

package/esm/db-migrator.d.ts

@@ -16,7 +16,7 @@ interface LoadedMigrationPackage {
 }
 export declare class DbMigrator {
     execute(options: MigrationExecuteOptions): Promise<boolean>;
-    static loadMigrationPackage(pkg: MigrationPackage): LoadedMigrationPackage;
+    static loadMigrationPackage(pkg: MigrationPackage): Promise<LoadedMigrationPackage>;
     private _lockSchema;
     private _unlockSchema;
     private _backup;

package/esm/db-migrator.js

@@ -1,12 +1,12 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
 import { stringifyValueForSQL } from 'postgresql-client';
 import { loadTaskFiles } from './load-task-files.js';
 const ignoreEventListener = () => 0;
 export class DbMigrator {
     async execute(options) {
         const { connection, schema } = options;
-        const migrationPackage = DbMigrator.loadMigrationPackage(options.migrationPackage);
+        const migrationPackage = await DbMigrator.loadMigrationPackage(options.migrationPackage);
         const targetVersion = Math.min(options.targetVersion || Number.MAX_SAFE_INTEGER, migrationPackage.maxVersion);
         if (targetVersion && targetVersion < migrationPackage.minVersion)
             throw new Error(`Version mismatch. Target schema version (${targetVersion}) is lower than ` +
@@ -87,12 +87,12 @@ export class DbMigrator {
         emit('finish');
         return true;
     }
-    static loadMigrationPackage(pkg) {
-        const migarr = typeof pkg.migrations === 'function' ? pkg.migrations() : pkg.migrations;
+    static async loadMigrationPackage(pkg) {
+        const migarr = typeof pkg.migrations === 'function' ? await pkg.migrations() : pkg.migrations;
         const migrations = [];
         for (const x of migarr) {
             if (typeof x === 'string')
-                locateMigrations(migrations, x);
+                await locateMigrations(migrations, x);
             else
                 migrations.push(x);
         }
@@ -185,11 +185,11 @@ insert into ${schema}.${infTable} (status) values ('init');
         return sql;
     }
 }
-function locateMigrations(trg, dir) {
+async function locateMigrations(trg, dir) {
     for (const f of ['migration.ts', 'migration.js', 'migration.json']) {
         const filename = path.join(dir, f);
         if (fs.existsSync(filename)) {
-            const x = require(filename);
+            const x = await import(filename);
             const fileDir = path.dirname(filename);
             const obj = x.default || x;
             if (obj.version && obj.tasks) {
@@ -204,7 +204,7 @@ function locateMigrations(trg, dir) {
     for (const f of files) {
         const dirname = path.join(dir, f);
         if (fs.statSync(dirname).isDirectory()) {
-            locateMigrations(trg, dirname);
+            await locateMigrations(trg, dirname);
         }
     }
 }

package/esm/types.d.ts

@@ -1,4 +1,4 @@
-export declare type MigrationsThunk = () => (string | Migration)[];
+export type MigrationsThunk = (string | Migration)[] | (() => (string | Migration)[]) | (() => Promise<(string | Migration)[]>);
 export interface MigrationPackage {
     description: string;
     informationTableName?: string;
@@ -16,8 +16,8 @@ export interface Migration {
     version: number;
     tasks: string[] | MigrationTask[];
 }
-export declare type MigrationTaskFunction = (connection: any) => void | Promise<void>;
-export declare type MigrationTask = SqlScriptMigrationTask | CustomMigrationTask | InsertDataMigrationTask;
+export type MigrationTaskFunction = (connection: any) => void | Promise<void>;
+export type MigrationTask = SqlScriptMigrationTask | CustomMigrationTask | InsertDataMigrationTask;
 export interface BaseMigrationTask {
     title: string;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.5.5",
+  "version": "4.6.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -29,8 +29,8 @@
     "clean:cover": "rimraf ../../coverage/migrator"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.5.5",
-    "@sqb/connect": "^4.5.5"
+    "@sqb/builder": "^4.6.0",
+    "@sqb/connect": "^4.6.0"
   },
   "type": "module",
   "types": "esm/index.d.ts",