kintone-migrator 0.35.2 → 0.35.3

package/dist/index.mjs

@@ -121,7 +121,6 @@ const ProcessManagementErrorCode = {
 	PmInvalidEntityType: "PM_INVALID_ENTITY_TYPE",
 	PmInvalidBooleanField: "PM_INVALID_BOOLEAN_FIELD",
 	PmInvalidActionReference: "PM_INVALID_ACTION_REFERENCE",
-	PmDuplicateActionName: "PM_DUPLICATE_ACTION_NAME",
 	PmUnresolvedConflict: "PM_UNRESOLVED_CONFLICT"
 };
 //#endregion
@@ -6811,6 +6810,16 @@ async function applyPlugin({ container }) {
 	};
 }
 //#endregion
+//#region src/core/domain/processManagement/valueObject.ts
+/**
+* Human-readable label of an action, e.g. `申請する (未申請 → 部長承認待ち)`.
+* The name alone is ambiguous: kintone allows several actions with the same
+* name, both from different states and as conditional branches from one state.
+*/
+function describeProcessAction(action) {
+	return `${action.name} (${action.from} → ${action.to})`;
+}
+//#endregion
 //#region src/core/domain/processManagement/services/configParser.ts
 const VALID_ASSIGNEE_TYPES$1 = /* @__PURE__ */ new Set([
 	"ONE",
@@ -6890,15 +6899,10 @@ const ProcessManagementConfigParser = { parse: (parsed) => {
 	for (const [name, value] of Object.entries(rawStates)) states[name] = parseState(value, name);
 	if (!Array.isArray(obj.actions) && obj.actions !== void 0) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidConfigStructure, "Config \"actions\" must be an array");
 	const actions = (Array.isArray(obj.actions) ? obj.actions : []).map((item, i) => parseAction(item, i));
-	const actionNames = /* @__PURE__ */ new Set();
-	for (const action of actions) {
-		if (actionNames.has(action.name)) throw new BusinessRuleError(ProcessManagementErrorCode.PmDuplicateActionName, `Duplicate action name: "${action.name}"`);
-		actionNames.add(action.name);
-	}
 	const stateNames = new Set(Object.keys(states));
 	for (const action of actions) {
-		if (!stateNames.has(action.from)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${action.name}" references unknown "from" state: "${action.from}"`);
-		if (!stateNames.has(action.to)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${action.name}" references unknown "to" state: "${action.to}"`);
+		if (!stateNames.has(action.from)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${describeProcessAction(action)}" references unknown "from" state: "${action.from}"`);
+		if (!stateNames.has(action.to)) throw new BusinessRuleError(ProcessManagementErrorCode.PmInvalidActionReference, `Action "${describeProcessAction(action)}" references unknown "to" state: "${action.to}"`);
 	}
 	return {
 		enable,
@@ -9363,6 +9367,56 @@ function groupByKey(items, keyFn) {
 	return map;
 }
 //#endregion
+//#region src/lib/pairByKeyInOrder.ts
+/**
+* Pairs local and remote items by key. Items sharing a key are matched by
+* their order of appearance, so the n-th local item with a key pairs with the
+* n-th remote item with that key.
+*
+* Pairs are returned grouped by key: keys in local first-appearance order,
+* then remote-only keys in remote first-appearance order.
+*/
+function pairByKeyInOrder(local, remote, keyFn) {
+	const localGroups = groupByKey(local, keyFn);
+	const remoteGroups = groupByKey(remote, keyFn);
+	const pairs = [];
+	for (const [key, localItems] of localGroups) {
+		const remoteItems = remoteGroups.get(key) ?? [];
+		const length = Math.max(localItems.length, remoteItems.length);
+		for (let index = 0; index < length; index++) if (index >= remoteItems.length) pairs.push({
+			kind: "localOnly",
+			key,
+			index,
+			local: localItems[index]
+		});
+		else if (index >= localItems.length) pairs.push({
+			kind: "remoteOnly",
+			key,
+			index,
+			remote: remoteItems[index]
+		});
+		else pairs.push({
+			kind: "both",
+			key,
+			index,
+			local: localItems[index],
+			remote: remoteItems[index]
+		});
+	}
+	for (const [key, remoteItems] of remoteGroups) {
+		if (localGroups.has(key)) continue;
+		remoteItems.forEach((remoteItem, index) => {
+			pairs.push({
+				kind: "remoteOnly",
+				key,
+				index,
+				remote: remoteItem
+			});
+		});
+	}
+	return pairs;
+}
+//#endregion
 //#region src/core/domain/notification/services/diffDetector.ts
 function serializeEntity$1(entity) {
 	return `${entity.type}:${entity.code}`;
@@ -9416,14 +9470,6 @@ function compareGeneralSection(local, remote) {
 	});
 	return entries;
 }
-/**
-* Groups per-record notifications by filterCond. Multiple notifications can share
-* the same filterCond, so notifications within a group are compared by position
-* (index-based matching).
-*/
-function buildPerRecordMultiMap(notifications) {
-	return groupByKey(notifications, (n) => n.filterCond);
-}
 function perRecordLabel(notif) {
 	return notif.title || notif.filterCond || "(empty filter)";
 }
@@ -9445,43 +9491,30 @@ function describeReminderChanges(local, remote) {
 }
 function comparePerRecordSection(local, remote) {
 	const entries = [];
-	const localMulti = buildPerRecordMultiMap(local);
-	const remoteMulti = buildPerRecordMultiMap(remote);
-	for (const [key, localNotifs] of localMulti) {
-		const remoteNotifs = remoteMulti.get(key) ?? [];
-		const maxLen = Math.max(localNotifs.length, remoteNotifs.length);
-		for (let i = 0; i < maxLen; i++) {
-			const localNotif = localNotifs[i];
-			const remoteNotif = remoteNotifs[i];
-			if (localNotif && !remoteNotif) entries.push({
+	for (const pair of pairByKeyInOrder(local, remote, (n) => n.filterCond)) switch (pair.kind) {
+		case "localOnly":
+			entries.push({
 				type: "added",
 				section: "perRecord",
-				name: perRecordLabel(localNotif),
+				name: perRecordLabel(pair.local),
 				details: "new notification"
 			});
-			else if (!localNotif && remoteNotif) entries.push({
+			break;
+		case "remoteOnly":
+			entries.push({
 				type: "deleted",
 				section: "perRecord",
-				name: perRecordLabel(remoteNotif),
+				name: perRecordLabel(pair.remote),
 				details: "removed"
 			});
-			else if (localNotif && remoteNotif && !deepEqual(localNotif, remoteNotif)) {
-				const diffs = describePerRecordChanges(localNotif, remoteNotif);
-				entries.push({
-					type: "modified",
-					section: "perRecord",
-					name: perRecordLabel(localNotif),
-					details: diffs
-				});
-			}
-		}
+			break;
+		case "both": if (!deepEqual(pair.local, pair.remote)) entries.push({
+			type: "modified",
+			section: "perRecord",
+			name: perRecordLabel(pair.local),
+			details: describePerRecordChanges(pair.local, pair.remote)
+		});
 	}
-	for (const [key, remoteNotifs] of remoteMulti) if (!localMulti.has(key)) for (const remoteNotif of remoteNotifs) entries.push({
-		type: "deleted",
-		section: "perRecord",
-		name: perRecordLabel(remoteNotif),
-		details: "removed"
-	});
 	return entries;
 }
 function compareReminderSection(local, remote) {
@@ -9637,8 +9670,6 @@ function isExecutableUserEqual(a, b) {
 }
 function compareActions(localAction, remoteAction) {
 	const diffs = [];
-	if (localAction.from !== remoteAction.from) diffs.push(`from: ${remoteAction.from} -> ${localAction.from}`);
-	if (localAction.to !== remoteAction.to) diffs.push(`to: ${remoteAction.to} -> ${localAction.to}`);
 	if (localAction.filterCond !== remoteAction.filterCond) diffs.push(`filterCond: "${remoteAction.filterCond}" -> "${localAction.filterCond}"`);
 	if (localAction.type !== remoteAction.type) diffs.push(`type: ${remoteAction.type} -> ${localAction.type}`);
 	if (!isExecutableUserEqual(localAction.executableUser, remoteAction.executableUser)) diffs.push(`executableUser: ${formatValue(remoteAction.executableUser)} -> ${formatValue(localAction.executableUser)}`);
@@ -9674,33 +9705,52 @@ function compareStates(local, remote, entries) {
 		details: `assignee: ${remote.states[name].assignee.type}`
 	});
 }
+/**
+* Identifies an action by name + from + to. kintone allows same-named actions
+* both from different states and as conditional branches from one state.
+* Repeats of the whole triple are not rejected either, so actions sharing a
+* triple are told apart by their order of appearance.
+*/
+function transitionKey(action) {
+	return JSON.stringify([
+		action.name,
+		action.from,
+		action.to
+	]);
+}
+function actionLabel(action, index) {
+	const label = describeProcessAction(action);
+	return index === 0 ? label : `${label} #${index + 1}`;
+}
 function compareActionEntries(local, remote, entries) {
-	const localActionMap = new Map(local.actions.map((a) => [a.name, a]));
-	const remoteActionMap = new Map(remote.actions.map((a) => [a.name, a]));
-	for (const [name, localAction] of localActionMap) {
-		const remoteAction = remoteActionMap.get(name);
-		if (!remoteAction) entries.push({
-			type: "added",
-			category: "action",
-			name,
-			details: `${localAction.from} -> ${localAction.to}`
-		});
-		else {
-			const actionDiffs = compareActions(localAction, remoteAction);
+	for (const pair of pairByKeyInOrder(local.actions, remote.actions, transitionKey)) switch (pair.kind) {
+		case "localOnly":
+			entries.push({
+				type: "added",
+				category: "action",
+				name: actionLabel(pair.local, pair.index),
+				details: `filterCond: "${pair.local.filterCond}"`
+			});
+			break;
+		case "remoteOnly":
+			entries.push({
+				type: "deleted",
+				category: "action",
+				name: actionLabel(pair.remote, pair.index),
+				details: `filterCond: "${pair.remote.filterCond}"`
+			});
+			break;
+		case "both": {
+			const actionDiffs = compareActions(pair.local, pair.remote);
 			if (actionDiffs.length > 0) entries.push({
 				type: "modified",
 				category: "action",
-				name,
+				name: actionLabel(pair.local, pair.index),
 				details: actionDiffs.join("\n")
 			});
+			break;
 		}
 	}
-	for (const [name, remoteAction] of remoteActionMap) if (!localActionMap.has(name)) entries.push({
-		type: "deleted",
-		category: "action",
-		name,
-		details: `${remoteAction.from} -> ${remoteAction.to}`
-	});
 }
 function compareConfigs(local, remote) {
 	const entries = [];
@@ -9758,24 +9808,27 @@ function describeRight(right) {
 	});
 	return perEntity.length > 0 ? perEntity.join(", ") : "no entities";
 }
-function compareRightsForFilter(filterCond, localRights, remoteRights, entries) {
-	const maxLen = Math.max(localRights.length, remoteRights.length);
-	for (let i = 0; i < maxLen; i++) {
-		const localRight = localRights[i];
-		const remoteRight = remoteRights[i];
-		if (localRight && !remoteRight) entries.push({
-			type: "added",
-			filterCond,
-			details: describeRight(localRight)
-		});
-		else if (!localRight && remoteRight) entries.push({
-			type: "deleted",
-			filterCond,
-			details: describeRight(remoteRight)
-		});
-		else if (localRight && remoteRight) {
-			if (!isRightEqual(localRight, remoteRight)) {
-				const detail = localRight.entities.length !== remoteRight.entities.length ? `entities: ${remoteRight.entities.length} -> ${localRight.entities.length}` : `entities: ${describeRight(remoteRight)} -> ${describeRight(localRight)}`;
+const RecordPermissionDiffDetector = { detect: (local, remote) => {
+	const entries = [];
+	for (const pair of pairByKeyInOrder(local.rights, remote.rights, (r) => r.filterCond)) {
+		const filterCond = pair.key;
+		switch (pair.kind) {
+			case "localOnly":
+				entries.push({
+					type: "added",
+					filterCond,
+					details: describeRight(pair.local)
+				});
+				break;
+			case "remoteOnly":
+				entries.push({
+					type: "deleted",
+					filterCond,
+					details: describeRight(pair.remote)
+				});
+				break;
+			case "both": if (!isRightEqual(pair.local, pair.remote)) {
+				const detail = pair.local.entities.length !== pair.remote.entities.length ? `entities: ${pair.remote.entities.length} -> ${pair.local.entities.length}` : `entities: ${describeRight(pair.remote)} -> ${describeRight(pair.local)}`;
 				entries.push({
 					type: "modified",
 					filterCond,
@@ -9784,17 +9837,6 @@ function compareRightsForFilter(filterCond, localRights, remoteRights, entries)
 			}
 		}
 	}
-}
-const RecordPermissionDiffDetector = { detect: (local, remote) => {
-	const entries = [];
-	const localMulti = groupByKey(local.rights, (r) => r.filterCond);
-	const remoteMulti = groupByKey(remote.rights, (r) => r.filterCond);
-	for (const [filterCond, localRights] of localMulti) compareRightsForFilter(filterCond, localRights, remoteMulti.get(filterCond) ?? [], entries);
-	for (const [filterCond, remoteRights] of remoteMulti) if (!localMulti.has(filterCond)) for (const remoteRight of remoteRights) entries.push({
-		type: "deleted",
-		filterCond,
-		details: describeRight(remoteRight)
-	});
 	return buildDiffResult(entries);
 } };
 //#endregion