kintone-migrator 0.28.0 → 0.29.0

package/dist/index.mjs

@@ -669,6 +669,11 @@ function buildDiffResult(entries, warnings = []) {
 	};
 }
 //#endregion
+//#region src/core/domain/services/formatValue.ts
+function formatValue(v) {
+	return v === void 0 ? "(none)" : JSON.stringify(v);
+}
+//#endregion
 //#region src/core/domain/services/recordDiffDetector.ts
 function detectRecordDiff(localRecord, remoteRecord, callbacks) {
 	const entries = [];
@@ -685,11 +690,10 @@ function detectRecordDiff(localRecord, remoteRecord, callbacks) {
 function compareActions$1(local, remote) {
 	const diffs = [];
 	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
-	if (!deepEqual(local.destApp, remote.destApp)) diffs.push("destApp changed");
-	if (local.filterCond !== remote.filterCond) diffs.push("filterCond changed");
-	if (!deepEqual(local.mappings, remote.mappings)) if (local.mappings.length !== remote.mappings.length) diffs.push(`mappings: ${remote.mappings.length} -> ${local.mappings.length}`);
-	else diffs.push("mappings changed");
-	if (!deepEqual(local.entities, remote.entities)) diffs.push("entities changed");
+	if (!deepEqual(local.destApp, remote.destApp)) diffs.push(`destApp: ${formatValue(remote.destApp)} -> ${formatValue(local.destApp)}`);
+	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
+	if (!deepEqual(local.mappings, remote.mappings)) diffs.push(`mappings: ${formatValue(remote.mappings)} -> ${formatValue(local.mappings)}`);
+	if (!deepEqual(local.entities, remote.entities)) diffs.push(`entities: ${formatValue(remote.entities)} -> ${formatValue(local.entities)}`);
 	return diffs;
 }
 function destAppLabel(action) {
@@ -5643,7 +5647,7 @@ const FieldPermissionDiffDetector = { detect: (local, remote) => {
 		else if (!isEntitiesEqual$1(localRight, remoteRight)) entries.push({
 			type: "modified",
 			fieldCode: code,
-			details: `entities: ${describeEntities(localRight.entities)}`
+			details: `entities: ${describeEntities(remoteRight.entities)} -> ${describeEntities(localRight.entities)}`
 		});
 	}
 	for (const [code, remoteRight] of remoteMap) if (!localMap.has(code)) entries.push({
@@ -5746,12 +5750,40 @@ function isFieldEqual(a, b) {
 	if ((a.noLabel ?? false) !== (b.noLabel ?? false)) return false;
 	return isPropertiesEqual(a, b);
 }
+function describePropertiesChanges(before, after) {
+	if (before.type !== after.type) return [];
+	if (before.type === "SUBTABLE" && after.type === "SUBTABLE") {
+		const beforeObj = Object.fromEntries(Array.from(before.properties.fields.entries()));
+		const afterObj = Object.fromEntries(Array.from(after.properties.fields.entries()));
+		return [`fields: ${formatValue(beforeObj)} -> ${formatValue(afterObj)}`];
+	}
+	if (before.type === "REFERENCE_TABLE" && after.type === "REFERENCE_TABLE") {
+		const bRef = before.properties.referenceTable;
+		const aRef = after.properties.referenceTable;
+		const subChanges = [];
+		for (const key of [
+			"relatedApp",
+			"condition",
+			"filterCond",
+			"displayFields",
+			"sort",
+			"size"
+		]) if (!deepEqual(bRef[key], aRef[key])) subChanges.push(`referenceTable.${key}: ${formatValue(bRef[key])} -> ${formatValue(aRef[key])}`);
+		return subChanges.length > 0 ? subChanges : ["referenceTable changed"];
+	}
+	const bProps = before.properties;
+	const aProps = after.properties;
+	const allKeys = new Set([...Object.keys(bProps), ...Object.keys(aProps)]);
+	const propChanges = [];
+	for (const key of allKeys) if (!deepEqual(bProps[key], aProps[key])) propChanges.push(`${key}: ${formatValue(bProps[key])} -> ${formatValue(aProps[key])}`);
+	return propChanges;
+}
 function describeChanges$1(before, after) {
 	const changes = [];
 	if (before.type !== after.type) changes.push(`type: ${before.type} -> ${after.type}`);
 	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("properties changed");
+	if (!isPropertiesEqual(before, after)) changes.push(...describePropertiesChanges(before, after));
 	return changes.length > 0 ? changes.join(", ") : "no visible changes";
 }
 function isLayoutEqual(a, b) {
@@ -6412,9 +6444,6 @@ function compareConfigs$1(local, remote) {
 			details: `${rv} -> ${lv}`
 		});
 	}
-	function formatValue(v) {
-		return v === void 0 ? "(none)" : JSON.stringify(v);
-	}
 	function compareDeepEqual(field, l, r) {
 		if (!deepEqual(l, r)) entries.push({
 			type: "modified",
@@ -6639,18 +6668,18 @@ function perRecordLabel(notif) {
 }
 function describePerRecordChanges(local, remote) {
 	const diffs = [];
-	if (local.title !== remote.title) diffs.push("title changed");
-	if (!deepEqual(local.targets, remote.targets)) diffs.push("targets changed");
+	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";
 }
 function describeReminderChanges(local, remote) {
 	const diffs = [];
-	if (local.title !== remote.title) diffs.push("title changed");
-	if (local.daysLater !== remote.daysLater) diffs.push("daysLater changed");
-	if ((local.hoursLater ?? 0) !== (remote.hoursLater ?? 0)) diffs.push("hoursLater changed");
-	if ((local.time ?? "") !== (remote.time ?? "")) diffs.push("time changed");
-	if (local.filterCond !== remote.filterCond) diffs.push("filterCond changed");
-	if (!deepEqual(local.targets, remote.targets)) diffs.push("targets changed");
+	if (local.title !== remote.title) diffs.push(`title: "${remote.title}" -> "${local.title}"`);
+	if (local.daysLater !== remote.daysLater) diffs.push(`daysLater: ${remote.daysLater} -> ${local.daysLater}`);
+	if ((local.hoursLater ?? 0) !== (remote.hoursLater ?? 0)) diffs.push(`hoursLater: ${remote.hoursLater ?? 0} -> ${local.hoursLater ?? 0}`);
+	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";
 }
 function comparePerRecordSection(local, remote) {
@@ -6992,7 +7021,7 @@ function compareActions(localAction, remoteAction) {
 	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 changed");
+	if (!isExecutableUserEqual(localAction.executableUser, remoteAction.executableUser)) diffs.push(`executableUser: ${formatValue(remoteAction.executableUser)} -> ${formatValue(localAction.executableUser)}`);
 	return diffs;
 }
 function compareStates(local, remote, entries) {
@@ -7010,7 +7039,7 @@ function compareStates(local, remote, entries) {
 		const stateDiffs = [];
 		if (localState.index !== remoteState.index) stateDiffs.push(`index: ${remoteState.index} -> ${localState.index}`);
 		if (localState.assignee.type !== remoteState.assignee.type) stateDiffs.push(`assignee.type: ${remoteState.assignee.type} -> ${localState.assignee.type}`);
-		if (!isEntitiesEqual(localState.assignee.entities, remoteState.assignee.entities)) stateDiffs.push("assignee.entities changed");
+		if (!isEntitiesEqual(localState.assignee.entities, remoteState.assignee.entities)) stateDiffs.push(`assignee.entities: ${formatValue(remoteState.assignee.entities)} -> ${formatValue(localState.assignee.entities)}`);
 		if (stateDiffs.length > 0) entries.push({
 			type: "modified",
 			category: "state",
@@ -7228,7 +7257,7 @@ function compareRightsForFilter(filterCond, localRights, remoteRights, entries)
 		});
 		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(localRight)}`;
+				const detail = localRight.entities.length !== remoteRight.entities.length ? `entities: ${remoteRight.entities.length} -> ${localRight.entities.length}` : `entities: ${describeRight(remoteRight)} -> ${describeRight(localRight)}`;
 				entries.push({
 					type: "modified",
 					filterCond,
@@ -7325,11 +7354,11 @@ function compareReports(local, remote) {
 	if (local.chartType !== remote.chartType) diffs.push(`chartType: ${remote.chartType} -> ${local.chartType}`);
 	if ((local.chartMode ?? "") !== (remote.chartMode ?? "")) diffs.push(`chartMode: ${remote.chartMode ?? "(unset)"} -> ${local.chartMode ?? "(unset)"}`);
 	if (local.index !== remote.index) diffs.push(`index: ${remote.index} -> ${local.index}`);
-	if (local.filterCond !== remote.filterCond) diffs.push("filterCond changed");
-	if (!deepEqual(local.groups, remote.groups)) diffs.push("groups changed");
-	if (!deepEqual(local.aggregations, remote.aggregations)) diffs.push("aggregations changed");
-	if (!deepEqual(local.sorts, remote.sorts)) diffs.push("sorts changed");
-	if (!deepEqual(local.periodicReport ?? null, remote.periodicReport ?? null)) diffs.push("periodicReport changed");
+	if (local.filterCond !== remote.filterCond) diffs.push(`filterCond: "${remote.filterCond}" -> "${local.filterCond}"`);
+	if (!deepEqual(local.groups, remote.groups)) diffs.push(`groups: ${formatValue(remote.groups)} -> ${formatValue(local.groups)}`);
+	if (!deepEqual(local.aggregations, remote.aggregations)) diffs.push(`aggregations: ${formatValue(remote.aggregations)} -> ${formatValue(local.aggregations)}`);
+	if (!deepEqual(local.sorts, remote.sorts)) diffs.push(`sorts: ${formatValue(remote.sorts)} -> ${formatValue(local.sorts)}`);
+	if (!deepEqual(local.periodicReport ?? null, remote.periodicReport ?? null)) diffs.push(`periodicReport: ${formatValue(remote.periodicReport ?? null)} -> ${formatValue(local.periodicReport ?? null)}`);
 	return diffs;
 }
 const ReportDiffDetector = { detect: (local, remote) => {
@@ -7515,7 +7544,7 @@ async function detectReportDiff({ container }) {
 //#endregion
 //#region src/core/domain/view/services/diffDetector.ts
 function checkOptionalStringChange(changes, field, localVal, remoteVal) {
-	if ((localVal ?? "") !== (remoteVal ?? "")) changes.push(`${field} changed`);
+	if ((localVal ?? "") !== (remoteVal ?? "")) changes.push(`${field}: "${remoteVal ?? ""}" -> "${localVal ?? ""}"`);
 }
 function describeChanges(local, remote) {
 	const changes = [];
@@ -7529,7 +7558,7 @@ function describeChanges(local, remote) {
 	checkOptionalStringChange(changes, "html", local.html, remote.html);
 	if ((local.pager ?? false) !== (remote.pager ?? false)) changes.push(`pager: ${String(remote.pager ?? false)} -> ${String(local.pager ?? false)}`);
 	checkOptionalStringChange(changes, "device", local.device, remote.device);
-	if (!deepEqual(local.fields ?? [], remote.fields ?? [])) changes.push("fields changed");
+	if (!deepEqual(local.fields ?? [], remote.fields ?? [])) changes.push(`fields: ${formatValue(remote.fields ?? [])} -> ${formatValue(local.fields ?? [])}`);
 	return changes;
 }
 const ViewDiffDetector = { detect: (localViews, remoteViews) => {