@sqb/migrator 4.15.0 → 4.16.1

package/cjs/migration-package.js

@@ -75,7 +75,7 @@ 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 import(filename);
+                                    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)
@@ -121,7 +121,7 @@ async function loadMigrations(baseDir, pattern) {
             continue;
         let json;
         if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
-            json = await import(filename);
+            json = await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
             if (json.__esModule)
                 json = json.default;
         }

package/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

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

@@ -1,20 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PgMigrationAdapter = void 0;
-const tslib_1 = require("tslib");
-const postgres_1 = require("@sqb/postgres");
-const path_1 = tslib_1.__importDefault(require("path"));
-const postgrejs_1 = require("postgrejs");
-const migration_adapter_js_1 = require("../migration-adapter.js");
-const migration_package_js_1 = require("../migration-package.js");
-const types_js_1 = require("../types.js");
-const pgAdapter = new postgres_1.PgAdapter();
-class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
+import { PgAdapter } from '@sqb/postgres';
+import path from 'path';
+import { stringifyValueForSQL } from 'postgrejs';
+import { MigrationAdapter } from '../migration-adapter.js';
+import { isCustomMigrationTask, isInsertDataMigrationTask, isSqlScriptMigrationTask, } from '../migration-package.js';
+import { MigrationStatus } from '../types.js';
+const pgAdapter = new PgAdapter();
+export class PgMigrationAdapter extends MigrationAdapter {
     constructor() {
         super(...arguments);
         this._infoSchema = 'public';
         this._version = 0;
-        this._status = types_js_1.MigrationStatus.idle;
+        this._status = MigrationStatus.idle;
         this.defaultVariables = {
             tablespace: 'pg_default',
             schema: 'public',
@@ -89,7 +85,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             });
             if (!(r && r.rows?.length)) {
                 await connection.query(`insert into ${adapter.summaryTableFull} (package_name, status) values ($1, $2)`, {
-                    params: [adapter.packageName, types_js_1.MigrationStatus.idle],
+                    params: [adapter.packageName, MigrationStatus.idle],
                 });
             }
             await adapter.refresh();
@@ -152,7 +148,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             ...this.defaultVariables,
             ...variables,
         };
