rake-db 2.37.13 → 2.37.15

package/dist/index.d.ts

@@ -1777,6 +1777,11 @@ interface MigrateConfigBase extends QueryLogOptions {
   migrationsTable?: string;
   transaction?: 'single' | 'per-migration';
   transactionSearchPath?: SearchPath;
+  /**
+   * Advisory lock key used while migrating or rolling back.
+   * Defaults to rake-db's fixed lock key.
+   */
+  migrationLockKey?: bigint;
   forceDefaultExports?: boolean;
   beforeChange?: ChangeCallback$1;
   afterChange?: ChangeCallback$1;
@@ -1899,6 +1904,11 @@ interface RakeDbCliConfigInputBase<SchemaConfig extends ColumnSchemaConfig, CT =
   };
   noPrimaryKey?: NoPrimaryKeyOption;
   transactionSearchPath?: SearchPath;
+  /**
+   * Advisory lock key used while migrating or rolling back.
+   * Defaults to rake-db's fixed lock key.
+   */
+  migrationLockKey?: bigint;
   /**
    * Throw if a migration doesn't have a default export.
    * This is needed when in your setup you're importing migration files first and execute them later,
@@ -1998,6 +2008,7 @@ interface RakeDbConfig<ColumnTypes = unknown> extends QueryLogOptions {
   afterRollback?: MigrationCallback;
   migrationId: RakeDbMigrationId;
   transactionSearchPath?: SearchPath;
+  migrationLockKey?: bigint;
   forceDefaultExports?: boolean;
   afterChangeCommit?: ChangeCommitCallback;
   basePath: string;

package/dist/index.js

@@ -26,7 +26,7 @@ let node_url = require("node:url");
 let pqb = require("pqb");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
-const RAKE_DB_LOCK_KEY = "8582141715823621641";
+const RAKE_DB_LOCK_KEY = 8582141715823621641n;
 const getFirstWordAndRest = (input) => {
 	const i = input.search(/(?=[A-Z])|[-_ ]/);
 	if (i !== -1) {
@@ -88,7 +88,7 @@ const transaction = (adapter, config, fn) => {
 	const searchPath = config.transactionSearchPath;
 	return adapter.transaction(void 0, searchPath ? { setConfig: { search_path: typeof searchPath === "function" ? searchPath() : searchPath } } : void 0, fn);
 };
-const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
+const queryLock = (trx, key = RAKE_DB_LOCK_KEY) => trx.query(`SELECT pg_advisory_xact_lock('${key}')`);
 const getCliParam = (args, name) => {
 	if (args) {
 		const key = "--" + name;
@@ -3482,7 +3482,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo, fo
 			set.migrations.reverse();
 		}
 	}
-	if (!skipLock) await queryLock(trx);
+	if (!skipLock) await queryLock(trx, config.migrationLockKey);
 	let db;
 	const beforeMigrate = config[up ? "beforeMigrate" : "beforeRollback"];
 	if (beforeMigrate || config.beforeChange) {
@@ -3636,7 +3636,8 @@ const CSI = `[`;
 const cursorShow = `${CSI}?25h`;
 const cursorHide = `${CSI}?25l`;
 const { stdin, stdout } = process;
-const visibleChars = (s) => s.replace(/[\u001B\u009B][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PRZcf-ntqry=><~]))/g, "").length;
+const stripAnsi = (s) => s.replace(/[\u001B\u009B][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PRZcf-ntqry=><~]))/g, "");
+const visibleChars = (s) => stripAnsi(s).length;
 const clear = (text) => {
 	const rows = text.split(/\r?\n/).reduce((rows, line) => rows + 1 + Math.floor(Math.max(visibleChars(line) - 1, 0) / stdout.columns), 0);
 	let clear = "";
@@ -3646,9 +3647,10 @@ const clear = (text) => {
 	}
 	return clear;
 };
-const prompt = async ({ render, onKeyPress, validate, value, cursor: showCursor }) => {
+const prompt = async ({ message, render, onKeyPress, validate, value, cursor: showCursor }) => {
+	if (!stdin.isTTY) throw new RakeDbError(`Cannot prompt "${stripAnsi(message)}": stdin is not a TTY, run the command in an interactive terminal`);
 	stdin.resume();
-	if (stdin.isTTY) stdin.setRawMode(true);
+	stdin.setRawMode(true);
 	stdin.setEncoding("utf-8");
 	if (!showCursor) stdout.write(cursorHide);
 	return new Promise((res) => {
@@ -3673,7 +3675,7 @@ const prompt = async ({ render, onKeyPress, validate, value, cursor: showCursor
 		};
 		const close = () => {
 			if (!showCursor) stdout.write(cursorShow);
-			if (stdin.isTTY) stdin.setRawMode(false);
+			stdin.setRawMode(false);
 			stdin.off("data", keypress);
 			stdin.pause();
 		};
@@ -3692,6 +3694,7 @@ const prompt = async ({ render, onKeyPress, validate, value, cursor: showCursor
 const defaultActive = (s) => `${pqb_internal.colors.blueBold("❯")} ${s}`;
 const defaultInactive = (s) => `  ${s}`;
 const promptSelect = ({ message, options, active = defaultActive, inactive = defaultInactive }) => prompt({
+	message,
 	value: 0,
 	render(ctx) {
 		let text = `${message} ${pqb_internal.colors.pale("Use arrows or jk. Press enter to submit.")}\n`;
@@ -3704,6 +3707,7 @@ const promptSelect = ({ message, options, active = defaultActive, inactive = def
 	}
 });
 const promptConfirm = ({ message }) => prompt({
+	message,
 	value: true,
 	render(ctx) {
 		return `${pqb_internal.colors.bright(message)}\n${ctx.submitted ? `> ${ctx.value ? pqb_internal.colors.greenBold("Yes") : pqb_internal.colors.yellowBold("No")}` : pqb_internal.colors.pale(`> (Y/n)`)}\n`;
@@ -3720,6 +3724,7 @@ const promptText = ({ message, default: def = "", password, min }) => {
 	let x = 0;
 	const renderValue = (ctx) => password ? "*".repeat(ctx.value.length) : ctx.value;
 	return prompt({
+		message,
 		value: def,
 		cursor: true,
 		validate: (ctx) => !min || ctx.value.length >= min,