rake-db 2.25.17 → 2.26.0

package/dist/index.js

@@ -1,10 +1,12 @@
 'use strict';
 
-var pqb = require('pqb');
 var orchidCore = require('orchid-core');
+var pqb = require('pqb');
 var path = require('path');
 var node_url = require('node:url');
 var fs = require('fs/promises');
+require('url');
+require('node:path');
 
 const getFirstWordAndRest = (input) => {
   const i = input.search(/(?=[A-Z])|[-_ ]/);
@@ -31,12 +33,6 @@ const getTextAfterTo = (input) => {
 const getTextAfterFrom = (input) => {
   return getTextAfterRegExp(input, /(From|-from|_from| from)[A-Z-_ ]/, 4);
 };
-const joinWords = (...words) => {
-  return words.slice(1).reduce(
-    (acc, word) => acc + word[0].toUpperCase() + word.slice(1),
-    words[0]
-  );
-};
 const joinColumns = (columns) => {
   return columns.map((column) => `"${column}"`).join(", ");
 };
@@ -81,19 +77,13 @@ const transaction = (adapter, fn) => {
   return adapter.transaction(begin, fn);
 };
 const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
-const exhaustive = (_) => {
-  throw new Error("Condition was not exhaustive");
-};
-const pluralize = (w, count, append = "s") => {
-  return count === 1 ? w : w + append;
-};
 
 let currentChanges = [];
 const clearChanges = () => {
   currentChanges = [];
 };
 const getCurrentChanges = () => currentChanges;
-const pushChange = (fn) => currentChanges.push(fn);
+const pushChange = (change) => currentChanges.push(change);
 
 const versionToString = (config, version) => config.migrationId === "timestamp" ? `${version}` : `${version}`.padStart(config.migrationId.serial, "0");
 const columnTypeToSql = (item) => {
@@ -3064,17 +3054,17 @@ function makeMigrateFn(defaultCount, up, fn) {
     return adapters;
   };
 }
-const migrate = makeMigrateFn(
+const fullMigrate = makeMigrateFn(
   Infinity,
   true,
   (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, true, false, force)
 );
-const rollback = makeMigrateFn(
+const fullRollback = makeMigrateFn(
   1,
   false,
   (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, false, false, force)
 );
-const redo = makeMigrateFn(
+const fullRedo = makeMigrateFn(
   1,
   true,
   async (trx, config, set, versions, count, force) => {
@@ -3095,7 +3085,7 @@ const redo = makeMigrateFn(
   }
 );
 const getDb = (adapter) => pqb.createDb({ adapter });
-const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, force, skipLock) => {
+const migrateOrRollback = async (trx, config, set, versions, count, up, redo, force, skipLock) => {
   const { sequence, map: versionsMap } = versions;
   if (up) {
     const rollbackTo = checkMigrationOrder(config, set, versions, force);
@@ -3116,7 +3106,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
         versions,
         sequence.length - i,
         false,
-        redo2
+        redo
       );
       set.migrations.reverse();
     }
@@ -3128,7 +3118,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
     db ?? (db = getDb(trx));
     const { migrations: migrations2 } = set;
     await beforeMigrate?.({ db, migrations: migrations2 });
-    await config.beforeChange?.({ db, migrations: migrations2, up, redo: redo2 });
+    await config.beforeChange?.({ db, migrations: migrations2, up, redo });
   }
   let loggedAboutStarting = false;
   let migrations;
@@ -3137,14 +3127,16 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
       continue;
     }
     if (count-- <= 0) break;
-    if (!loggedAboutStarting && (!redo2 || !up)) {
+    if (!loggedAboutStarting && (!redo || !up)) {
       loggedAboutStarting = true;
       config.logger?.log(
-        `${redo2 ? "Reapplying migrations for" : up ? "Migrating" : "Rolling back"} database ${trx.config.connectionString ? new URL(trx.config.connectionString).pathname.slice(1) : trx.config.database}
+        `${redo ? "Reapplying migrations for" : up ? "Migrating" : "Rolling back"} database ${trx.config.connectionString ? new URL(trx.config.connectionString).pathname.slice(1) : trx.config.database}
 `
       );
     }
-    await runMigration(trx, up, file, config);
+    const changes = await getChanges(file, config);
+    const adapter = await runMigration(trx, up, changes, config);
+    await changeMigratedVersion(adapter, up, file, config);
     (migrations ?? (migrations = [])).push(file);
     if (up) {
       const name = path.basename(file.path);
@@ -3163,7 +3155,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
   const afterMigrate = config[up ? "afterMigrate" : "afterRollback"];
   if (config.afterChange || afterMigrate) {
     db ?? (db = getDb(trx));
-    await config.afterChange?.({ db, up, redo: redo2, migrations });
+    await config.afterChange?.({ db, up, redo, migrations });
     await afterMigrate?.({ db, migrations });
   }
   return migrations;
@@ -3206,31 +3198,37 @@ Run \`**db command** up force\` to rollback the above migrations and migrate all
   return;
 };
 const changeCache = {};
-const runMigration = async (trx, up, file, config) => {
+const getChanges = async (file, config) => {
   clearChanges();
-  let changes = changeCache[file.path];
+  let changes = file.path ? changeCache[file.path] : void 0;
   if (!changes) {
     const module = await file.load();
     const exported = module?.default && orchidCore.toArray(module.default);
-    if (config.forceDefaultExports && !exported) {
+    if (config?.forceDefaultExports && !exported) {
       throw new RakeDbError(
         `Missing a default export in ${file.path} migration`
       );
     }
     changes = exported || getCurrentChanges();
-    changeCache[file.path] = changes;
+    if (file.path) changeCache[file.path] = changes;
   }
+  return changes;
+};
+const runMigration = async (trx, up, changes, config) => {
   const db = createMigrationInterface(trx, up, config);
   if (changes.length) {
     const from = up ? 0 : changes.length - 1;
     const to = up ? changes.length : -1;
     const step = up ? 1 : -1;
     for (let i = from; i !== to; i += step) {
-      await changes[i](db, up);
+      await changes[i].fn(db, up);
     }
   }
+  return db.adapter;
+};
+const changeMigratedVersion = async (adapter, up, file, config) => {
   await (up ? saveMigratedVersion : deleteMigratedVersion)(
-    db.adapter,
+    adapter,
     file.version,
     path.basename(file.path).slice(file.version.length + 1),
     config
@@ -3640,7 +3638,7 @@ const dropDb = async (options, config) => {
 const resetDb = async (options, config) => {
   await dropDb(options, config);
   await createDb(options, config);
-  await migrate({}, options, config);
+  await fullMigrate({}, options, config);
 };
 
 const filterSchema = (table) => `${table} !~ '^pg_' AND ${table} != 'information_schema'`;
@@ -4604,6 +4602,10 @@ const checkIfIsOuterRecursiveFkey = (data, table, references) => {
   return false;
 };
 
+const exhaustive = (_) => {
+  throw new Error("Condition was not exhaustive");
+};
+
 const astToGenerateItems = (config, asts, currentSchema) => {
   return asts.map((ast) => astToGenerateItem(config, ast, currentSchema));
 };
@@ -5644,7 +5646,7 @@ const rebase = async (options, config) => {
     return files2;
   }, []).sort((a, b) => +b.version - +a.version);
   set.migrations = migrationsDown;
-  await redo(
+  await fullRedo(
     ctx,
     options,
     {
@@ -5684,25 +5686,26 @@ const rakeDb = (options, partialConfig, args = process.argv.slice(2)) => {
     }
     throw err;
   });
-  return Object.assign(change, {
+  return Object.assign(makeChange(config), {
     promise
   });
 };
 rakeDb.lazy = (options, partialConfig) => {
   const config = processRakeDbConfig(partialConfig);
   return {
-    change,
+    change: makeChange(config),
     run(args, conf) {
       return runCommand(options, conf ? { ...config, ...conf } : config, args);
     }
   };
 };
-function change(fn) {
-  pushChange(fn);
-  return fn;
-}
+const makeChange = (config) => (fn) => {
+  const change = { fn, config };
+  pushChange(change);
+  return change;
+};
 const rakeDbAliases = {
-  migrate: "up",
+  fullMigrate: "up",
   rollback: "down",
   s: "status",
   rec: "recurrent"
@@ -5778,7 +5781,7 @@ ${Object.entries(helpArguments).map(
   };
 };
 const upCommand = {
-  run: (options, config, args) => migrate({}, options, config, args).then(
+  run: (options, config, args) => fullMigrate({}, options, config, args).then(
     () => runRecurrentMigrations(options, config)
   ),
   help: "migrate pending migrations",
@@ -5789,7 +5792,7 @@ const upCommand = {
   }
 };
 const downCommand = {
-  run: (options, config, args) => rollback({}, options, config, args),
+  run: (options, config, args) => fullRollback({}, options, config, args),
   help: "rollback migrated migrations",
   helpArguments: {
     "no arguments": "rollback one last migration",
@@ -5829,7 +5832,7 @@ const rakeDbCommands = {
   down: downCommand,
   rollback: downCommand,
   redo: {
-    run: (options, config, args) => redo({}, options, config, args).then(
+    run: (options, config, args) => fullRedo({}, options, config, args).then(
       () => runRecurrentMigrations(options, config)
     ),
     help: "rollback and migrate, run recurrent"
@@ -5861,89 +5864,43 @@ const rakeDbCommands = {
   }
 };
 
-exports.Migration = Migration;
-exports.NoMigrationsTableError = NoMigrationsTableError;
-exports.RAKE_DB_LOCK_KEY = RAKE_DB_LOCK_KEY;
-exports.addColumnComment = addColumnComment;
-exports.addColumnExclude = addColumnExclude;
-exports.addColumnIndex = addColumnIndex;
-exports.addOrDropEnumValues = addOrDropEnumValues;
+const migrateFiles = async (db, files) => {
+  const qb = db.$qb;
+  await qb.ensureTransaction(async () => {
+    const adapter = qb.internal.transactionStorage.getStore()?.adapter;
+    for (const load of files) {
+      clearChanges();
+      const changes = await getChanges({ load });
+      const config = changes[0]?.config;
+      await runMigration(adapter, true, changes, config);
+    }
+  });
+};
+
 exports.astToMigration = astToMigration;
-exports.changeCache = changeCache;
-exports.changeEnumValues = changeEnumValues;
-exports.clearChanges = clearChanges;
-exports.cmpRawSql = cmpRawSql;
-exports.colors = colors;
-exports.columnToSql = columnToSql;
-exports.columnTypeToSql = columnTypeToSql;
-exports.commentsToQuery = commentsToQuery;
 exports.concatSchemaAndName = concatSchemaAndName;
-exports.constraintToSql = constraintToSql;
-exports.createDb = createDb;
 exports.createMigrationInterface = createMigrationInterface;
 exports.dbColumnToAst = dbColumnToAst;
-exports.deleteMigratedVersion = deleteMigratedVersion;
-exports.dropDb = dropDb;
 exports.encodeColumnDefault = encodeColumnDefault;
-exports.excludesToQuery = excludesToQuery;
-exports.exhaustive = exhaustive;
-exports.generateTimeStamp = generateTimeStamp;
-exports.getColumnName = getColumnName;
+exports.fullMigrate = fullMigrate;
 exports.getConstraintName = getConstraintName;
-exports.getCurrentChanges = getCurrentChanges;
-exports.getDatabaseAndUserFromOptions = getDatabaseAndUserFromOptions;
 exports.getDbStructureTableData = getDbStructureTableData;
 exports.getDbTableColumnsChecks = getDbTableColumnsChecks;
 exports.getExcludeName = getExcludeName;
-exports.getFirstWordAndRest = getFirstWordAndRest;
-exports.getForeignKeyTable = getForeignKeyTable;
 exports.getIndexName = getIndexName;
-exports.getMigratedVersionsMap = getMigratedVersionsMap;
 exports.getSchemaAndTableFromName = getSchemaAndTableFromName;
-exports.getTextAfterFrom = getTextAfterFrom;
-exports.getTextAfterTo = getTextAfterTo;
-exports.identityToSql = identityToSql;
-exports.indexesToQuery = indexesToQuery;
 exports.instantiateDbColumn = instantiateDbColumn;
-exports.interpolateSqlValues = interpolateSqlValues;
 exports.introspectDbSchema = introspectDbSchema;
-exports.joinColumns = joinColumns;
-exports.joinWords = joinWords;
-exports.makeDbStructureColumnsShape = makeDbStructureColumnsShape;
 exports.makeDomainsMap = makeDomainsMap;
 exports.makeFileVersion = makeFileVersion;
-exports.makePopulateEnumQuery = makePopulateEnumQuery;
 exports.makeStructureToAstCtx = makeStructureToAstCtx;
-exports.migrate = migrate;
-exports.migrateOrRollback = migrateOrRollback;
+exports.migrateFiles = migrateFiles;
 exports.migrationConfigDefaults = migrationConfigDefaults;
-exports.nameColumnChecks = nameColumnChecks;
-exports.newMigration = newMigration;
-exports.pluralize = pluralize;
-exports.primaryKeyToSql = primaryKeyToSql;
-exports.processRakeDbConfig = processRakeDbConfig;
-exports.promptConfirm = promptConfirm;
 exports.promptSelect = promptSelect;
-exports.promptText = promptText;
-exports.pushChange = pushChange;
-exports.queryLock = queryLock;
-exports.quoteCustomType = quoteCustomType;
-exports.quoteNameFromString = quoteNameFromString;
-exports.quoteSchemaTable = quoteSchemaTable;
-exports.quoteTable = quoteTable;
-exports.quoteWithSchema = quoteWithSchema;
 exports.rakeDb = rakeDb;
-exports.rakeDbAliases = rakeDbAliases;
 exports.rakeDbCommands = rakeDbCommands;
-exports.redo = redo;
-exports.referencesToSql = referencesToSql;
-exports.renameType = renameType;
-exports.resetDb = resetDb;
-exports.rollback = rollback;
 exports.saveMigratedVersion = saveMigratedVersion;
 exports.structureToAst = structureToAst;
 exports.tableToAst = tableToAst;
-exports.transaction = transaction;
-exports.versionToString = versionToString;
 exports.writeMigrationFile = writeMigrationFile;
 //# sourceMappingURL=index.js.map