orchid-orm 1.72.4 → 1.72.5

package/dist/migrations/index.js

@@ -572,7 +572,7 @@ const processEnums = async (ast, dbStructure, { codeItems: { enums }, currentSch
 		if (generatorIgnore?.schemas?.includes(dbEnum.schemaName) || generatorIgnore?.enums?.includes(dbEnum.name)) continue;
 		const codeEnum = enums.get(`${dbEnum.schemaName}.${dbEnum.name}`);
 		if (codeEnum) {
-			changeEnum(ast, dbEnum, codeEnum, pendingDbTypes);
+			await changeEnum(ast, dbEnum, codeEnum, pendingDbTypes, verifying);
 			continue;
 		}
 		const i = createEnums.findIndex((x) => x.name === dbEnum.name);
@@ -591,7 +591,7 @@ const processEnums = async (ast, dbStructure, { codeItems: { enums }, currentSch
 				to: dbEnum.name
 			});
 			pendingDbTypes.add(toSchema, dbEnum.name);
-			changeEnum(ast, dbEnum, codeEnum, pendingDbTypes);
+			await changeEnum(ast, dbEnum, codeEnum, pendingDbTypes, verifying);
 			continue;
 		}
 		dropEnums.push(dbEnum);
@@ -617,7 +617,7 @@ const processEnums = async (ast, dbStructure, { codeItems: { enums }, currentSch
 					to
 				});
 				pendingDbTypes.add(toSchema, to);
-				changeEnum(ast, dbEnum, codeEnum, pendingDbTypes);
+				await changeEnum(ast, dbEnum, codeEnum, pendingDbTypes, verifying);
 				continue;
 			}
 		}
@@ -636,34 +636,63 @@ const processEnums = async (ast, dbStructure, { codeItems: { enums }, currentSch
 		values: dbEnum.values
 	});
 };