-        if ((0, migration_package_js_1.isSqlScriptMigrationTask)(task)) {
+        if (isSqlScriptMigrationTask(task)) {
             try {
                 let script;
                 if (typeof task.script === 'function') {
@@ -168,7 +164,7 @@ 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.relative(migrationPackage.baseDir, task.filename);
                 if (e.lineNr) {
                     if (!task.filename)
                         e.message += '\n at';
@@ -181,11 +177,11 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             }
             return;
         }
-        if ((0, migration_package_js_1.isCustomMigrationTask)(task)) {
+        if (isCustomMigrationTask(task)) {
             await task.fn(this._connection, this);
             return;
         }
-        if ((0, migration_package_js_1.isInsertDataMigrationTask)(task)) {
+        if (isInsertDataMigrationTask(task)) {
             const tableName = this.replaceVariables(task.tableName, variables);
             const script = task.rows.map(row => this.rowToSql(tableName, row)).join('\n');
             await this._connection.execute(script);
@@ -208,10 +204,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
         const keys = Object.keys(row);
         sql += `insert into ${tableName} (${keys}) values (`;
         for (let i = 0; i < keys.length; i++) {
-            sql += (i ? ', ' : '') + (0, postgrejs_1.stringifyValueForSQL)(row[keys[i]]);
+            sql += (i ? ', ' : '') + stringifyValueForSQL(row[keys[i]]);
         }
         sql += ');\n';
         return sql;
     }
 }
-exports.PgMigrationAdapter = PgMigrationAdapter;

package/esm/db-migrator.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbMigrator = void 0;
-const strict_typed_events_1 = require("strict-typed-events");
-const pg_migration_adapter_js_1 = require("./adapters/pg-migration-adapter.js");
-const migration_adapter_js_1 = require("./migration-adapter.js");
-const migration_package_js_1 = require("./migration-package.js");
-const types_js_1 = require("./types.js");
-class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
+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 { MigrationStatus } from './types.js';
+export class DbMigrator extends AsyncEventEmitter {
     async execute(options) {
         if (!options.connection.dialect)
             throw new TypeError(`You must provide connection.dialect`);
-        const migrationPackage = await migration_package_js_1.MigrationPackage.load(options.migrationPackage);
+        const migrationPackage = await MigrationPackage.load(options.migrationPackage);
         let minVersion = migrationPackage.migrations.reduce((a, m) => Math.min(a, m.version), Number.MAX_SAFE_INTEGER);
         if (minVersion === Number.MAX_SAFE_INTEGER)
             minVersion = 0;
@@ -24,7 +21,7 @@ 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 PgMigrationAdapter.create({ ...options, migrationPackage });
                 break;
             }
             default:
@@ -61,9 +58,9 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                 for (let index = 0; index < migration.tasks.length; index++) {
                     task = migration.tasks[index];
                     await this.emitAsync('task-start', { migration, task, total, index });
-                    await migrationAdapter.update({ status: types_js_1.MigrationStatus.busy });
+                    await migrationAdapter.update({ status: MigrationStatus.busy });
                     await migrationAdapter.writeEvent({
-                        event: migration_adapter_js_1.MigrationAdapter.EventKind.started,
+                        event: MigrationAdapter.EventKind.started,
                         version: migration.version,
                         title: task.title,
                         filename: task.filename,
@@ -75,7 +72,7 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                             ...options.scriptVariables,
                         });
                         await migrationAdapter.writeEvent({
-                            event: migration_adapter_js_1.MigrationAdapter.EventKind.success,
+                            event: MigrationAdapter.EventKind.success,
                             version: migration.version,
                             title: task.title,
                             filename: task.filename,
@@ -84,7 +81,7 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                     }
                     catch (e) {
                         await migrationAdapter.writeEvent({
-                            event: migration_adapter_js_1.MigrationAdapter.EventKind.error,
+                            event: MigrationAdapter.EventKind.error,
                             version: migration.version,
                             title: task.title,
                             filename: task.filename,
@@ -101,7 +98,7 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                     }
                     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: MigrationStatus.idle });
                 await this.emitAsync('migration-finish', {
                     migration,
                     total: migrations.length,
@@ -128,4 +125,3 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
         return true;
     }
 }
-exports.DbMigrator = DbMigrator;

package/esm/index.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./db-migrator.js"), exports);
-tslib_1.__exportStar(require("./migration-adapter.js"), exports);
-tslib_1.__exportStar(require("./migration-package.js"), exports);
-tslib_1.__exportStar(require("./types.js"), exports);
+export * from './db-migrator.js';
+export * from './migration-adapter.js';
+export * from './migration-package.js';
+export * from './types.js';

package/esm/migration-adapter.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationAdapter = void 0;
-class MigrationAdapter {
+export class MigrationAdapter {
     replaceVariables(text, variables) {
         return text.replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
     }
 }
-exports.MigrationAdapter = MigrationAdapter;
 (function (MigrationAdapter) {
     let EventKind;
     (function (EventKind) {
@@ -14,4 +10,4 @@ exports.MigrationAdapter = MigrationAdapter;
         EventKind["success"] = "success";
         EventKind["error"] = "error";
     })(EventKind = MigrationAdapter.EventKind || (MigrationAdapter.EventKind = {}));
-})(MigrationAdapter || (exports.MigrationAdapter = MigrationAdapter = {}));
+})(MigrationAdapter || (MigrationAdapter = {}));

package/esm/migration-package.js

@@ -1,27 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationPackage = void 0;
-exports.isSqlScriptMigrationTask = isSqlScriptMigrationTask;
-exports.isInsertDataMigrationTask = isInsertDataMigrationTask;
-exports.isCustomMigrationTask = isCustomMigrationTask;
-const tslib_1 = require("tslib");
-const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
-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) {
+import glob from 'fast-glob';
+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');
 }
-function isInsertDataMigrationTask(x) {
+export function isInsertDataMigrationTask(x) {
     return typeof x === 'object' && typeof x.tableName === 'string' && Array.isArray(x.rows);
 }
-function isCustomMigrationTask(x) {
+export function isCustomMigrationTask(x) {
     return typeof x === 'object' && typeof x.fn === 'function';
 }
-var MigrationPackage;
+export var MigrationPackage;
 (function (MigrationPackage) {
     async function load(asyncConfig) {
-        const baseDir = asyncConfig.baseDir || path_1.default.dirname((0, get_calling_filename_js_1.getCallingFilename)(1));
+        const baseDir = asyncConfig.baseDir || path.dirname(getCallingFilename(1));
         const out = {
             ...asyncConfig,
             baseDir,
@@ -55,27 +48,27 @@ var MigrationPackage;
                     }
                     else if (typeof t === 'string') {
                         let pattern = t.replace(/\\/g, '/');
-                        pattern = path_1.default.resolve(path_1.default.join(baseDir, trgMigration.baseDir, pattern));
-                        const files = await (0, fast_glob_1.default)(pattern, {
+                        pattern = path.resolve(path.join(baseDir, trgMigration.baseDir, pattern));
+                        const files = await glob(pattern, {
                             absolute: true,
                             onlyFiles: true,
                         });
                         files.sort();
                         for (const filename of files) {
-                            const ext = path_1.default.extname(filename).toLowerCase();
-                            if (!path_1.default.basename(filename, ext).endsWith('.task'))
+                            const ext = path.extname(filename).toLowerCase();
+                            if (!path.basename(filename, ext).endsWith('.task'))
                                 continue;
                             if (ext === '.sql') {
-                                const script = await promises_1.default.readFile(filename, 'utf-8');
+                                const script = await fs.readFile(filename, 'utf-8');
                                 trgMigration.tasks.push({
-                                    title: path_1.default.basename(filename, ext),
+                                    title: path.basename(filename, ext),
                                     filename,
                                     script,
                                 });
                             }
                             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 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)
@@ -111,13 +104,13 @@ var MigrationPackage;
         return out;
     }
     MigrationPackage.load = load;
-})(MigrationPackage || (exports.MigrationPackage = MigrationPackage = {}));
+})(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 glob(path.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')
+        const ext = path.extname(filename).toLowerCase();
+        if (path.basename(filename, ext) !== 'migration')
             continue;
         let json;
         if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
@@ -127,7 +120,7 @@ async function loadMigrations(baseDir, pattern) {
         }
         else if (ext === '.json') {
             try {
-                json = JSON.parse(await promises_1.default.readFile(filename, 'utf-8'));
+                json = JSON.parse(await fs.readFile(filename, 'utf-8'));
             }
             catch (e) {
                 e.message = `Error in ${filename}\n` + e.message;
@@ -135,7 +128,7 @@ async function loadMigrations(baseDir, pattern) {
             }
         }
         if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
-            json.baseDir = path_1.default.relative(baseDir, path_1.default.dirname(filename));
+            json.baseDir = path.relative(baseDir, path.dirname(filename));
             out.push(json);
         }
     }

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/esm/types.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationStatus = void 0;
-var MigrationStatus;
+export var MigrationStatus;
 (function (MigrationStatus) {
     MigrationStatus["idle"] = "idle";
     MigrationStatus["busy"] = "busy";
-})(MigrationStatus || (exports.MigrationStatus = MigrationStatus = {}));
+})(MigrationStatus || (MigrationStatus = {}));

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCallingFilename = getCallingFilename;
 const PATH_PATTERN = /^(?:file:\/\/)?(.+)$/;
-function getCallingFilename(position = 0) {
+export function getCallingFilename(position = 0) {
     position++;
     if (position >= Error.stackTraceLimit)
         return '';

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.15.0",
+  "version": "4.16.1",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
     "compile": "tsc",
     "prebuild": "npm run lint && npm run clean",
     "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
+    "build:cjs": "tsc -b tsconfig-build-cjs.json && cp ../../support/package.cjs.json ../../build/migrator/cjs/package.json",
+    "build:esm": "tsc -b tsconfig-build-esm.json && cp ../../support/package.esm.json ../../build/migrator/esm/package.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/migrator",
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint . --max-warnings=0 --fix",
@@ -23,27 +23,36 @@
   },
   "dependencies": {
     "fast-glob": "^3.3.2",
-    "strict-typed-events": "^2.5.0",
-    "ts-gems": "^3.5.0"
+    "strict-typed-events": "^2.7.2",
+    "ts-gems": "^3.5.0",
+    "tslib": "^2.6.3"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.15.0",
-    "@sqb/connect": "^4.15.0",
-    "@sqb/postgres": "^4.15.0"
+    "@sqb/builder": "^4.16.1",
+    "@sqb/connect": "^4.16.1",
+    "@sqb/postgres": "^4.16.1"
   },
   "devDependencies": {
-    "postgrejs": "^2.16.0"
+    "postgrejs": "^2.18.1"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./cjs/index.js",
-      "import": "./esm/index.js",
-      "types": "./types/index.d.ts"
-    }
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
   },
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./types/index.d.ts",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
     "Ilker Gurelli <i.gurelli@panates.com>"