kintone-migrator 0.31.3 → 0.31.5

package/dist/index.mjs

@@ -713,7 +713,7 @@ const ActionDiffDetector = { detect: (local, remote) => {
 			if (diffs.length > 0) return {
 				type: "modified",
 				actionName: name,
-				details: diffs.join(", ")
+				details: diffs.join("\n")
 			};
 		},
 		onDeleted: (name, remoteAction) => ({
@@ -2036,8 +2036,15 @@ async function executeMultiApp(plan, executor) {
 			continue;
 		}
 		try {
-			await executor(app);
-			results.push({
+			const outcome = await executor(app);
+			if (outcome && outcome.ok === false) {
+				results.push({
+					name: app.name,
+					status: "failed",
+					error: outcome.error
+				});
+				failed = true;
+			} else results.push({
 				name: app.name,
 				status: "succeeded"
 			});
@@ -2428,6 +2435,11 @@ function colorizeDiffEntry(type) {
 		prefix: type === "added" ? "+" : type === "deleted" ? "-" : "~"
 	};
 }
+function indentContinuationLines(text, indent = "    ") {
+	if (!text.includes("\n")) return text;
+	const [first, ...rest] = text.split("\n");
+	return [first, ...rest.map((line) => line.length > 0 ? `${indent}${line}` : line)].join("\n");
+}
 function printGenericDiffResult(result, title, formatEntry) {
 	for (const w of result.warnings) p.log.warn(w);
 	if (result.isEmpty) {
@@ -2437,7 +2449,7 @@ function printGenericDiffResult(result, title, formatEntry) {
 	p.log.info(`Changes: ${formatDiffSummary(result.summary)}`);
 	const lines = result.entries.map((entry) => {
 		const { colorize, prefix } = colorizeDiffEntry(entry.type);
-		return formatEntry(entry, colorize, prefix);
+		return indentContinuationLines(formatEntry(entry, colorize, prefix));
 	});
 	p.note(lines.join("\n"), title, { format: (v) => v });
 }
@@ -2465,7 +2477,7 @@ function printDiffResult(result) {
 	if (result.hasLayoutChanges) p.log.info("Layout changes detected.");
 	const lines = result.entries.map((entry) => {
 		const { colorize, prefix } = colorizeDiffEntry(entry.type);
-		return `${colorize(prefix)} ${pc.dim("[")}${colorize(entry.fieldCode)}${pc.dim("]")} ${entry.fieldLabel}${pc.dim(":")} ${entry.details}`;
+		return indentContinuationLines(`${colorize(prefix)} ${pc.dim("[")}${colorize(entry.fieldCode)}${pc.dim("]")} ${entry.fieldLabel}${pc.dim(":")} ${entry.details}`);
 	});
 	p.note(lines.join("\n"), "Diff Details", { format: (v) => v });
 }
@@ -2657,7 +2669,7 @@ async function routeMultiApp(values, handlers) {
 async function runMultiAppWithHeaders(plan, executor, successMessage) {
 	await runMultiAppWithFailCheck(plan, async (app) => {
 		printAppHeader(app.name, app.appId);
-		await executor(app);
+		return executor(app);
 	}, successMessage);
 }
 /**
@@ -3447,7 +3459,7 @@ const AppPermissionDiffDetector = { detect: (local, remote) => {
 			if (diffs.length > 0) entries.push({
 				type: "modified",
 				entityKey: key,
-				details: diffs.join(", ")
+				details: diffs.join("\n")
 			});
 		}
 	}
@@ -3946,7 +3958,7 @@ function describeChanges$1(before, after) {
 	if (before.label !== after.label) changes.push(`label: ${before.label} -> ${after.label}`);
 	if ((before.noLabel ?? false) !== (after.noLabel ?? false)) changes.push(`noLabel: ${before.noLabel ?? false} -> ${after.noLabel ?? false}`);
 	if (!isPropertiesEqual(before, after)) changes.push(...describePropertiesChanges(before, after));
-	return changes.length > 0 ? changes.join(", ") : "no visible changes";
+	return changes.length > 0 ? changes.join("\n") : "no visible changes";
 }
 function isLayoutEqual(a, b) {
 	return deepEqual(a, b);
@@ -5736,6 +5748,7 @@ function buildPhases(args) {
 			name: "Schema",
 			tasks: [{
 				domain: "schema",
+				storageExists: async () => (await c.schema.schemaStorage.get()).exists,
 				run: async () => {
 					await executeMigration({ container: c.schema });
 				}
@@ -5745,6 +5758,7 @@ function buildPhases(args) {
 			name: "Views & Customization",
 			tasks: [{
 				domain: "customize",
+				storageExists: async () => (await c.customization.customizationStorage.get()).exists,
 				run: async () => {
 					await applyCustomization({
 						container: c.customization,
@@ -5753,6 +5767,7 @@ function buildPhases(args) {
 				}
 			}, {
 				domain: "view",
+				storageExists: async () => (await c.view.viewStorage.get()).exists,
 				run: async () => {
 					await applyView({ container: c.view });
 				}
@@ -5763,18 +5778,21 @@ function buildPhases(args) {
 			tasks: [
 				{
 					domain: "field-acl",
+					storageExists: async () => (await c.fieldPermission.fieldPermissionStorage.get()).exists,
 					run: async () => {
 						await applyFieldPermission({ container: c.fieldPermission });
 					}
 				},
 				{
 					domain: "app-acl",
+					storageExists: async () => (await c.appPermission.appPermissionStorage.get()).exists,
 					run: async () => {
 						await applyAppPermission({ container: c.appPermission });
 					}
 				},
 				{
 					domain: "record-acl",
+					storageExists: async () => (await c.recordPermission.recordPermissionStorage.get()).exists,
 					run: async () => {
 						await applyRecordPermission({ container: c.recordPermission });
 					}
@@ -5786,42 +5804,49 @@ function buildPhases(args) {
 			tasks: [
 				{
 					domain: "settings",
+					storageExists: async () => (await c.settings.generalSettingsStorage.get()).exists,
 					run: async () => {
 						await applyGeneralSettings({ container: c.settings });
 					}
 				},
 				{
 					domain: "notification",
+					storageExists: async () => (await c.notification.notificationStorage.get()).exists,
 					run: async () => {
 						await applyNotification({ container: c.notification });
 					}
 				},
 				{
 					domain: "report",
+					storageExists: async () => (await c.report.reportStorage.get()).exists,
 					run: async () => {
 						await applyReport({ container: c.report });
 					}
 				},
 				{
 					domain: "action",
+					storageExists: async () => (await c.action.actionStorage.get()).exists,
 					run: async () => {
 						await applyAction({ container: c.action });
 					}
 				},
 				{
 					domain: "process",
+					storageExists: async () => (await c.process.processManagementStorage.get()).exists,
 					run: async () => {
 						await applyProcessManagement({ container: c.process });
 					}
 				},
 				{
 					domain: "admin-notes",
+					storageExists: async () => (await c.adminNotes.adminNotesStorage.get()).exists,
 					run: async () => {
 						await applyAdminNotes({ container: c.adminNotes });
 					}
 				},
 				{
 					domain: "plugin",
+					storageExists: async () => (await c.plugin.pluginStorage.get()).exists,
 					run: async () => {
 						await applyPlugin({ container: c.plugin });
 					}
@@ -5832,6 +5857,7 @@ function buildPhases(args) {
 			name: "Seed Data",
 			tasks: [{
 				domain: "seed",
+				storageExists: async () => (await c.seed.seedStorage.get()).exists,
 				run: async () => {
 					await upsertSeed({
 						container: c.seed,
@@ -5853,7 +5879,7 @@ function buildSkippedPhaseResult(phase, state) {
 			domain: task.domain,
 			success: false,
 			error: skipError,
-			skipped: true
+			skipped: "aborted"
 		}))
 	};
 }
@@ -5862,24 +5888,34 @@ function toError(error) {
 }
 async function executeSchemaPhase(phase, containers, state) {
 	const results = [];
-	for (const task of phase.tasks) try {
-		await task.run();
-		await deployApp({ container: containers.schema });
-		results.push({
-			domain: task.domain,
-			success: true
-		});
-	} catch (error) {
-		const err = toError(error);
-		results.push({
-			domain: task.domain,
-			success: false,
-			error: err,
-			skipped: false
-		});
-		state.aborted = true;
-		state.reason = err;
-		state.phaseName = phase.name;
+	for (const task of phase.tasks) {
+		if (!await task.storageExists()) {
+			results.push({
+				domain: task.domain,
+				success: false,
+				skipped: "not-found"
+			});
+			continue;
+		}
+		try {
+			await task.run();
+			await deployApp({ container: containers.schema });
+			results.push({
+				domain: task.domain,
+				success: true
+			});
+		} catch (error) {
+			const err = toError(error);
+			results.push({
+				domain: task.domain,
+				success: false,
+				error: err,
+				skipped: false
+			});
+			state.aborted = true;
+			state.reason = err;
+			state.phaseName = phase.name;
+		}
 	}
 	return {
 		phase: phase.name,
@@ -5894,7 +5930,15 @@ async function executeStandardPhase(phase, state) {
 				domain: task.domain,
 				success: false,
 				error: createSkipError(state),
-				skipped: true
+				skipped: "aborted"
+			});
+			continue;
+		}
+		if (!await task.storageExists()) {
+			results.push({
+				domain: task.domain,
+				success: false,
+				skipped: "not-found"
 			});
 			continue;
 		}
@@ -7473,7 +7517,7 @@ function compareGeneralSection(local, remote) {
 				type: "modified",
 				section: "general",
 				name: key,
-				details: diffs.join(", ")
+				details: diffs.join("\n")
 			});
 		}
 	}
@@ -7500,7 +7544,7 @@ function describePerRecordChanges(local, remote) {
 	const diffs = [];
 	if (local.title !== remote.title) diffs.push(`title: "${remote.title}" -> "${local.title}"`);
 	if (!deepEqual(local.targets, remote.targets)) diffs.push(`targets: ${formatValue(remote.targets)} -> ${formatValue(local.targets)}`);
-	return diffs.length > 0 ? diffs.join(", ") : "changed";
+	return diffs.length > 0 ? diffs.join("\n") : "changed";
 }
 function describeReminderChanges(local, remote) {
 	const diffs = [];
@@ -7510,7 +7554,7 @@ function describeReminderChanges(local, remote) {
 	if ((local.time ?? "") !== (remote.time ?? "")) diffs.push(`time: "${remote.time ?? ""}" -> "${local.time ?? ""}"`);
 	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
 	if (!deepEqual(local.targets, remote.targets)) diffs.push(`targets: ${formatValue(remote.targets)} -> ${formatValue(local.targets)}`);
-	return diffs.length > 0 ? diffs.join(", ") : "changed";
+	return diffs.length > 0 ? diffs.join("\n") : "changed";
 }
 function comparePerRecordSection(local, remote) {
 	const entries = [];
@@ -7664,7 +7708,7 @@ const PluginDiffDetector = { detect: (local, remote) => {
 			if (diffs.length > 0) entries.push({
 				type: "modified",
 				pluginId: id,
-				details: diffs.join(", ")
+				details: diffs.join("\n")
 			});
 		}
 	}
@@ -7733,7 +7777,7 @@ function compareStates(local, remote, entries) {
 			type: "modified",
 			category: "state",
 			name,
-			details: stateDiffs.join(", ")
+			details: stateDiffs.join("\n")
 		});
 	}
 	for (const name of remoteStateNames) if (!localStateNames.has(name)) entries.push({
@@ -7760,7 +7804,7 @@ function compareActionEntries(local, remote, entries) {
 				type: "modified",
 				category: "action",
 				name,
-				details: actionDiffs.join(", ")
+				details: actionDiffs.join("\n")
 			});
 		}
 	}
@@ -7904,7 +7948,7 @@ const ReportDiffDetector = { detect: (local, remote) => {
 			if (diffs.length > 0) return {
 				type: "modified",
 				reportName: name,
-				details: diffs.join(", ")
+				details: diffs.join("\n")
 			};
 		},
 		onDeleted: (name, remoteReport) => ({
@@ -7957,7 +8001,7 @@ const ViewDiffDetector = { detect: (localViews, remoteViews) => {
 			if (changes.length > 0) return {
 				type: "modified",
 				viewName: name,
-				details: changes.join(", ")
+				details: changes.join("\n")
 			};
 		},
 		onDeleted: (name, remoteView) => ({
@@ -8154,7 +8198,8 @@ const domainDisplayName$1 = {
 function formatTaskResult(result) {
 	const name = domainDisplayName$1[result.domain];
 	if (result.success) return `  ${pc.green("✓")} ${name}`;
-	if (result.skipped) return `  ${pc.yellow("⊘")} ${name} ${pc.dim("—")} ${pc.yellow("skipped")}`;
+	if (result.skipped === "not-found") return `  ${pc.yellow("⊘")} ${name} ${pc.dim("—")} ${pc.yellow("skipped (file not found)")}`;
+	if (result.skipped === "aborted") return `  ${pc.yellow("⊘")} ${name} ${pc.dim("—")} ${pc.yellow("skipped")}`;
 	return `  ${pc.red("✗")} ${name} ${pc.dim("—")} ${pc.red(`failed (${formatErrorForDisplay(result.error)})`)}`;
 }
 function printPhaseResult(phaseResult) {
@@ -8175,6 +8220,7 @@ function printApplyAllResults(output) {
 	const skipped = allResults.filter((r) => !r.success && r.skipped).length;
 	if (output.deployed) p.log.success("Deployed to production.");
 	else if (output.deployError) p.log.warn(`Deployment failed: ${formatErrorForDisplay(output.deployError)}`);
+	else if (succeeded === 0 && failed === 0 && skipped > 0) p.log.info("No config files found. Nothing to apply.");
 	else if (succeeded === 0) p.log.warn("Not deployed due to errors.");
 	else if (failed > 0 || skipped > 0) p.log.info("Deployment skipped (no Phase 2-4 changes applied successfully).");
 	const parts = [];
@@ -8314,19 +8360,20 @@ async function runApplyAll(cliConfig, appName, options) {
 	const diffFailCount = diffResults.filter((r) => !r.success).length;
 	ds.stop(`Comparison complete.${diffFailCount > 0 ? ` (${diffFailCount} failed)` : ""}`);
 	printDiffAllResults(diffResults);
-	p.log.info("Note: Seed data will be upserted (no diff preview available).");
+	const seedExists = (await containers.seed.seedStorage.get()).exists;
+	if (seedExists) p.log.info("Note: Seed data will be upserted (no diff preview available).");
 	const hasChanges = diffResults.some((r) => r.success && !r.result.isEmpty);
-	if (!hasChanges) p.log.success("No changes detected. Seed data will still be upserted.");
+	if (!hasChanges) p.log.success(seedExists ? "No changes detected. Seed data will still be upserted." : "No changes detected.");
 	if (options.dryRun) {
 		p.log.info("Dry run complete. No changes will be applied.");
-		if (!hasChanges) p.log.info("Note: Seed data would still be upserted when running without --dry-run.");
-		return;
+		if (!hasChanges && seedExists) p.log.info("Note: Seed data would still be upserted when running without --dry-run.");
+		return { ok: true };
 	}
 	if (!options.skipConfirm) {
 		const shouldContinue = await p.confirm({ message: "Apply these changes?" });
 		if (p.isCancel(shouldContinue) || !shouldContinue) {
 			p.cancel("Apply cancelled.");
-			return;
+			return { ok: true };
 		}
 	}
 	const as = p.spinner();
@@ -8335,10 +8382,14 @@ async function runApplyAll(cliConfig, appName, options) {
 		containers,
 		customizeBasePath
 	});
-	const applyFailCount = output.phases.flatMap((pr) => pr.results).filter((r) => !r.success).length;
+	const applyFailCount = output.phases.flatMap((pr) => pr.results).filter((r) => !r.success && r.skipped !== "not-found").length;
 	as.stop(`Apply complete.${applyFailCount > 0 ? ` (${applyFailCount} failed)` : ""}`);
 	printApplyAllResults(output);
-	if (output.phases.flatMap((pr) => pr.results).some((r) => !r.success) || !output.deployed) process.exitCode = 1;
+	if (output.phases.flatMap((pr) => pr.results).some((r) => !r.success && r.skipped !== "not-found") || output.deployError) return {
+		ok: false,
+		error: output.deployError ?? new SystemError(SystemErrorCode.ExecutionError, `Apply failed for ${appName}.`)
+	};
+	return { ok: true };
 }
 var apply_default$10 = define({
 	name: "apply",
@@ -8355,16 +8406,16 @@ var apply_default$10 = define({
 					process.exitCode = 1;
 				},
 				singleApp: async (app, projectConfig) => {
-					await runApplyAll(resolveAppCliConfig(app, projectConfig, values), app.name, {
+					if (!(await runApplyAll(resolveAppCliConfig(app, projectConfig, values), app.name, {
 						skipConfirm,
 						dryRun
-					});
+					})).ok) process.exitCode = 1;
 				},
 				multiApp: async (plan, projectConfig) => {
 					await runMultiAppWithFailCheck(plan, async (app) => {
 						const cliConfig = resolveAppCliConfig(app, projectConfig, values);
 						printAppHeader(app.name, app.appId);
-						await runApplyAll(cliConfig, app.name, {
+						return runApplyAll(cliConfig, app.name, {
 							skipConfirm,
 							dryRun
 						});