kintone-migrator 0.26.1 → 0.27.0

package/dist/index.mjs

@@ -1786,6 +1786,18 @@ function createLocalFileCustomizationStorage(filePath) {
 	return createLocalFileStorage(filePath, "customization config file");
 }
 //#endregion
+//#region src/core/adapters/local/fileContentReader.ts
+var LocalFileContentReader = class {
+	async read(filePath) {
+		try {
+			const buffer = await readFile(filePath);
+			return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+		} catch (error) {
+			throw new SystemError(SystemErrorCode.StorageError, `Failed to read file: ${filePath}`, error);
+		}
+	}
+};
+//#endregion
 //#region src/core/adapters/local/fileWriter.ts
 var LocalFileWriter = class {
 	constructor(baseDir = process.cwd()) {
@@ -1845,6 +1857,7 @@ function createCustomizationCliContainer(config) {
 		customizationStorage: createLocalFileCustomizationStorage(config.customizeFilePath),
 		fileUploader: new KintoneFileUploader(client, process.cwd()),
 		fileDownloader: new KintoneFileDownloader(client),
+		fileContentReader: new LocalFileContentReader(),
 		fileWriter: new LocalFileWriter(process.cwd()),
 		appDeployer: new KintoneAppDeployer(client, config.appId)
 	};
@@ -3791,7 +3804,7 @@ function remoteResourceName(resource) {
 	if (resource.type === "URL") return resource.url;
 	return resource.file.name;
 }
-function compareResourceLists(localResources, remoteResources, platform, resourceType, warnings) {
+function compareResourceLists(localResources, remoteResources, platform, resourceType, warnings, modifiedFileNames) {
 	const entries = [];
 	const localNames = localResources.map(resourceName);
 	const remoteNames = remoteResources.map(remoteResourceName);
@@ -3823,10 +3836,13 @@ function compareResourceLists(localResources, remoteResources, platform, resourc
 			details: `removed ${resType} resource`
 		});
 	}
-	const matchedFiles = [...localNameSet].filter((n) => remoteNameSet.has(n));
-	const hasLocalFiles = localResources.some((r) => r.type === "FILE");
-	const hasRemoteFiles = remoteResources.some((r) => r.type === "FILE");
-	if (matchedFiles.length > 0 && hasLocalFiles && hasRemoteFiles) warnings.push(`[${platform}.${resourceType}] FILE resources are compared by name only; content changes are not detected`);
+	for (const name of localNameSet) if (remoteNameSet.has(name) && localTypeMap.get(name) === "FILE" && remoteTypeMap.get(name) === "FILE" && modifiedFileNames.has(name)) entries.push({
+		type: "modified",
+		platform,
+		category: resourceType,
+		name,
+		details: "file content changed"
+	});
 	if (!hasDuplicates) {
 		const localShared = localNames.filter((n) => remoteNameSet.has(n));
 		const remoteShared = remoteNames.filter((n) => localNameSet.has(n));
@@ -3840,10 +3856,10 @@ function compareResourceLists(localResources, remoteResources, platform, resourc
 	}
 	return entries;
 }
-function comparePlatform(localJs, localCss, remote, platform, warnings) {
-	return [...compareResourceLists(localJs, remote.js, platform, "js", warnings), ...compareResourceLists(localCss, remote.css, platform, "css", warnings)];
+function comparePlatform(localJs, localCss, remote, platform, warnings, modifiedFileNames) {
+	return [...compareResourceLists(localJs, remote.js, platform, "js", warnings, modifiedFileNames), ...compareResourceLists(localCss, remote.css, platform, "css", warnings, modifiedFileNames)];
 }
-const CustomizationDiffDetector = { detect: (local, remote) => {
+const CustomizationDiffDetector = { detect: (local, remote, modifiedFileNames) => {
 	const entries = [];
 	const warnings = [];
 	const localScope = local.scope ?? "ALL";
@@ -3854,20 +3870,55 @@ const CustomizationDiffDetector = { detect: (local, remote) => {
 		name: "scope",
 		details: `${remote.scope} -> ${localScope}`
 	});
-	entries.push(...comparePlatform(local.desktop.js, local.desktop.css, remote.desktop, "desktop", warnings));
-	entries.push(...comparePlatform(local.mobile.js, local.mobile.css, remote.mobile, "mobile", warnings));
+	entries.push(...comparePlatform(local.desktop.js, local.desktop.css, remote.desktop, "desktop", warnings, modifiedFileNames));
+	entries.push(...comparePlatform(local.mobile.js, local.mobile.css, remote.mobile, "mobile", warnings, modifiedFileNames));
 	return buildDiffResult(entries, warnings);
 } };
 //#endregion
 //#region src/core/application/customization/detectCustomizationDiff.ts
-async function detectCustomizationDiff({ container }) {
-	return detectDiffFromConfig({
-		getStorage: () => container.customizationStorage.get(),
-		fetchRemote: () => container.customizationConfigurator.getCustomization(),
-		parseConfig: (content) => parseCustomizationConfigText(container.configCodec, content),
-		detect: (local, remote) => CustomizationDiffDetector.detect(local, remote),
-		notFoundMessage: "Customization config file not found"
-	});
+/**
+* Finds matched FILE resource pairs (local FILE + remote FILE with same basename)
+* across all platforms and categories.
+*/
+function findMatchedFilePairs(localResources, remoteResources) {
+	const pairs = [];
+	const remoteFileMap = /* @__PURE__ */ new Map();
+	for (const r of remoteResources) if (r.type === "FILE") remoteFileMap.set(remoteResourceName(r), r.file.fileKey);
+	for (const local of localResources) {
+		if (local.type !== "FILE") continue;
+		const name = resourceName(local);
+		const remoteFileKey = remoteFileMap.get(name);
+		if (remoteFileKey !== void 0) pairs.push({
+			localResource: local,
+			remoteFileKey
+		});
+	}
+	return pairs;
+}
+async function detectCustomizationDiff({ container, input }) {
+	const [storageResult, remote] = await Promise.all([container.customizationStorage.get(), container.customizationConfigurator.getCustomization()]);
+	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Customization config file not found");
+	const local = parseCustomizationConfigText(container.configCodec, storageResult.content);
+	const allPairs = [
+		...findMatchedFilePairs(local.desktop.js, remote.desktop.js),
+		...findMatchedFilePairs(local.desktop.css, remote.desktop.css),
+		...findMatchedFilePairs(local.mobile.js, remote.mobile.js),
+		...findMatchedFilePairs(local.mobile.css, remote.mobile.css)
+	];
+	const modifiedFileNames = /* @__PURE__ */ new Set();
+	if (allPairs.length > 0) {
+		const results = await Promise.all(allPairs.map(async ({ localResource, remoteFileKey }) => {
+			const localPath = join(input.basePath, localResource.path);
+			const [localContent, remoteContent] = await Promise.all([container.fileContentReader.read(localPath), container.fileDownloader.download(remoteFileKey)]);
+			const isEqual = Buffer.from(localContent).equals(Buffer.from(remoteContent));
+			return {
+				name: resourceName(localResource),
+				isEqual
+			};
+		}));
+		for (const { name, isEqual } of results) if (!isEqual) modifiedFileNames.add(name);
+	}
+	return CustomizationDiffDetector.detect(local, remote, modifiedFileNames);
 }
 //#endregion
 //#region src/cli/customizeConfig.ts
@@ -4076,6 +4127,10 @@ async function saveCustomization({ container, input }) {
 }
 //#endregion
 //#region src/cli/commands/customize/capture.ts
+function computeBasePath(customizeFilePath) {
+	const filePrefix = deriveFilePrefix(customizeFilePath);
+	return join(dirname(resolve(customizeFilePath)), filePrefix);
+}
 function deriveFilePrefix(customizeFilePath) {
 	const resolved = resolve(customizeFilePath);
 	const fileName = basename(resolved, extname(resolved));
@@ -4134,11 +4189,9 @@ var capture_default$10 = define({
 //#endregion
 //#region src/cli/commands/customize/apply.ts
 function createCustomizationContainer(config) {
-	const container = createCustomizationCliContainer(config);
-	const filePrefix = deriveFilePrefix(config.customizeFilePath);
 	return {
-		container,
-		basePath: join(dirname(resolve(config.customizeFilePath)), filePrefix)
+		container: createCustomizationCliContainer(config),
+		basePath: computeBasePath(config.customizeFilePath)
 	};
 }
 async function runCustomizationApply(container, basePath) {
@@ -4161,127 +4214,166 @@ async function runDiffPreview(config) {
 	s.start("Detecting changes...");
 	let result;
 	try {
-		result = await detectCustomizationDiff({ container });
+		result = await detectCustomizationDiff({
+			container,
+			input: { basePath }
+		});
 	} catch (error) {
 		s.stop("Comparison failed.");
 		throw error;
 	}
 	s.stop("Comparison complete.");
 	printCustomizationDiffResult(result);
-	const hasFileContentWarning = result.warnings.some((w) => w.includes("content changes are not detected"));
 	return {
 		container,
 		basePath,
-		hasChanges: !result.isEmpty || hasFileContentWarning
+		hasChanges: !result.isEmpty
 	};
 }
+var apply_default$9 = define({
+	name: "apply",
+	description: "Apply JS/CSS customization to kintone app",
+	args: {
+		...customizeArgs,
+		...confirmArgs
+	},
+	run: async (ctx) => {
+		try {
+			const values = ctx.values;
+			const skipConfirm = values.yes === true;
+			await routeMultiApp(values, {
+				singleLegacy: async () => {
+					const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeConfig(values));
+					if (!hasChanges) {
+						p.log.success("No changes detected.");
+						return;
+					}
+					if (!skipConfirm) {
+						const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+						if (p.isCancel(shouldContinue) || !shouldContinue) {
+							p.cancel("Apply cancelled.");
+							return;
+						}
+					}
+					await runCustomizationApply(container, basePath);
+					await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+				},
+				singleApp: async (app, projectConfig) => {
+					const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeAppConfig(app, projectConfig, values));
+					if (!hasChanges) {
+						p.log.success("No changes detected.");
+						return;
+					}
+					if (!skipConfirm) {
+						const shouldContinue = await p.confirm({ message: "Apply these changes?" });
+						if (p.isCancel(shouldContinue) || !shouldContinue) {
+							p.cancel("Apply cancelled.");
+							return;
+						}
+					}
+					await runCustomizationApply(container, basePath);
+					await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+				},
+				multiApp: async (plan, projectConfig) => {
+					const appDiffResults = [];
+					for (const app of plan.orderedApps) {
+						const config = resolveCustomizeAppConfig(app, projectConfig, values);
+						printAppHeader(app.name, app.appId);
+						const { container, basePath, hasChanges } = await runDiffPreview(config);
+						appDiffResults.push({
+							app,
+							container,
+							basePath,
+							hasChanges
+						});
+					}
+					if (!appDiffResults.some((a) => a.hasChanges)) {
+						p.log.success("No changes detected in any app.");
+						return;
+					}
+					if (!skipConfirm) {
+						const shouldContinue = await p.confirm({ message: "Apply these changes to all apps?" });
+						if (p.isCancel(shouldContinue) || !shouldContinue) {
+							p.cancel("Apply cancelled.");
+							return;
+						}
+					}
+					const containers = [];
+					await runMultiAppWithHeaders(plan, async (app) => {
+						const entry = appDiffResults.find((a) => a.app.name === app.name);
+						if (!entry) throw new SystemError(SystemErrorCode.InternalServerError, `App container not found for "${app.name}"`);
+						if (!entry.hasChanges) {
+							p.log.info("No changes. Skipping.");
+							return;
+						}
+						await runCustomizationApply(entry.container, entry.basePath);
+						containers.push({
+							appDeployer: entry.container.appDeployer,
+							appName: app.name
+						});
+					});
+					await confirmAndDeploy(containers, skipConfirm, "Customization applied and deployed successfully.");
+				}
+			});
+		} catch (error) {
+			handleCliError(error);
+		}
+	}
+});
+//#endregion
+//#region src/cli/commands/customize/diff.ts
+async function runDiff$1(containerConfig) {
+	const container = createCustomizationCliContainer(containerConfig);
+	const basePath = computeBasePath(containerConfig.customizeFilePath);
+	const s = p.spinner();
+	s.start("Comparing customization settings...");
+	let result;
+	try {
+		result = await detectCustomizationDiff({
+			container,
+			input: { basePath }
+		});
+	} catch (error) {
+		s.stop("Comparison failed.");
+		throw error;
+	}
+	s.stop("Comparison complete.");
+	printCustomizationDiffResult(result);
+}
 //#endregion
 //#region src/cli/commands/customize/index.ts
 var customize_default = define({
 	name: "customize",
 	description: "Manage kintone JS/CSS customizations",
 	subCommands: {
-		apply: define({
-			name: "apply",
-			description: "Apply JS/CSS customization to kintone app",
-			args: {
-				...customizeArgs,
-				...confirmArgs
-			},
+		apply: apply_default$9,
+		capture: capture_default$10,
+		diff: define({
+			name: "diff",
+			description: "Compare local customization config with remote kintone app",
+			args: customizeArgs,
 			run: async (ctx) => {
 				try {
 					const values = ctx.values;
-					const skipConfirm = values.yes === true;
 					await routeMultiApp(values, {
 						singleLegacy: async () => {
-							const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeConfig(values));
-							if (!hasChanges) {
-								p.log.success("No changes detected.");
-								return;
-							}
-							if (!skipConfirm) {
-								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
-								if (p.isCancel(shouldContinue) || !shouldContinue) {
-									p.cancel("Apply cancelled.");
-									return;
-								}
-							}
-							await runCustomizationApply(container, basePath);
-							await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+							await runDiff$1(resolveCustomizeConfig(values));
 						},
 						singleApp: async (app, projectConfig) => {
-							const { container, basePath, hasChanges } = await runDiffPreview(resolveCustomizeAppConfig(app, projectConfig, values));
-							if (!hasChanges) {
-								p.log.success("No changes detected.");
-								return;
-							}
-							if (!skipConfirm) {
-								const shouldContinue = await p.confirm({ message: "Apply these changes?" });
-								if (p.isCancel(shouldContinue) || !shouldContinue) {
-									p.cancel("Apply cancelled.");
-									return;
-								}
-							}
-							await runCustomizationApply(container, basePath);
-							await confirmAndDeploy([container], skipConfirm, "Customization applied and deployed successfully.");
+							await runDiff$1(resolveCustomizeAppConfig(app, projectConfig, values));
 						},
 						multiApp: async (plan, projectConfig) => {
-							const appDiffResults = [];
-							for (const app of plan.orderedApps) {
-								const config = resolveCustomizeAppConfig(app, projectConfig, values);
+							await runMultiAppWithFailCheck(plan, async (app) => {
+								const containerConfig = resolveCustomizeAppConfig(app, projectConfig, values);
 								printAppHeader(app.name, app.appId);
-								const { container, basePath, hasChanges } = await runDiffPreview(config);
-								appDiffResults.push({
-									app,
-									container,
-									basePath,
-									hasChanges
-								});
-							}
-							if (!appDiffResults.some((a) => a.hasChanges)) {
-								p.log.success("No changes detected in any app.");
-								return;
-							}
-							if (!skipConfirm) {
-								const shouldContinue = await p.confirm({ message: "Apply these changes to all apps?" });
-								if (p.isCancel(shouldContinue) || !shouldContinue) {
-									p.cancel("Apply cancelled.");
-									return;
-								}
-							}
-							const containers = [];
-							await runMultiAppWithHeaders(plan, async (app) => {
-								const entry = appDiffResults.find((a) => a.app.name === app.name);
-								if (!entry) throw new SystemError(SystemErrorCode.InternalServerError, `App container not found for "${app.name}"`);
-								if (!entry.hasChanges) {
-									p.log.info("No changes. Skipping.");
-									return;
-								}
-								await runCustomizationApply(entry.container, entry.basePath);
-								containers.push({
-									appDeployer: entry.container.appDeployer,
-									appName: app.name
-								});
-							});
-							await confirmAndDeploy(containers, skipConfirm, "Customization applied and deployed successfully.");
+								await runDiff$1(containerConfig);
+							}, "All customization diffs completed successfully.");
 						}
 					});
 				} catch (error) {
 					handleCliError(error);
 				}
 			}
-		}),
-		capture: capture_default$10,
-		diff: createDiffCommand({
-			description: "Compare local customization config with remote kintone app",
-			args: customizeArgs,
-			spinnerMessage: "Comparing customization settings...",
-			multiAppSuccessMessage: "All customization diffs completed successfully.",
-			createContainer: createCustomizationCliContainer,
-			detectDiff: detectCustomizationDiff,
-			printResult: printCustomizationDiffResult,
-			resolveContainerConfig: resolveCustomizeConfig,
-			resolveAppContainerConfig: resolveCustomizeAppConfig
 		})
 	},
 	run: () => {}