-const changeEnum = (ast, dbEnum, codeEnum, pendingDbTypes) => {
+const changeEnum = async (ast, dbEnum, codeEnum, pendingDbTypes, verifying) => {
 	const { values: dbValues } = dbEnum;
 	const { values: codeValues, schema, name } = codeEnum;
+	const addValues = codeValues.filter((value) => !dbValues.includes(value));
+	const dropValues = dbValues.filter((value) => !codeValues.includes(value));
 	if (dbValues.length < codeValues.length) {
-		if (!dbValues.some((value) => !codeValues.includes(value))) {
+		if (!dropValues.length) {
 			ast.push({
 				type: "enumValues",
 				action: "add",
 				schema,
 				name,
-				values: codeValues.filter((value) => !dbValues.includes(value))
+				values: addValues
 			});
 			pendingDbTypes.add(schema, name);
 			return;
 		}
 	} else if (dbValues.length > codeValues.length) {
-		if (!codeValues.some((value) => !dbValues.includes(value))) {
+		if (!addValues.length) {
 			ast.push({
 				type: "enumValues",
 				action: "drop",
 				schema,
 				name,
-				values: dbValues.filter((value) => !codeValues.includes(value))
+				values: dropValues
 			});
 			pendingDbTypes.add(schema, name);
 			return;
 		}
-	} else if (!dbValues.some((value) => !codeValues.includes(value))) return;
+	} else if (!dropValues.length) return;
+	const enumValueChanges = await promptEnumValueChanges(name, dbValues, codeValues, addValues, dropValues, verifying);
+	if (enumValueChanges) {
+		let changed = false;
+		if (Object.keys(enumValueChanges.renamedValues).length) {
+			ast.push({
+				type: "renameEnumValues",
+				schema,
+				name,
+				values: enumValueChanges.renamedValues
+			});
+			changed = true;
+		}
+		if (enumValueChanges.fromValues) {
+			ast.push({
+				type: "changeEnumValues",
+				schema,
+				name,
+				fromValues: enumValueChanges.fromValues,
+				toValues: enumValueChanges.toValues
+			});
+			changed = true;
+		}
+		if (changed) {
+			pendingDbTypes.add(schema, name);
+			return;
+		}
+	}
 	ast.push({
 		type: "changeEnumValues",
 		schema,
@@ -673,6 +702,33 @@ const changeEnum = (ast, dbEnum, codeEnum, pendingDbTypes) => {
 	});
 	pendingDbTypes.add(schema, name);
 };
+const promptEnumValueChanges = async (enumName, dbValues, codeValues, addValues, dropValues, verifying) => {
+	if (!addValues.length || !dropValues.length) return;
+	const renamedValues = {};
+	const remainingDropValues = [...dropValues];
+	for (const value of addValues) if (remainingDropValues.length) {
+		if (verifying) throw new AbortSignal();
+		const i = await (0, rake_db.promptSelect)({
+			message: `Add or rename ${pqb_internal.colors.blueBold(value)} enum value in ${pqb_internal.colors.blueBold(enumName)}?`,
+			options: [`${pqb_internal.colors.greenBold("+")} ${value}  ${pqb_internal.colors.pale("add enum value")}`, ...remainingDropValues.map((dropValue) => `${pqb_internal.colors.yellowBold("~")} ${dropValue} ${pqb_internal.colors.yellowBold("=>")} ${value}  ${pqb_internal.colors.pale("rename enum value")}`)]
+		});
+		if (i) {
+			const dropValue = remainingDropValues[i - 1];
+			remainingDropValues.splice(i - 1, 1);
+			renamedValues[dropValue] = value;
+		}
+	}
+	const fromValues = dbValues.map((value) => renamedValues[value] ?? value);
+	const toValues = codeValues;
+	return fromValues.some((value, i) => value !== toValues[i]) ? {
+		renamedValues,
+		fromValues,
+		toValues
+	} : {
+		renamedValues,
+		toValues
+	};
+};
 const renameColumnsTypeSchema = (dbStructure, from, to) => {
 	for (const table of dbStructure.tables) for (const column of table.columns) if (column.typeSchema === from) column.typeSchema = to;
 };
@@ -2610,16 +2666,21 @@ const report = (ast, config, currentSchema) => {
 		case "enumValues":
 			code.push(`${a.action === "add" ? green("+ add values to enum") : red("- remove values from enum")} ${dbItemName(a, currentSchema)}: ${a.values.join(", ")}`);
 			break;
-		case "changeEnumValues":
-			if (a.fromValues) code.push(`${red("- remove values from enum")} ${dbItemName(a, currentSchema)}: ${a.fromValues.join(", ")}`);
-			if (a.toValues) code.push(`${green("+ add values to enum")} ${dbItemName(a, currentSchema)}: ${a.toValues.join(", ")}`);
+		case "changeEnumValues": {
+			const fromValues = a.fromValues.filter((value) => !a.toValues.includes(value));
+			const toValues = a.toValues.filter((value) => !a.fromValues.includes(value));
+			if (fromValues.length) code.push(`${red("- remove values from enum")} ${dbItemName(a, currentSchema)}: ${fromValues.join(", ")}`);
+			if (toValues.length) code.push(`${green("+ add values to enum")} ${dbItemName(a, currentSchema)}: ${toValues.join(", ")}`);
+			break;
+		}
+		case "renameEnumValues":
+			code.push(`${yellow("~ rename values in enum")} ${dbItemName(a, currentSchema)}: ${Object.entries(a.values).map(([from, to]) => `${from} ${yellow("=>")} ${to}`).join(", ")}`);
 			break;
 		case "domain":
 			code.push(`${a.action === "create" ? green("+ create domain") : red("- drop domain")} ${dbItemName(a, currentSchema)}`);
 			break;
 		case "view":
 		case "collation":
-		case "renameEnumValues":
 		case "constraint": break;
 		case "renameTableItem":
 			code.push(`${yellow(`~ rename ${a.kind.toLowerCase()}`)} on table ${dbItemName({