@sqb/migrator 4.10.2 → 4.10.4

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgMigrationAdapter = void 0;
+const tslib_1 = require("tslib");
+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");
@@ -11,7 +13,6 @@ class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
     constructor() {
         super(...arguments);
         this._infoSchema = 'public';
-        this._packageName = '';
         this._version = 0;
         this._status = types_js_1.MigrationStatus.idle;
         this.defaultVariables = {
@@ -23,7 +24,7 @@ class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
         this.eventTable = 'migration_events';
     }
     get packageName() {
-        return this._packageName;
+        return this._migrationPackage.name;
     }
     get version() {
         return this._version;
@@ -46,7 +47,7 @@ class PgMigrationAdapter extends migration_adapter_js_1.MigrationAdapter {
         try {
             const adapter = new PgMigrationAdapter();
             adapter._connection = connection;
-            adapter._packageName = options.migrationPackage.name;
+            adapter._migrationPackage = options.migrationPackage;
             adapter._infoSchema = options.infoSchema || '__migration';
             adapter.defaultVariables.schema = options.connection.schema || '';
             if (!adapter.defaultVariables.schema) {
@@ -75,7 +76,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
     version integer not null default 0,
     event varchar(16) not null,
     event_time timestamp without time zone not null,
+    title text,
     message text not null,          
+    filename text,
     details text,
     CONSTRAINT pk_${adapter.eventTable} PRIMARY KEY (id)
 )`);
@@ -128,30 +131,37 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
     }
     async writeEvent(event) {
         const sql = `insert into ${this.eventTableFull} ` +
-            '(package_name, version, event, event_time, message, details) ' +
-            'values ($1, $2, $3, CURRENT_TIMESTAMP, $4, $5)';
+            '(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.message, event.details
+                event.title, event.message, event.filename, event.details
             ]
         });
     }
-    async executeTask(task, variables) {
+    async executeTask(migrationPackage, migration, task, variables) {
         variables = {
             ...this.defaultVariables,
             ...variables
         };
         if ((0, migration_package_js_1.isSqlScriptMigrationTask)(task)) {
             try {
-                const script = task.script
-                    .replace(/(\${(\w+)})/g, (s, ...args) => variables[args[1]] || s);
+                let script;
+                if (typeof task.script === 'function') {
+                    script = await task.script({ migrationPackage, migration, task, variables });
+                }
+                else
+                    script = task.script;
+                if (typeof script !== 'string')
+                    return;
+                script = this.replaceVariables(script, variables);
                 await this._connection.execute(script);
             }
             catch (e) {
                 let msg = `Error in task "${task.title}"`;
                 if (task.filename)
-                    msg += '\n at ' + task.filename;
+                    msg += '\n at ' + path_1.default.relative(migrationPackage.baseDir, task.filename);
                 if (e.lineNr) {
                     if (!task.filename)
                         e.message += '\n at';
@@ -169,8 +179,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             return;
         }
         if ((0, migration_package_js_1.isInsertDataMigrationTask)(task)) {
+            const tableName = this.replaceVariables(task.tableName, variables);
             const script = task.rows
-                .map(row => this.rowToSql(variables.schema + '.' + task.tableName, row))
+                .map(row => this.rowToSql(tableName, row))
                 .join('\n');
             await this._connection.execute(script);
         }

package/cjs/db-migrator.js

@@ -25,7 +25,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);
+                migrationAdapter = await pg_migration_adapter_js_1.PgMigrationAdapter.create({ ...options, migrationPackage });
                 break;
             }
             default:
@@ -66,23 +66,29 @@ class DbMigrator extends strict_typed_events_1.AsyncEventEmitter {
                     await migrationAdapter.writeEvent({
                         event: migration_adapter_js_1.MigrationAdapter.EventKind.started,
                         version: migration.version,
+                        title: task.title,
+                        filename: task.filename,
                         message: `Task "${task.title}" started`
                     });
                     try {
-                        await migrationAdapter.executeTask(task, {
+                        await migrationAdapter.executeTask(migrationPackage, migration, task, {
                             schema: options.connection.schema,
                             ...options.scriptVariables,
                         });
                         await migrationAdapter.writeEvent({
                             event: migration_adapter_js_1.MigrationAdapter.EventKind.success,
                             version: migration.version,
-                            message: `Task "${task.title}" completed`
+                            title: task.title,
+                            filename: task.filename,
+                            message: `Task "${task.title}" completed`,
                         });
                     }
                     catch (e) {
                         await migrationAdapter.writeEvent({
                             event: migration_adapter_js_1.MigrationAdapter.EventKind.error,
                             version: migration.version,
+                            title: task.title,
+                            filename: task.filename,
                             message: String(e),
                             details: e.message + '\n\n' +
                                 Object.keys(e)

package/cjs/migration-adapter.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationAdapter = void 0;
 class MigrationAdapter {
+    replaceVariables(text, variables) {
+        return text.replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+    }
 }
 exports.MigrationAdapter = MigrationAdapter;
 (function (MigrationAdapter) {

package/cjs/migration-package.js

@@ -7,7 +7,8 @@ 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';
+    return typeof x === 'object' &&
+        (typeof x.script === 'string' || typeof x.script === 'function');
 }
 exports.isSqlScriptMigrationTask = isSqlScriptMigrationTask;
 function isInsertDataMigrationTask(x) {
@@ -24,13 +25,14 @@ exports.isCustomMigrationTask = isCustomMigrationTask;
 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 out = {
             ...asyncConfig,
+            baseDir,
             migrations: []
         };
         if (!Array.isArray(asyncConfig.migrations))
             throw new TypeError('You must provide array of MigrationConfig in "migrations" property');
-        const baseDir = path_1.default.dirname((0, get_calling_filename_js_1.getCallingFilename)(1));
         if (asyncConfig.migrations?.length) {
             const srcMigrations = [];
             const trgMigrations = [];
@@ -41,12 +43,12 @@ var MigrationPackage;
                 if (typeof x === 'object' && x.tasks)
                     srcMigrations.push(x);
                 else if (typeof x === 'string') {
-                    srcMigrations.push(...await loadMigrations(path_1.default.resolve(baseDir, x.replace(/\\/g, '/'))));
+                    srcMigrations.push(...await loadMigrations(baseDir, x.replace(/\\/g, '/')));
                 }
             }
             srcMigrations.sort((a, b) => a.version - b.version);
             for (const migration of srcMigrations) {
-                const trgMigration = { ...migration, tasks: [] };
+                const trgMigration = { baseDir: '', ...migration, tasks: [] };
                 trgMigrations.push(trgMigration);
                 const srcTasks = migration.tasks;
                 trgMigration.tasks = [];
@@ -56,7 +58,7 @@ var MigrationPackage;
                     }
                     else if (typeof t === 'string') {
                         let pattern = t.replace(/\\/g, '/');
-                        pattern = path_1.default.resolve(migration.dirname || baseDir, pattern);
+                        pattern = path_1.default.resolve(path_1.default.join(baseDir, trgMigration.baseDir, pattern));
                         const files = await (0, fast_glob_1.default)(pattern, {
                             absolute: true,
                             onlyFiles: true
@@ -69,16 +71,20 @@ var MigrationPackage;
                             if (ext === '.sql') {
                                 const script = await promises_1.default.readFile(filename, 'utf-8');
                                 trgMigration.tasks.push({
-                                    title: path_1.default.basename(filename),
+                                    title: path_1.default.basename(filename, ext),
                                     filename,
                                     script
                                 });
                             }
-                            else if (ext === '.json') {
+                            else if (['.json', '.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
                                 try {
-                                    const json = JSON.parse(await promises_1.default.readFile(filename, 'utf-8'));
+                                    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)
+                                        json = json.default;
                                     if (json.script) {
                                         json.title = json.title || 'Run sql script';
                                         json.filename = filename;
@@ -110,9 +116,9 @@ var MigrationPackage;
         return out;
     }
     MigrationPackage.load = load;
-    async function loadMigrations(pattern) {
+    async function loadMigrations(baseDir, pattern) {
         const out = [];
-        const files = await (0, fast_glob_1.default)(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')
@@ -133,7 +139,7 @@ var MigrationPackage;
                 }
             }
             if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
-                json.dirname = path_1.default.dirname(filename);
+                json.baseDir = path_1.default.relative(baseDir, path_1.default.dirname(filename));
                 out.push(json);
             }
         }

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

@@ -1,3 +1,4 @@
+import path from 'path';
 import { stringifyValueForSQL } from 'postgresql-client';
 import { PgAdapter } from '@sqb/postgres';
 import { MigrationAdapter } from '../migration-adapter.js';
@@ -8,7 +9,6 @@ export class PgMigrationAdapter extends MigrationAdapter {
     constructor() {
         super(...arguments);
         this._infoSchema = 'public';
-        this._packageName = '';
         this._version = 0;
         this._status = MigrationStatus.idle;
         this.defaultVariables = {
@@ -20,7 +20,7 @@ export class PgMigrationAdapter extends MigrationAdapter {
         this.eventTable = 'migration_events';
     }
     get packageName() {
-        return this._packageName;
+        return this._migrationPackage.name;
     }
     get version() {
         return this._version;
@@ -43,7 +43,7 @@ export class PgMigrationAdapter extends MigrationAdapter {
         try {
             const adapter = new PgMigrationAdapter();
             adapter._connection = connection;
-            adapter._packageName = options.migrationPackage.name;
+            adapter._migrationPackage = options.migrationPackage;
             adapter._infoSchema = options.infoSchema || '__migration';
             adapter.defaultVariables.schema = options.connection.schema || '';
             if (!adapter.defaultVariables.schema) {
@@ -72,7 +72,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
     version integer not null default 0,
     event varchar(16) not null,
     event_time timestamp without time zone not null,
+    title text,
     message text not null,          
+    filename text,
     details text,
     CONSTRAINT pk_${adapter.eventTable} PRIMARY KEY (id)
 )`);
@@ -125,30 +127,37 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
     }
     async writeEvent(event) {
         const sql = `insert into ${this.eventTableFull} ` +
-            '(package_name, version, event, event_time, message, details) ' +
-            'values ($1, $2, $3, CURRENT_TIMESTAMP, $4, $5)';
+            '(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.message, event.details
+                event.title, event.message, event.filename, event.details
             ]
         });
     }
