@sqb/migrator 4.12.1 → 4.13.0

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

@@ -2,9 +2,9 @@
 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 postgresql_client_1 = require("postgresql-client");
-const postgres_1 = require("@sqb/postgres");
 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");
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
                 objectRows: true,
             });
             if (!(r && r.rows?.length)) {
-                await connection.query(`insert into ${adapter.summaryTableFull} ` + '(package_name, status) values ($1, $2)', {
+                await connection.query(`insert into ${adapter.summaryTableFull} (package_name, status) values ($1, $2)`, {
                     params: [adapter.packageName, types_js_1.MigrationStatus.idle],
                 });
             }

package/cjs/index.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./db-migrator.js"), exports);
-tslib_1.__exportStar(require("./migration-package.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);

package/cjs/migration-package.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationPackage = exports.isCustomMigrationTask = exports.isInsertDataMigrationTask = exports.isSqlScriptMigrationTask = void 0;
+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"));
@@ -9,15 +12,12 @@ 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');
 }
-exports.isSqlScriptMigrationTask = isSqlScriptMigrationTask;
 function isInsertDataMigrationTask(x) {
     return typeof x === 'object' && typeof x.tableName === 'string' && Array.isArray(x.rows);
 }
-exports.isInsertDataMigrationTask = isInsertDataMigrationTask;
 function isCustomMigrationTask(x) {
     return typeof x === 'object' && typeof x.fn === 'function';
 }
-exports.isCustomMigrationTask = isCustomMigrationTask;
 var MigrationPackage;
 (function (MigrationPackage) {
     async function load(asyncConfig) {
@@ -27,8 +27,9 @@ var MigrationPackage;
             baseDir,
             migrations: [],
         };
-        if (!Array.isArray(asyncConfig.migrations))
+        if (!Array.isArray(asyncConfig.migrations)) {
             throw new TypeError('You must provide array of MigrationConfig in "migrations" property');
+        }
         if (asyncConfig.migrations?.length) {
             const srcMigrations = [];
             const trgMigrations = [];
@@ -110,33 +111,33 @@ var MigrationPackage;
         return out;
     }
     MigrationPackage.load = load;
-    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 });
-        for (const filename of files) {
-            const ext = path_1.default.extname(filename).toLowerCase();
-            if (path_1.default.basename(filename, ext) !== 'migration')
-                continue;
-            let json;
-            if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
-                json = await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
-                if (json.__esModule)
-                    json = json.default;
-            }
-            else if (ext === '.json') {
-                try {
-                    json = JSON.parse(await promises_1.default.readFile(filename, 'utf-8'));
-                }
-                catch (e) {
-                    e.message = `Error in ${filename}\n` + e.message;
-                    throw e;
-                }
+})(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 });
+    for (const filename of files) {
+        const ext = path_1.default.extname(filename).toLowerCase();
+        if (path_1.default.basename(filename, ext) !== 'migration')
+            continue;
+        let json;
+        if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
+            json = await Promise.resolve(`${filename}`).then(s => tslib_1.__importStar(require(s)));
+            if (json.__esModule)
+                json = json.default;
+        }
+        else if (ext === '.json') {
+            try {
+                json = JSON.parse(await promises_1.default.readFile(filename, 'utf-8'));
             }
-            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);
+            catch (e) {
+                e.message = `Error in ${filename}\n` + e.message;
+                throw e;
             }
         }
-        return out;
+        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);
+        }
     }
-})(MigrationPackage || (exports.MigrationPackage = MigrationPackage = {}));
+    return out;
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCallingFilename = void 0;
+exports.getCallingFilename = getCallingFilename;
 const PATH_PATTERN = /^(?:file:\/\/)?(.+)$/;
 function getCallingFilename(position = 0) {
     position++;
@@ -19,4 +19,3 @@ function getCallingFilename(position = 0) {
     }
     return '';
 }
-exports.getCallingFilename = getCallingFilename;

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

@@ -1,6 +1,6 @@
+import { PgAdapter } from '@sqb/postgres';
 import path from 'path';
 import { stringifyValueForSQL } from 'postgresql-client';
