@sqb/migrator 4.19.4 → 4.19.6

package/README.md

@@ -20,12 +20,12 @@ SQB is an extensible, multi-dialect SQL query builder and Database connection wr
 
 ## Main goals
 
--   Single code base for any sql based database
--   Powerful and simplified query coding scheme
--   Fast applications with low memory requirements
--   Let applications work with large data tables efficiently
--   Support latest JavaScript language standards
--   Lightweight and extensible framework.
+- Single code base for any sql based database
+- Powerful and simplified query coding scheme
+- Fast applications with low memory requirements
+- Let applications work with large data tables efficiently
+- Support latest JavaScript language standards
+- Lightweight and extensible framework.
 
 You can report bugs and discuss features on the [GitHub issues](https://github.com/sqbjs/sqb/issues) page
 
@@ -41,7 +41,7 @@ $ npm install @sqb/migrator --save
 
 ## Node Compatibility
 
--   node >= 16.x
+- node >= 16.x
 
 ### License
 

package/cjs/adapters/pg-migration-adapter.js

@@ -43,7 +43,8 @@ class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
     }
     static async create(options) {
         // Create connection
-        const connection = (await pgAdapter.connect(options.connection)).intlcon;
+        const connection = (await pgAdapter.connect(options.connection))
+            .intlcon;
         try {
             const adapter = new PgMigrationAdapter();
             adapter._connection = connection;
@@ -51,8 +52,11 @@ class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
             adapter._infoSchema = options.infoSchema || '__migration';
             adapter.defaultVariables.schema = options.connection.schema || '';
             if (!adapter.defaultVariables.schema) {
-                const r = await connection.query('SELECT CURRENT_SCHEMA ', { objectRows: true });
-                adapter.defaultVariables.schema = r.rows?.[0]?.current_schema || 'public';
+                const r = await connection.query('SELECT CURRENT_SCHEMA ', {
+                    objectRows: true,
+                });
+                adapter.defaultVariables.schema =
+                    r.rows?.[0]?.current_schema || 'public';
             }
             // Check if migration schema
             await connection.query(`CREATE SCHEMA IF NOT EXISTS ${adapter.infoSchema} AUTHORIZATION postgres;`);
@@ -144,7 +148,15 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             '(package_name, version, event, event_time, title, message, filename, details) ' +
             'values ($1, $2, $3, CURRENT_TIMESTAMP, $4, $5, $6, $7)';
         await this._connection.query(sql, {
-            params: [this.packageName, event.version, event.event, event.title, event.message, event.filename, event.details],
+            params: [
+                this.packageName,
+                event.version,
+                event.event,
+                event.title,
+                event.message,
+                event.filename,
+                event.details,
+            ],
         });
     }
     async executeTask(migrationPackage, migration, task, variables) {
@@ -156,7 +168,12 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             try {
                 let script;
                 if (typeof task.script === 'function') {
-                    script = await task.script({ migrationPackage, migration, task, variables });
+                    script = await task.script({
+                        migrationPackage,
+                        migration,
+                        task,
+                        variables,
+                    });
                 }
                 else
                     script = task.script;
@@ -168,7 +185,8 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             catch (e) {
                 let msg = `Error in task "${task.title}"`;
                 if (task.filename)
-                    msg += '\n at ' + path_1.default.relative(migrationPackage.baseDir, task.filename);
+                    msg +=
+                        '\n at ' + path_1.default.relative(migrationPackage.baseDir, task.filename);
                 if (e.lineNr) {
                     if (!task.filename)
                         e.message += '\n at';
@@ -187,7 +205,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
         }
         if ((0, migration_package_js_1.isInsertDataMigrationTask)(task)) {
             const tableName = this.replaceVariables(task.tableName, variables);
-            const script = task.rows.map(row => this.rowToSql(tableName, row)).join('\n');
+            const script = task.rows
+                .map(row => this.rowToSql(tableName, row))
+                .join('\n');
             await this._connection.execute(script);
         }
     }

package/cjs/db-migrator.js

@@ -24,7 +24,10 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
         let migrationAdapter;
         switch (options.connection.dialect) {
             case 'postgres': {
-                migrationAdapter = await pg_migration_adapter_js_1.PgMigrationAdapter.create({ ...options, migrationPackage });
+                migrationAdapter = await pg_migration_adapter_js_1.PgMigrationAdapter.create({
+                    ...options,
+                    migrationPackage,
+                });
                 break;
             }
             default:
@@ -32,7 +35,8 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
         }
         let needBackup = false;
         try {
-            if (migrationAdapter.version && migrationAdapter.version < minVersion - 1) {
+            if (migrationAdapter.version &&
+                migrationAdapter.version < minVersion - 1) {
                 // noinspection ExceptionCaughtLocallyJS
                 throw new Error(`This package can migrate starting from ${minVersion - 1} but current version is ${migrationAdapter.version}`);
             }
@@ -51,7 +55,8 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
             let migrationIndex = -1;
             for (const migration of migrations) {
                 migrationIndex++;
-                if (migration.version > targetVersion || migrationAdapter.version >= migration.version)
+                if (migration.version > targetVersion ||
+                    migrationAdapter.version >= migration.version)
                     continue;
                 await this.emitAsync('migration-start', {
                     migration,
@@ -99,9 +104,17 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                         // noinspection ExceptionCaughtLocallyJS
                         throw e;
                     }
-                    await this.emitAsync('task-finish', { migration, task, total, index });
+                    await this.emitAsync('task-finish', {
+                        migration,
+                        task,
+                        total,
+                        index,
+                    });
                 }
-                await migrationAdapter.update({ version: migration.version, status: types_js_1.MigrationStatus.idle });
+                await migrationAdapter.update({
+                    version: migration.version,
+                    status: types_js_1.MigrationStatus.idle,
+                });
                 await this.emitAsync('migration-finish', {
                     migration,
                     total: migrations.length,

package/cjs/migration-package.js

@@ -10,10 +10,13 @@ const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const get_calling_filename_js_1 = require("./utils/get-calling-filename.js");
 function isSqlScriptMigrationTask(x) {
-    return typeof x === 'object' && (typeof x.script === 'string' || typeof x.script === 'function');
+    return (typeof x === 'object' &&
+        (typeof x.script === 'string' || typeof x.script === 'function'));
 }
 function isInsertDataMigrationTask(x) {
-    return typeof x === 'object' && typeof x.tableName === 'string' && Array.isArray(x.rows);
+    return (typeof x === 'object' &&
+        typeof x.tableName === 'string' &&
+        Array.isArray(x.rows));
 }
 function isCustomMigrationTask(x) {
     return typeof x === 'object' && typeof x.fn === 'function';
@@ -45,7 +48,11 @@ var MigrationPackage;
             }
             srcMigrations.sort((a, b) => a.version - b.version);
             for (const migration of srcMigrations) {
-                const trgMigration = { baseDir: '', ...migration, tasks: [] };
+                const trgMigration = {
+                    baseDir: '',
+                    ...migration,
+                    tasks: [],
+                };
                 trgMigrations.push(trgMigration);
                 const srcTasks = migration.tasks;
                 trgMigration.tasks = [];
@@ -75,7 +82,9 @@ var MigrationPackage;
                             }
                             else if (['.json', '.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
                                 try {
-                                    let json = ext === '.json' ? JSON.parse(await promises_1.default.readFile(filename, 'utf-8')) : await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
+                                    let json = ext === '.json'
+                                        ? JSON.parse(await promises_1.default.readFile(filename, 'utf-8'))
+                                        : await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
                                     if (typeof json !== 'object')
                                         continue;
                                     if (json.__esModule)
@@ -87,7 +96,8 @@ var MigrationPackage;
                                         continue;
                                     }
                                     if (json.tableName && json.rows) {
-                                        json.title = json.title || 'Migrate data into ' + json.tableName;
+                                        json.title =
+                                            json.title || 'Migrate data into ' + json.tableName;
                                         json.filename = filename;
                                         trgMigration.tasks.push(json);
                                         continue;
@@ -114,7 +124,10 @@ var MigrationPackage;
 })(MigrationPackage || (exports.MigrationPackage = MigrationPackage = {}));
 async function loadMigrations(baseDir, pattern) {
     const out = [];
-    const files = await (0, fast_glob_1.default)(path_1.default.join(baseDir, pattern), { absolute: true, onlyFiles: true });
+    const files = await (0, fast_glob_1.default)(path_1.default.join(baseDir, pattern), {
+        absolute: true,
+        onlyFiles: true,
+    });
     for (const filename of files) {
         const ext = path_1.default.extname(filename).toLowerCase();
         if (path_1.default.basename(filename, ext) !== 'migration')
@@ -134,7 +147,10 @@ async function loadMigrations(baseDir, pattern) {
                 throw e;
             }
         }
-        if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
+        if (json &&
+            typeof json === 'object' &&
+            json.version &&
+            Array.isArray(json.tasks)) {
             json.baseDir = path_1.default.relative(baseDir, path_1.default.dirname(filename));
             out.push(json);
         }

package/cjs/utils/get-calling-filename.js

@@ -13,7 +13,9 @@ function getCallingFilename(position = 0) {
     if (stack !== null && typeof stack === 'object') {
         // stack[0] holds this file
         // stack[1] holds where this function was called
-        const s = stack[position] ? stack[position].getFileName() : undefined;
+        const s = stack[position]
+            ? stack[position].getFileName()
+            : undefined;
         const m = s ? PATH_PATTERN.exec(s) : undefined;
         return m ? m[1] : '';
     }

package/esm/adapters/pg-migration-adapter.js

@@ -39,7 +39,8 @@ export class PgMigrationAdapter extends MigrationAdapter {
     }
     static async create(options) {
         // Create connection
-        const connection = (await pgAdapter.connect(options.connection)).intlcon;
+        const connection = (await pgAdapter.connect(options.connection))
+            .intlcon;
         try {
             const adapter = new PgMigrationAdapter();
             adapter._connection = connection;
@@ -47,8 +48,11 @@ export class PgMigrationAdapter extends MigrationAdapter {
             adapter._infoSchema = options.infoSchema || '__migration';
             adapter.defaultVariables.schema = options.connection.schema || '';
             if (!adapter.defaultVariables.schema) {
-                const r = await connection.query('SELECT CURRENT_SCHEMA ', { objectRows: true });
-                adapter.defaultVariables.schema = r.rows?.[0]?.current_schema || 'public';
+                const r = await connection.query('SELECT CURRENT_SCHEMA ', {
+                    objectRows: true,
+                });
+                adapter.defaultVariables.schema =
+                    r.rows?.[0]?.current_schema || 'public';
             }
             // Check if migration schema
             await connection.query(`CREATE SCHEMA IF NOT EXISTS ${adapter.infoSchema} AUTHORIZATION postgres;`);
@@ -140,7 +144,15 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             '(package_name, version, event, event_time, title, message, filename, details) ' +
             'values ($1, $2, $3, CURRENT_TIMESTAMP, $4, $5, $6, $7)';
         await this._connection.query(sql, {
-            params: [this.packageName, event.version, event.event, event.title, event.message, event.filename, event.details],
+            params: [
+                this.packageName,
+                event.version,
+                event.event,
+                event.title,
+                event.message,
+                event.filename,
+                event.details,
+            ],
         });
     }
     async executeTask(migrationPackage, migration, task, variables) {
@@ -152,7 +164,12 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             try {
                 let script;
                 if (typeof task.script === 'function') {
-                    script = await task.script({ migrationPackage, migration, task, variables });
+                    script = await task.script({
+                        migrationPackage,
+                        migration,
+                        task,
+                        variables,
+                    });
                 }
                 else
                     script = task.script;
@@ -164,7 +181,8 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             catch (e) {
                 let msg = `Error in task "${task.title}"`;
                 if (task.filename)
-                    msg += '\n at ' + path.relative(migrationPackage.baseDir, task.filename);
+                    msg +=
+                        '\n at ' + path.relative(migrationPackage.baseDir, task.filename);
                 if (e.lineNr) {
                     if (!task.filename)
                         e.message += '\n at';
@@ -183,7 +201,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
         }
         if (isInsertDataMigrationTask(task)) {
             const tableName = this.replaceVariables(task.tableName, variables);
-            const script = task.rows.map(row => this.rowToSql(tableName, row)).join('\n');
+            const script = task.rows
+                .map(row => this.rowToSql(tableName, row))
+                .join('\n');
             await this._connection.execute(script);
         }
     }

package/esm/db-migrator.js

@@ -1,7 +1,7 @@
 import { AsyncEventEmitter } from 'strict-typed-events';
 import { PgMigrationAdapter } from './adapters/pg-migration-adapter.js';
 import { MigrationAdapter } from './migration-adapter.js';
-import { MigrationPackage } from './migration-package.js';
+import { MigrationPackage, } from './migration-package.js';
 import { MigrationStatus } from './types.js';
 export class DbMigrator extends AsyncEventEmitter {
     async execute(options) {
@@ -21,7 +21,10 @@ export class DbMigrator extends AsyncEventEmitter {
         let migrationAdapter;
         switch (options.connection.dialect) {
             case 'postgres': {
-                migrationAdapter = await PgMigrationAdapter.create({ ...options, migrationPackage });
+                migrationAdapter = await PgMigrationAdapter.create({
+                    ...options,
+                    migrationPackage,
+                });
                 break;
             }
             default:
@@ -29,7 +32,8 @@ export class DbMigrator extends AsyncEventEmitter {
         }
         let needBackup = false;
         try {
-            if (migrationAdapter.version && migrationAdapter.version < minVersion - 1) {
+            if (migrationAdapter.version &&
+                migrationAdapter.version < minVersion - 1) {
                 // noinspection ExceptionCaughtLocallyJS
                 throw new Error(`This package can migrate starting from ${minVersion - 1} but current version is ${migrationAdapter.version}`);
             }
@@ -48,7 +52,8 @@ export class DbMigrator extends AsyncEventEmitter {
             let migrationIndex = -1;
             for (const migration of migrations) {
                 migrationIndex++;
-                if (migration.version > targetVersion || migrationAdapter.version >= migration.version)
+                if (migration.version > targetVersion ||
+                    migrationAdapter.version >= migration.version)
                     continue;
                 await this.emitAsync('migration-start', {
                     migration,
@@ -96,9 +101,17 @@ export class DbMigrator extends AsyncEventEmitter {
                         // noinspection ExceptionCaughtLocallyJS
                         throw e;
                     }
-                    await this.emitAsync('task-finish', { migration, task, total, index });
+                    await this.emitAsync('task-finish', {
+                        migration,
+                        task,
+                        total,
+                        index,
+                    });
                 }
-                await migrationAdapter.update({ version: migration.version, status: MigrationStatus.idle });
+                await migrationAdapter.update({
+                    version: migration.version,
+                    status: MigrationStatus.idle,
+                });
                 await this.emitAsync('migration-finish', {
                     migration,
                     total: migrations.length,

package/esm/migration-package.js

@@ -3,10 +3,13 @@ import fs from 'fs/promises';
 import path from 'path';
 import { getCallingFilename } from './utils/get-calling-filename.js';
 export function isSqlScriptMigrationTask(x) {
-    return typeof x === 'object' && (typeof x.script === 'string' || typeof x.script === 'function');
+    return (typeof x === 'object' &&
+        (typeof x.script === 'string' || typeof x.script === 'function'));
 }
 export function isInsertDataMigrationTask(x) {
-    return typeof x === 'object' && typeof x.tableName === 'string' && Array.isArray(x.rows);
+    return (typeof x === 'object' &&
+        typeof x.tableName === 'string' &&
+        Array.isArray(x.rows));
 }
 export function isCustomMigrationTask(x) {
     return typeof x === 'object' && typeof x.fn === 'function';
@@ -38,7 +41,11 @@ export var MigrationPackage;
             }
             srcMigrations.sort((a, b) => a.version - b.version);
             for (const migration of srcMigrations) {
-                const trgMigration = { baseDir: '', ...migration, tasks: [] };
+                const trgMigration = {
+                    baseDir: '',
+                    ...migration,
+                    tasks: [],
+                };
                 trgMigrations.push(trgMigration);
                 const srcTasks = migration.tasks;
                 trgMigration.tasks = [];
@@ -68,7 +75,9 @@ export var MigrationPackage;
                             }
                             else if (['.json', '.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
                                 try {
-                                    let json = ext === '.json' ? JSON.parse(await fs.readFile(filename, 'utf-8')) : await import(filename);
+                                    let json = ext === '.json'
+                                        ? JSON.parse(await fs.readFile(filename, 'utf-8'))
+                                        : await import(filename);
                                     if (typeof json !== 'object')
                                         continue;
                                     if (json.__esModule)
@@ -80,7 +89,8 @@ export var MigrationPackage;
                                         continue;
                                     }
                                     if (json.tableName && json.rows) {
-                                        json.title = json.title || 'Migrate data into ' + json.tableName;
+                                        json.title =
+                                            json.title || 'Migrate data into ' + json.tableName;
                                         json.filename = filename;
                                         trgMigration.tasks.push(json);
                                         continue;
@@ -107,7 +117,10 @@ export var MigrationPackage;
 })(MigrationPackage || (MigrationPackage = {}));
 async function loadMigrations(baseDir, pattern) {
     const out = [];
-    const files = await glob(path.join(baseDir, pattern), { absolute: true, onlyFiles: true });
+    const files = await glob(path.join(baseDir, pattern), {
+        absolute: true,
+        onlyFiles: true,
+    });
     for (const filename of files) {
         const ext = path.extname(filename).toLowerCase();
         if (path.basename(filename, ext) !== 'migration')
@@ -127,7 +140,10 @@ async function loadMigrations(baseDir, pattern) {
                 throw e;
             }
         }
-        if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
+        if (json &&
+            typeof json === 'object' &&
+            json.version &&
+            Array.isArray(json.tasks)) {
             json.baseDir = path.relative(baseDir, path.dirname(filename));
             out.push(json);
         }

package/esm/utils/get-calling-filename.js

@@ -10,7 +10,9 @@ export function getCallingFilename(position = 0) {
     if (stack !== null && typeof stack === 'object') {
         // stack[0] holds this file
         // stack[1] holds where this function was called
-        const s = stack[position] ? stack[position].getFileName() : undefined;
+        const s = stack[position]
+            ? stack[position].getFileName()
+            : undefined;
         const m = s ? PATH_PATTERN.exec(s) : undefined;
         return m ? m[1] : '';
     }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.19.4",
+  "version": "4.19.6",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
     "fast-glob": "^3.3.2",
     "strict-typed-events": "^2.8.0",
-    "ts-gems": "^3.5.1",
-    "tslib": "^2.8.0"
+    "ts-gems": "^3.6.0",
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.19.4",
-    "@sqb/connect": "^4.19.4",
-    "@sqb/postgres": "^4.19.4"
+    "@sqb/builder": "^4.19.6",
+    "@sqb/connect": "^4.19.6",
+    "@sqb/postgres": "^4.19.6"
   },
   "type": "module",
   "exports": {
@@ -62,5 +62,8 @@
     "db",
     "migrate",
     "migrator"
-  ]
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
 }