kintone-migrator 0.34.4 → 0.34.5

package/dist/index.mjs

@@ -10428,6 +10428,128 @@ const CustomizationConfigSerializer = { serialize: (config) => {
 	};
 } };
 //#endregion
+//#region src/core/domain/customization/services/customizationMerge.ts
+const PLATFORMS = ["desktop", "mobile"];
+const CATEGORIES = ["js", "css"];
+const SCOPE_KEY = "config:scope";
+/**
+* Bucket-qualified resource identity: `platform:category:name`. Shared with the
+* force/firstTime pull path (`preservePaths`) so path preservation matches the
+* merge on the same identity and cross-bucket same-basename files stay distinct.
+*/
+function resourceKey(platform, category, name) {
+	return `${platform}:${category}:${name}`;
+}
+function platformList(config, platform, category) {
+	const p = config[platform];
+	return category === "js" ? p.js : p.css;
+}
+/**
+* Builds the per-side map keyed by `platform:category:name`. `contentTag`
+* returns the content marker for a same-name FILE so divergent content surfaces
+* as a conflict. `side` distinguishes local vs remote tags for modified files.
+*/
+function toMap(config, contentTag) {
+	const map = /* @__PURE__ */ new Map();
+	for (const platform of PLATFORMS) for (const category of CATEGORIES) for (const resource of platformList(config, platform, category)) {
+		const name = resourceName(resource);
+		const tag = resource.type === "FILE" ? `FILE:${contentTag(name)}` : "URL";
+		map.set(resourceKey(platform, category, name), {
+			resource,
+			tag
+		});
+	}
+	const scope = config.scope ?? "ALL";
+	map.set(SCOPE_KEY, { scope });
+	return map;
+}
+function isScopeValue(v) {
+	return "scope" in v;
+}
+function eq(a, b) {
+	if (isScopeValue(a) || isScopeValue(b)) return isScopeValue(a) && isScopeValue(b) && a.scope === b.scope;
+	return a.tag === b.tag;
+}
+/**
+* Computes the file-name-keyed 3-way merge of base/local/remote customization.
+*
+* `modifiedFileNames` is the set of same-name FILE basenames whose local
+* content differs from the remote content (reused from the diffDetector flow).
+* Such files get distinct local/remote tags so they classify as conflicts; all
+* other matched files share the `"same"` tag and classify as unchanged.
+*/
+function computeCustomizationThreeWayMerge(base, local, remote, modifiedFileNames) {
+	const tagFor = (side) => (name) => modifiedFileNames.has(name) ? side : "same";
+	return classifyThreeWay(toMap(base, () => "same"), toMap(local, tagFor("local")), toMap(remote, tagFor("remote")), eq);
+}
+/**
+* Applies a resolved 3-way merge, returning the merged customization config.
+*
+* Auto-merged entries take their `merged` value; conflicts take the chosen
+* side. The resulting resources are flattened back into per-platform js/css
+* lists, preserving the order they appear in the chosen/merged side. Throws a
+* BusinessRuleError when a conflict is left unresolved (programmer invariant).
+*/
+function resolveCustomizationMerge(merge, resolution, local, remote) {
+	const chosen = /* @__PURE__ */ new Map();
+	let scope = "ALL";
+	for (const entry of merge.entries) {
+		let value;
+		if (entry.change.kind === "conflict") {
+			const choice = resolution.get(entry.key);
+			if (choice === void 0) throw new BusinessRuleError(CustomizationErrorCode.CzUnresolvedConflict, `Unresolved conflict for "${entry.key}"`);
+			value = choice === "local" ? entry.local : entry.remote;
+		} else value = entry.merged;
+		if (value === void 0) continue;
+		if (isScopeValue(value)) scope = value.scope;
+		else chosen.set(entry.key, value.resource);
+	}
+	return rebuild(chosen, scope, local, remote);
+}
+/**
+* Rebuilds the config from the chosen resource keys, ordering each bucket by the
+* resource's position in local first, then any remote-only resources, so the
+* resulting list is stable and matches the user's local ordering intent.
+*
+* `path` is a local-owned concern (the build-output location) that is orthogonal
+* to which content wins the merge: whenever a key exists locally, the local
+* resource (its declared path) is kept regardless of the chosen content side.
+* Only remote-only keys fall back to the chosen (remote/basename) resource.
+*/
+function rebuild(chosen, scope, local, remote) {
+	function bucket(platform, category) {
+		const seen = /* @__PURE__ */ new Set();
+		const out = [];
+		const localByKey = /* @__PURE__ */ new Map();
+		for (const resource of platformList(local, platform, category)) localByKey.set(resourceKey(platform, category, resourceName(resource)), resource);
+		const append = (resources) => {
+			for (const resource of resources) {
+				const key = resourceKey(platform, category, resourceName(resource));
+				if (seen.has(key)) continue;
+				const picked = chosen.get(key);
+				if (picked !== void 0) {
+					out.push(localByKey.get(key) ?? picked);
+					seen.add(key);
+				}
+			}
+		};
+		append(platformList(local, platform, category));
+		append(platformList(remote, platform, category));
+		return out;
+	}
+	return {
+		scope,
+		desktop: {
+			js: bucket("desktop", "js"),
+			css: bucket("desktop", "css")
+		},
+		mobile: {
+			js: bucket("mobile", "js"),
+			css: bucket("mobile", "css")
+		}
+	};
+}
+//#endregion
 //#region src/lib/deduplicateName.ts
 const DEFAULT_MAX_COUNTER = 1e4;
 /**
@@ -10500,7 +10622,7 @@ function usedStemsFor(usedNames, ext) {
 	for (const name of usedNames) if (name.endsWith(ext)) stems.add(name.slice(0, name.length - ext.length));
 	return stems;
 }
-function planResources(resources, platformDir, resourceType, relativeBaseDir) {
+function planResources(resources, platformName, platformDir, resourceType, relativeBaseDir, contentBase, preservePaths) {
 	const planned = [];
 	const filesToDownload = [];
 	const dir = join(platformDir, resourceType);
@@ -10511,28 +10633,42 @@ function planResources(resources, platformDir, resourceType, relativeBaseDir) {
 	});
 	else {
 		const fileName = deduplicateFileName(sanitizeFileName(resource.file.name), usedNames);
-		const absolutePath = join(dir, fileName);
-		const relativePath = join(relativeBaseDir, resourceType, fileName);
-		planned.push({
-			type: "FILE",
-			path: relativePath
-		});
-		filesToDownload.push({
-			fileName,
-			fileKey: resource.file.fileKey,
-			absolutePath
-		});
+		const declaredPath = preservePaths?.get(resourceKey(platformName, resourceType, resource.file.name));
+		if (declaredPath !== void 0) {
+			planned.push({
+				type: "FILE",
+				path: declaredPath
+			});
+			filesToDownload.push({
+				fileName,
+				fileKey: resource.file.fileKey,
+				absolutePath: join(contentBase, declaredPath)
+			});
+		} else {
+			const absolutePath = join(dir, fileName);
+			const relativePath = join(relativeBaseDir, resourceType, fileName);
+			planned.push({
+				type: "FILE",
+				path: relativePath
+			});
+			filesToDownload.push({
+				fileName,
+				fileKey: resource.file.fileKey,
+				absolutePath
+			});
+		}
 	}
 	return {
 		resources: planned,
 		filesToDownload
 	};
 }
-function planPlatform(remotePlatform, platformName, basePath, filePrefix) {
-	const platformDir = join(basePath, filePrefix, platformName);
+function planPlatform(remotePlatform, platformName, basePath, filePrefix, preservePaths) {
+	const contentBase = join(basePath, filePrefix);
+	const platformDir = join(contentBase, platformName);
 	const platformPrefix = platformName;
-	const jsPlan = planResources(remotePlatform.js, platformDir, "js", platformPrefix);
-	const cssPlan = planResources(remotePlatform.css, platformDir, "css", platformPrefix);
+	const jsPlan = planResources(remotePlatform.js, platformName, platformDir, "js", platformPrefix, contentBase, preservePaths);
+	const cssPlan = planResources(remotePlatform.css, platformName, platformDir, "css", platformPrefix, contentBase, preservePaths);
 	const fileCount = remotePlatform.js.filter((r) => r.type === "FILE").length + remotePlatform.css.filter((r) => r.type === "FILE").length;
 	return {
 		platform: {
@@ -10560,8 +10696,8 @@ async function downloadFiles(files, container) {
 async function captureCustomization({ container, input }) {
 	const existing = await container.customizationStorage.get();
 	const { scope, desktop, mobile } = await container.customizationConfigurator.getCustomization();
-	const desktopPlan = planPlatform(desktop, "desktop", input.basePath, input.filePrefix);
-	const mobilePlan = planPlatform(mobile, "mobile", input.basePath, input.filePrefix);
+	const desktopPlan = planPlatform(desktop, "desktop", input.basePath, input.filePrefix, input.preservePaths);
+	const mobilePlan = planPlatform(mobile, "mobile", input.basePath, input.filePrefix, input.preservePaths);
 	const config = {
 		scope,
 		desktop: desktopPlan.platform,
@@ -10571,6 +10707,7 @@ async function captureCustomization({ container, input }) {
 	await downloadFiles([...desktopPlan.filesToDownload, ...mobilePlan.filesToDownload], container);
 	return {
 		configText,
+		config,
 		hasExistingConfig: existing.exists,
 		fileResourceCount: desktopPlan.fileCount + mobilePlan.fileCount
 	};
@@ -11565,116 +11702,6 @@ var apply_default$9 = define({
 	}
 });
 //#endregion
-//#region src/core/domain/customization/services/customizationMerge.ts
-const PLATFORMS = ["desktop", "mobile"];
-const CATEGORIES = ["js", "css"];
-const SCOPE_KEY = "config:scope";
-function resourceKey(platform, category, name) {
-	return `${platform}:${category}:${name}`;
-}
-function platformList(config, platform, category) {
-	const p = config[platform];
-	return category === "js" ? p.js : p.css;
-}
-/**
-* Builds the per-side map keyed by `platform:category:name`. `contentTag`
-* returns the content marker for a same-name FILE so divergent content surfaces
-* as a conflict. `side` distinguishes local vs remote tags for modified files.
-*/
-function toMap(config, contentTag) {
-	const map = /* @__PURE__ */ new Map();
-	for (const platform of PLATFORMS) for (const category of CATEGORIES) for (const resource of platformList(config, platform, category)) {
-		const name = resourceName(resource);
-		const tag = resource.type === "FILE" ? `FILE:${contentTag(name)}` : "URL";
-		map.set(resourceKey(platform, category, name), {
-			resource,
-			tag
-		});
-	}
-	const scope = config.scope ?? "ALL";
-	map.set(SCOPE_KEY, { scope });
-	return map;
-}
-function isScopeValue(v) {
-	return "scope" in v;
-}
-function eq(a, b) {
-	if (isScopeValue(a) || isScopeValue(b)) return isScopeValue(a) && isScopeValue(b) && a.scope === b.scope;
-	return a.tag === b.tag;
-}
-/**
-* Computes the file-name-keyed 3-way merge of base/local/remote customization.
-*
-* `modifiedFileNames` is the set of same-name FILE basenames whose local
-* content differs from the remote content (reused from the diffDetector flow).
-* Such files get distinct local/remote tags so they classify as conflicts; all
-* other matched files share the `"same"` tag and classify as unchanged.
-*/
-function computeCustomizationThreeWayMerge(base, local, remote, modifiedFileNames) {
-	const tagFor = (side) => (name) => modifiedFileNames.has(name) ? side : "same";
-	return classifyThreeWay(toMap(base, () => "same"), toMap(local, tagFor("local")), toMap(remote, tagFor("remote")), eq);
-}
-/**
-* Applies a resolved 3-way merge, returning the merged customization config.
-*
-* Auto-merged entries take their `merged` value; conflicts take the chosen
-* side. The resulting resources are flattened back into per-platform js/css
-* lists, preserving the order they appear in the chosen/merged side. Throws a
-* BusinessRuleError when a conflict is left unresolved (programmer invariant).
-*/
-function resolveCustomizationMerge(merge, resolution, local, remote) {
-	const chosen = /* @__PURE__ */ new Map();
-	let scope = "ALL";
-	for (const entry of merge.entries) {
-		let value;
-		if (entry.change.kind === "conflict") {
-			const choice = resolution.get(entry.key);
-			if (choice === void 0) throw new BusinessRuleError(CustomizationErrorCode.CzUnresolvedConflict, `Unresolved conflict for "${entry.key}"`);
-			value = choice === "local" ? entry.local : entry.remote;
-		} else value = entry.merged;
-		if (value === void 0) continue;
-		if (isScopeValue(value)) scope = value.scope;
-		else chosen.set(entry.key, value.resource);
-	}
-	return rebuild(chosen, scope, local, remote);
-}
-/**
-* Rebuilds the config from the chosen resource keys, ordering each bucket by the
-* resource's position in local first, then any remote-only resources, so the
-* resulting list is stable and matches the user's local ordering intent.
-*/
-function rebuild(chosen, scope, local, remote) {
-	function bucket(platform, category) {
-		const seen = /* @__PURE__ */ new Set();
-		const out = [];
-		const append = (resources) => {
-			for (const resource of resources) {
-				const key = resourceKey(platform, category, resourceName(resource));
-				if (seen.has(key)) continue;
-				const picked = chosen.get(key);
-				if (picked !== void 0) {
-					out.push(picked);
-					seen.add(key);
-				}
-			}
-		};
-		append(platformList(local, platform, category));
-		append(platformList(remote, platform, category));
-		return out;
-	}
-	return {
-		scope,
-		desktop: {
-			js: bucket("desktop", "js"),
-			css: bucket("desktop", "css")
-		},
-		mobile: {
-			js: bucket("mobile", "js"),
-			css: bucket("mobile", "css")
-		}
-	};
-}
-//#endregion
 //#region src/core/application/customization/customizationRemote.ts
 /**
 * Converts the kintone remote customization (file metadata) into a
@@ -11899,15 +11926,17 @@ async function saveCustomizationSnapshotAndRevision(container, config, revision)
 async function pullCustomization({ container, input }) {
 	const { state, local, remote } = await loadCustomizationThreeWayInputs(container);
 	if (input.force || state === void 0 || local === void 0) {
+		const preservePaths = local !== void 0 ? buildPreservePaths(local) : void 0;
 		const captured = await captureCustomization({
 			container,
 			input: {
 				basePath: input.captureBasePath,
-				filePrefix: input.filePrefix
+				filePrefix: input.filePrefix,
+				preservePaths
 			}
 		});
 		await container.customizationStorage.update(captured.configText);
-		await saveCustomizationSnapshotAndRevision(container, remote.config, remote.revision);
+		await saveCustomizationSnapshotAndRevision(container, captured.config, remote.revision);
 		return { mode: input.force ? "force" : "firstTime" };
 	}
 	const modifiedFileNames = await computeModifiedFileNames(local, remote.raw, input.basePath, container);
@@ -11955,7 +11984,26 @@ async function applyPulledCustomizationMerge({ container, input }) {
 	await Promise.all(downloads);
 	const configText = stringifyConfig(container.configCodec, CustomizationConfigSerializer.serialize(merged));
 	await container.customizationStorage.update(configText);
-	await saveCustomizationSnapshotAndRevision(container, input.remoteConfig, input.remoteRevision);
+	await saveCustomizationSnapshotAndRevision(container, merged, input.remoteRevision);
+}
+/**
+* Builds the path-preservation map for `captureCustomization`: bucket-qualified
+* key (`resourceKey(platform, category, FILE basename)`) → declared local
+* relative path. The composite key matches the merge identity so cross-bucket
+* same-basename files (e.g. `app/desktop/js/main.js` vs `app/mobile/js/main.js`)
+* stay distinct instead of colliding under a flat basename map. Only FILE
+* resources carry a path.
+*/
+function buildPreservePaths(config) {
+	const map = /* @__PURE__ */ new Map();
+	const add = (platform, category, resources) => {
+		for (const resource of resources) if (resource.type === "FILE") map.set(resourceKey(platform, category, resourceName(resource)), resource.path);
+	};
+	add("desktop", "js", config.desktop.js);
+	add("desktop", "css", config.desktop.css);
+	add("mobile", "js", config.mobile.js);
+	add("mobile", "css", config.mobile.css);
+	return map;
 }
 function allFileResources(config) {
 	return [
@@ -11987,6 +12035,25 @@ function remoteFileKeyMap(remote) {
 }
 //#endregion
 //#region src/cli/commands/customize/pull.ts
+/**
+* Derives the path bases `runPull` feeds to the application layer.
+*
+* - `basePath` (= push's {@link computeBasePath}) is where merged/downloaded
+*   content resolves and push uploads from.
+* - `captureBasePath` + `filePrefix` are passed to the capture-equivalent
+*   (force / first-time) path.
+*
+* Invariant: `join(captureBasePath, filePrefix) === basePath`, so pull writes
+* exactly where push uploads from. Exported so the invariant test pins these
+* exact derivations rather than a hand-mirrored copy.
+*/
+function derivePullPaths(customizeFilePath) {
+	return {
+		basePath: computeBasePath(customizeFilePath),
+		captureBasePath: dirname(resolve(customizeFilePath)),
+		filePrefix: deriveFilePrefix(customizeFilePath)
+	};
+}
 async function resolveConflicts$1(merged, options) {
 	const resolution = /* @__PURE__ */ new Map();
 	for (const conflict of merged.merge.conflicts) {
@@ -12015,9 +12082,7 @@ async function resolveConflicts$1(merged, options) {
 }
 async function runPull$1(containerConfig, options) {
 	const container = createCustomizationCliContainer(containerConfig);
-	const basePath = computeBasePath(containerConfig.customizeFilePath);
-	const captureBasePath = dirname(resolve(containerConfig.customizeFilePath));
-	const filePrefix = deriveFilePrefix(containerConfig.customizeFilePath);
+	const { basePath, captureBasePath, filePrefix } = derivePullPaths(containerConfig.customizeFilePath);
 	const s = p.spinner();
 	s.start("Pulling customization from kintone...");
 	let result;