rake-db 2.20.8 → 2.20.10

package/dist/index.d.ts

@@ -1478,7 +1478,7 @@ declare const rollback: MigrateFn;
  * Takes the same options as {@link migrate}.
  */
 declare const redo: MigrateFn;
-declare const migrateOrRollback: (trx: TransactionAdapter, config: RakeDbConfig<ColumnSchemaConfig, unknown>, set: MigrationsSet, versions: RakeDbAppliedVersions, count: number, up: boolean, redo: boolean, force?: boolean, skipLock?: boolean) => Promise<void>;
+declare const migrateOrRollback: (trx: TransactionAdapter, config: RakeDbConfig<ColumnSchemaConfig, unknown>, set: MigrationsSet, versions: RakeDbAppliedVersions, count: number, up: boolean, redo: boolean, force?: boolean, skipLock?: boolean) => Promise<MigrationItem[]>;
 declare const changeCache: Record<string, ChangeCallback<unknown>[] | undefined>;
 
 declare namespace DbStructure {

package/dist/index.js

@@ -2925,6 +2925,7 @@ function makeMigrateFn(defaultCount, up, fn) {
     for (let i = 0; i < length; i++) {
       const opts = options[i];
       const adapter = adapters[i];
+      let migrations;
       try {
         await transaction(adapter, async (trx) => {
           const versions = await getMigratedVersionsMap(
@@ -2933,7 +2934,7 @@ function makeMigrateFn(defaultCount, up, fn) {
             config,
             set.renameTo
           );
-          await fn(
+          migrations = await fn(
             trx,
             conf,
             set,
@@ -2953,7 +2954,14 @@ function makeMigrateFn(defaultCount, up, fn) {
               config2,
               set.renameTo
             );
-            await fn(trx, config2, set, versions, count != null ? count : defaultCount, force);
+            migrations = await fn(
+              trx,
+              config2,
+              set,
+              versions,
+              count != null ? count : defaultCount,
+              force
+            );
           });
         } else {
           throw err;
@@ -2965,7 +2973,7 @@ function makeMigrateFn(defaultCount, up, fn) {
       (_a = config.afterChangeCommit) == null ? void 0 : _a.call(config, {
         options: opts,
         up,
-        migrations: set.migrations
+        migrations
       });
     }
     return adapters;
@@ -2988,7 +2996,7 @@ const redo = makeMigrateFn(
     set.migrations.reverse();
     await migrateOrRollback(trx, config, set, versions, count, false, true);
     set.migrations.reverse();
-    await migrateOrRollback(
+    return migrateOrRollback(
       trx,
       config,
       set,
@@ -3036,11 +3044,12 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
   const beforeMigrate = config[up ? "beforeMigrate" : "beforeRollback"];
   if (beforeMigrate || config.beforeChange) {
     db != null ? db : db = getDb(trx);
-    const { migrations } = set;
-    await (beforeMigrate == null ? void 0 : beforeMigrate({ db, migrations }));
-    await ((_a = config.beforeChange) == null ? void 0 : _a.call(config, { db, migrations, up, redo: redo2 }));
+    const { migrations: migrations2 } = set;
+    await (beforeMigrate == null ? void 0 : beforeMigrate({ db, migrations: migrations2 }));
+    await ((_a = config.beforeChange) == null ? void 0 : _a.call(config, { db, migrations: migrations2, up, redo: redo2 }));
   }
   let loggedAboutStarting = false;
+  let migrations;
   for (const file of set.migrations) {
     if (up && versionsMap[file.version] || !up && !versionsMap[file.version]) {
       continue;
@@ -3055,6 +3064,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
       );
     }
     await runMigration(trx, up, file, config);
+    (migrations != null ? migrations : migrations = []).push(file);
     if (up) {
       const name = path.basename(file.path);
       versionsMap[file.version] = name;
@@ -3068,13 +3078,14 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
 `
     );
   }
+  migrations != null ? migrations : migrations = orchidCore.emptyArray;
   const afterMigrate = config[up ? "afterMigrate" : "afterRollback"];
   if (config.afterChange || afterMigrate) {
     db != null ? db : db = getDb(trx);
-    const { migrations } = set;
     await ((_d = config.afterChange) == null ? void 0 : _d.call(config, { db, up, redo: redo2, migrations }));
     await (afterMigrate == null ? void 0 : afterMigrate({ db, migrations }));
   }
+  return migrations;
 };
 const checkMigrationOrder = (config, set, { sequence, map }, force) => {
   const last = sequence[sequence.length - 1];