-import { PgAdapter } from '@sqb/postgres';
 import { MigrationAdapter } from '../migration-adapter.js';
 import { isCustomMigrationTask, isInsertDataMigrationTask, isSqlScriptMigrationTask, } from '../migration-package.js';
 import { MigrationStatus } from '../types.js';
@@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
                 objectRows: true,
             });
             if (!(r && r.rows?.length)) {
-                await connection.query(`insert into ${adapter.summaryTableFull} ` + '(package_name, status) values ($1, $2)', {
+                await connection.query(`insert into ${adapter.summaryTableFull} (package_name, status) values ($1, $2)`, {
                     params: [adapter.packageName, MigrationStatus.idle],
                 });
             }

package/esm/index.js

@@ -1,4 +1,4 @@
 export * from './db-migrator.js';
-export * from './migration-package.js';
 export * from './migration-adapter.js';
+export * from './migration-package.js';
 export * from './types.js';

package/esm/migration-package.js

@@ -20,8 +20,9 @@ export var MigrationPackage;
             baseDir,
             migrations: [],
         };
-        if (!Array.isArray(asyncConfig.migrations))
+        if (!Array.isArray(asyncConfig.migrations)) {
             throw new TypeError('You must provide array of MigrationConfig in "migrations" property');
+        }
         if (asyncConfig.migrations?.length) {
             const srcMigrations = [];
             const trgMigrations = [];
@@ -103,33 +104,33 @@ export var MigrationPackage;
         return out;
     }
     MigrationPackage.load = load;
-    async function loadMigrations(baseDir, pattern) {
-        const out = [];
-        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')
-                continue;
-            let json;
-            if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
-                json = await import(filename);
-                if (json.__esModule)
-                    json = json.default;
-            }
-            else if (ext === '.json') {
-                try {
-                    json = JSON.parse(await fs.readFile(filename, 'utf-8'));
-                }
-                catch (e) {
-                    e.message = `Error in ${filename}\n` + e.message;
-                    throw e;
-                }
+})(MigrationPackage || (MigrationPackage = {}));
+async function loadMigrations(baseDir, pattern) {
+    const out = [];
+    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')
+            continue;
+        let json;
+        if (['.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
+            json = await import(filename);
+            if (json.__esModule)
+                json = json.default;
+        }
+        else if (ext === '.json') {
+            try {
+                json = JSON.parse(await fs.readFile(filename, 'utf-8'));
             }
-            if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
-                json.baseDir = path.relative(baseDir, path.dirname(filename));
-                out.push(json);
+            catch (e) {
+                e.message = `Error in ${filename}\n` + e.message;
+                throw e;
             }
         }
-        return out;
+        if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
+            json.baseDir = path.relative(baseDir, path.dirname(filename));
+            out.push(json);
+        }
     }
-})(MigrationPackage || (MigrationPackage = {}));
+    return out;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.12.1",
+  "version": "4.13.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -35,12 +35,17 @@
     "clean:cover": "rimraf ../../coverage/migrator"
   },
   "dependencies": {
+    "fast-glob": "^3.3.2",
+    "strict-typed-events": "^2.3.3",
     "ts-gems": "^3.4.0"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.12.1",
-    "@sqb/connect": "^4.12.1",
-    "@sqb/postgres": "^4.12.1"
+    "@sqb/builder": "^4.13.0",
+    "@sqb/connect": "^4.13.0",
+    "@sqb/postgres": "^4.13.0"
+  },
+  "devDependencies": {
+    "postgresql-client": "^2.12.0"
   },
   "engines": {
     "node": ">=16.0",

package/types/db-migrator.d.ts

@@ -1,5 +1,5 @@
-import { AsyncEventEmitter } from 'strict-typed-events';
 import { ClientConfiguration } from '@sqb/connect';
+import { AsyncEventEmitter } from 'strict-typed-events';
 import { MigrationAdapter } from './migration-adapter.js';
 import { MigrationPackage, MigrationPackageConfig } from './migration-package.js';
 export interface DbMigratorOptions {

package/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './db-migrator.js';
-export * from './migration-package.js';
 export * from './migration-adapter.js';
+export * from './migration-package.js';
 export * from './types.js';