-    async executeTask(task, variables) {
+    async executeTask(migrationPackage, migration, task, variables) {
         variables = {
             ...this.defaultVariables,
             ...variables
         };
         if (isSqlScriptMigrationTask(task)) {
             try {
-                const script = task.script
-                    .replace(/(\${(\w+)})/g, (s, ...args) => variables[args[1]] || s);
+                let script;
+                if (typeof task.script === 'function') {
+                    script = await task.script({ migrationPackage, migration, task, variables });
+                }
+                else
+                    script = task.script;
+                if (typeof script !== 'string')
+                    return;
+                script = this.replaceVariables(script, variables);
                 await this._connection.execute(script);
             }
             catch (e) {
                 let msg = `Error in task "${task.title}"`;
                 if (task.filename)
-                    msg += '\n at ' + task.filename;
+                    msg += '\n at ' + path.relative(migrationPackage.baseDir, task.filename);
                 if (e.lineNr) {
                     if (!task.filename)
                         e.message += '\n at';
@@ -166,8 +175,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             return;
         }
         if (isInsertDataMigrationTask(task)) {
+            const tableName = this.replaceVariables(task.tableName, variables);
             const script = task.rows
-                .map(row => this.rowToSql(variables.schema + '.' + task.tableName, row))
+                .map(row => this.rowToSql(tableName, row))
                 .join('\n');
             await this._connection.execute(script);
         }

package/esm/db-migrator.js

@@ -22,7 +22,7 @@ export class DbMigrator extends AsyncEventEmitter {
         let migrationAdapter;
         switch (options.connection.dialect) {
             case 'postgres': {
-                migrationAdapter = await PgMigrationAdapter.create(options);
+                migrationAdapter = await PgMigrationAdapter.create({ ...options, migrationPackage });
                 break;
             }
             default:
@@ -63,23 +63,29 @@ export class DbMigrator extends AsyncEventEmitter {
                     await migrationAdapter.writeEvent({
                         event: MigrationAdapter.EventKind.started,
                         version: migration.version,
+                        title: task.title,
+                        filename: task.filename,
                         message: `Task "${task.title}" started`
                     });
                     try {
-                        await migrationAdapter.executeTask(task, {
+                        await migrationAdapter.executeTask(migrationPackage, migration, task, {
                             schema: options.connection.schema,
                             ...options.scriptVariables,
                         });
                         await migrationAdapter.writeEvent({
                             event: MigrationAdapter.EventKind.success,
                             version: migration.version,
-                            message: `Task "${task.title}" completed`
+                            title: task.title,
+                            filename: task.filename,
+                            message: `Task "${task.title}" completed`,
                         });
                     }
                     catch (e) {
                         await migrationAdapter.writeEvent({
                             event: MigrationAdapter.EventKind.error,
                             version: migration.version,
+                            title: task.title,
+                            filename: task.filename,
                             message: String(e),
                             details: e.message + '\n\n' +
                                 Object.keys(e)

package/esm/migration-adapter.js

@@ -1,4 +1,7 @@
 export class MigrationAdapter {
+    replaceVariables(text, variables) {
+        return text.replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+    }
 }
 (function (MigrationAdapter) {
     let EventKind;

package/esm/migration-package.js

@@ -3,7 +3,8 @@ 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';
+    return typeof x === 'object' &&
+        (typeof x.script === 'string' || typeof x.script === 'function');
 }
 export function isInsertDataMigrationTask(x) {
     return typeof x === 'object' &&
@@ -17,13 +18,14 @@ export function isCustomMigrationTask(x) {
 export var MigrationPackage;
 (function (MigrationPackage) {
     async function load(asyncConfig) {
+        const baseDir = asyncConfig.baseDir || path.dirname(getCallingFilename(1));
         const out = {
             ...asyncConfig,
+            baseDir,
             migrations: []
         };
         if (!Array.isArray(asyncConfig.migrations))
             throw new TypeError('You must provide array of MigrationConfig in "migrations" property');
-        const baseDir = path.dirname(getCallingFilename(1));
         if (asyncConfig.migrations?.length) {
             const srcMigrations = [];
             const trgMigrations = [];
@@ -34,12 +36,12 @@ export var MigrationPackage;
                 if (typeof x === 'object' && x.tasks)
                     srcMigrations.push(x);
                 else if (typeof x === 'string') {
-                    srcMigrations.push(...await loadMigrations(path.resolve(baseDir, x.replace(/\\/g, '/'))));
+                    srcMigrations.push(...await loadMigrations(baseDir, x.replace(/\\/g, '/')));
                 }
             }
             srcMigrations.sort((a, b) => a.version - b.version);
             for (const migration of srcMigrations) {
-                const trgMigration = { ...migration, tasks: [] };
+                const trgMigration = { baseDir: '', ...migration, tasks: [] };
                 trgMigrations.push(trgMigration);
                 const srcTasks = migration.tasks;
                 trgMigration.tasks = [];
@@ -49,7 +51,7 @@ export var MigrationPackage;
                     }
                     else if (typeof t === 'string') {
                         let pattern = t.replace(/\\/g, '/');
-                        pattern = path.resolve(migration.dirname || baseDir, pattern);
+                        pattern = path.resolve(path.join(baseDir, trgMigration.baseDir, pattern));
                         const files = await glob(pattern, {
                             absolute: true,
                             onlyFiles: true
@@ -62,16 +64,20 @@ export var MigrationPackage;
                             if (ext === '.sql') {
                                 const script = await fs.readFile(filename, 'utf-8');
                                 trgMigration.tasks.push({
-                                    title: path.basename(filename),
+                                    title: path.basename(filename, ext),
                                     filename,
                                     script
                                 });
                             }
-                            else if (ext === '.json') {
+                            else if (['.json', '.js', '.ts', '.cjs', '.mjs'].includes(ext)) {
                                 try {
-                                    const json = JSON.parse(await fs.readFile(filename, 'utf-8'));
+                                    let json = ext === '.json'
+                                        ? JSON.parse(await fs.readFile(filename, 'utf-8'))
+                                        : await import(filename);
                                     if (typeof json !== 'object')
                                         continue;
+                                    if (json.__esModule)
+                                        json = json.default;
                                     if (json.script) {
                                         json.title = json.title || 'Run sql script';
                                         json.filename = filename;
@@ -103,9 +109,9 @@ export var MigrationPackage;
         return out;
     }
     MigrationPackage.load = load;
-    async function loadMigrations(pattern) {
+    async function loadMigrations(baseDir, pattern) {
         const out = [];
-        const files = await glob(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')
@@ -126,7 +132,7 @@ export var MigrationPackage;
                 }
             }
             if (json && typeof json === 'object' && json.version && Array.isArray(json.tasks)) {
-                json.dirname = path.dirname(filename);
+                json.baseDir = path.relative(baseDir, path.dirname(filename));
                 out.push(json);
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.10.2",
+  "version": "4.10.4",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -36,9 +36,9 @@
     "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.10.2",
-    "@sqb/connect": "^4.10.2",
-    "@sqb/postgres": "^4.10.2"
+    "@sqb/builder": "^4.10.4",
+    "@sqb/connect": "^4.10.4",
+    "@sqb/postgres": "^4.10.4"
   },
   "engines": {
     "node": ">=16.0",

package/types/adapters/pg-migration-adapter.d.ts

@@ -1,12 +1,13 @@
 import { Connection } from 'postgresql-client';
+import { StrictOmit } from 'ts-gems';
 import type { DbMigratorOptions } from '../db-migrator.js';
 import { MigrationAdapter } from '../migration-adapter.js';
-import { MigrationTask } from '../migration-package.js';
+import { Migration, MigrationPackage, MigrationTask } from '../migration-package.js';
 import { MigrationStatus } from '../types.js';
 export declare class PgMigrationAdapter extends MigrationAdapter {
     protected _connection: Connection;
     protected _infoSchema: string;
-    protected _packageName: string;
+    protected _migrationPackage: MigrationPackage;
     protected _version: number;
     protected _status: MigrationStatus;
     protected defaultVariables: {
@@ -22,7 +23,9 @@ export declare class PgMigrationAdapter extends MigrationAdapter {
     get infoSchema(): string;
     get summaryTableFull(): string;
     get eventTableFull(): string;
-    static create(options: DbMigratorOptions): Promise<PgMigrationAdapter>;
+    static create(options: StrictOmit<DbMigratorOptions, 'migrationPackage'> & {
+        migrationPackage: MigrationPackage;
+    }): Promise<PgMigrationAdapter>;
     close(): Promise<void>;
     refresh(): Promise<void>;
     update(info: {
@@ -30,7 +33,7 @@ export declare class PgMigrationAdapter extends MigrationAdapter {
         version?: number;
     }): Promise<void>;
     writeEvent(event: MigrationAdapter.Event): Promise<void>;
-    executeTask(task: MigrationTask, variables: Record<string, any>): Promise<void>;
+    executeTask(migrationPackage: MigrationPackage, migration: Migration, task: MigrationTask, variables: Record<string, any>): Promise<void>;
     backupDatabase(): Promise<void>;
     lockSchema(): Promise<void>;
     restoreDatabase(): Promise<void>;

package/types/db-migrator.d.ts

@@ -1,10 +1,10 @@
 import { AsyncEventEmitter } from 'strict-typed-events';
 import { ClientConfiguration } from '@sqb/connect';
 import { MigrationAdapter } from './migration-adapter.js';
-import { MigrationPackage, MigrationPackageAsync } from './migration-package.js';
+import { MigrationPackage, MigrationPackageConfig } from './migration-package.js';
 export interface DbMigratorOptions {
     connection: ClientConfiguration;
-    migrationPackage: MigrationPackage | MigrationPackageAsync;
+    migrationPackage: MigrationPackage | MigrationPackageConfig;
     infoSchema?: string;
     scriptVariables?: Record<string, string>;
     targetVersion?: number;

package/types/migration-adapter.d.ts

@@ -1,5 +1,5 @@
-import type { MigrationTask } from './migration-package.js';
-import { MigrationStatus } from './types.js';
+import type { Migration, MigrationPackage, MigrationTask } from './migration-package.js';
+import type { MigrationStatus } from './types.js';
 export declare abstract class MigrationAdapter {
     abstract readonly packageName: string;
     abstract readonly status: MigrationStatus;
@@ -11,11 +11,12 @@ export declare abstract class MigrationAdapter {
         version?: number;
     }): Promise<void>;
     abstract writeEvent(event: MigrationAdapter.Event): Promise<void>;
-    abstract executeTask(task: MigrationTask, variables: Record<string, any>): Promise<void>;
+    abstract executeTask(migrationPackage: MigrationPackage, migration: Migration, task: MigrationTask, variables: Record<string, any>): Promise<void>;
     abstract lockSchema(): Promise<void>;
     abstract unlockSchema(): Promise<void>;
     abstract backupDatabase(): Promise<void>;
     abstract restoreDatabase(): Promise<void>;
+    protected replaceVariables(text: string, variables: Record<string, string>): string;
 }
 export declare namespace MigrationAdapter {
     enum EventKind {
@@ -27,6 +28,8 @@ export declare namespace MigrationAdapter {
         event: EventKind;
         version: number;
         message: string;
+        title?: string;
+        filename?: string;
         details?: string;
     }
 }

package/types/migration-package.d.ts

@@ -1,44 +1,42 @@
-import { StrictOmit } from 'ts-gems';
+import { PartialSome, StrictOmit } from 'ts-gems';
 import type { MigrationAdapter } from './migration-adapter.js';
 export interface MigrationPackage {
     name: string;
     description?: string;
     migrations: Migration[];
+    baseDir: string;
     informationTableName?: string;
 }
 export interface Migration {
     version: number;
     tasks: MigrationTask[];
-    dirname?: string;
+    baseDir: string;
     backup?: boolean;
 }
 export type MigrationTask = SqlScriptMigrationTask | CustomMigrationTask | InsertDataMigrationTask;
 export interface BaseMigrationTask {
-    title: string;
+    title?: string;
     filename?: string;
 }
 export interface SqlScriptMigrationTask extends BaseMigrationTask {
-    title: string;
-    script: string;
+    script: string | Function;
 }
 export interface InsertDataMigrationTask extends BaseMigrationTask {
-    title: string;
     tableName: string;
     rows: Record<string, any>[];
 }
 export interface CustomMigrationTask extends BaseMigrationTask {
-    title: string;
     fn: (connection: any, adapter: MigrationAdapter) => void | Promise<void>;
 }
 export declare function isSqlScriptMigrationTask(x: any): x is SqlScriptMigrationTask;
 export declare function isInsertDataMigrationTask(x: any): x is InsertDataMigrationTask;
 export declare function isCustomMigrationTask(x: any): x is CustomMigrationTask;
-export interface MigrationPackageAsync extends StrictOmit<MigrationPackage, 'migrations'> {
-    migrations: (string | MigrationAsync | (() => MigrationAsync) | (() => Promise<MigrationAsync>))[];
+export interface MigrationPackageConfig extends PartialSome<StrictOmit<MigrationPackage, 'migrations'>, 'baseDir'> {
+    migrations: (string | MigrationConfig | (() => MigrationConfig) | (() => Promise<MigrationConfig>))[];
 }
-export interface MigrationAsync extends StrictOmit<Migration, 'tasks'> {
+export interface MigrationConfig extends StrictOmit<Migration, 'tasks' | 'baseDir'> {
     tasks: (string | MigrationTask | (() => MigrationTask) | (() => Promise<MigrationTask>))[];
 }
 export declare namespace MigrationPackage {
-    function load(asyncConfig: MigrationPackageAsync): Promise<MigrationPackage>;
+    function load(asyncConfig: MigrationPackageConfig): Promise<MigrationPackage>;
 }