kintone-migrator 0.35.3 → 0.35.4

package/dist/index.mjs

@@ -6599,6 +6599,13 @@ const VALID_ENTITY_TYPES$5 = /* @__PURE__ */ new Set([
 function isNotificationEntityType(value) {
 	return VALID_ENTITY_TYPES$5.has(value);
 }
+/**
+* Normalizes a reminder timezone read at a boundary (kintone API or config
+* file) to the domain form: `null` and `""` mean unset (`undefined`).
+*/
+function normalizeReminderTimezone(value) {
+	return value === null || value === "" ? void 0 : value;
+}
 //#endregion
 //#region src/core/domain/notification/services/configParser.ts
 const REMINDER_OFFSET_MIN = -1e4;
@@ -6694,10 +6701,13 @@ function parseReminderConfig(raw) {
 	if (!isRecord(raw)) throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, "\"reminder\" must be an object");
 	if (!Array.isArray(raw.notifications)) throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, "\"reminder\" must have a \"notifications\" array");
 	const notifications = raw.notifications.map((item, i) => parseReminderNotification(item, i));
-	return {
-		timezone: typeof raw.timezone === "string" ? raw.timezone : "Asia/Tokyo",
+	const rawTimezone = raw.timezone ?? null;
+	if (rawTimezone !== null && typeof rawTimezone !== "string") throw new BusinessRuleError(NotificationErrorCode.NtInvalidConfigStructure, `"reminder" has non-string "timezone": ${String(rawTimezone)}`);
+	const timezone = normalizeReminderTimezone(rawTimezone);
+	return timezone !== void 0 ? {
+		timezone,
 		notifications
-	};
+	} : { notifications };
 }
 const NotificationConfigParser = { parse: (parsed) => {
 	const obj = validateParsedConfig(parsed, NotificationErrorCode.NtInvalidConfigStructure, "Notification");
@@ -6746,8 +6756,7 @@ async function applyNotification({ container }) {
 	if (config.reminder !== void 0) {
 		const currentReminder = await container.notificationConfigurator.getReminderNotifications();
 		await container.notificationConfigurator.updateReminderNotifications({
-			timezone: config.reminder.timezone,
-			notifications: config.reminder.notifications,
+			...config.reminder,
 			revision: currentReminder.revision
 		});
 	}
@@ -8245,8 +8254,11 @@ var KintoneNotificationConfigurator = class {
 				preview: true
 			});
 			const notifications = response.notifications.map(fromKintoneReminderNotification);
+			const rawTimezone = response.timezone ?? null;
+			if (rawTimezone !== null && typeof rawTimezone !== "string") throw new SystemError(SystemErrorCode.ExternalApiError, `Unexpected reminder timezone from kintone API: ${String(rawTimezone)}`);
+			const timezone = normalizeReminderTimezone(rawTimezone);
 			return {
-				timezone: response.timezone,
+				...timezone !== void 0 ? { timezone } : {},
 				notifications,
 				revision: response.revision
 			};
@@ -8258,9 +8270,9 @@ var KintoneNotificationConfigurator = class {
 		try {
 			const requestParams = {
 				app: this.appId,
-				timezone: params.timezone,
 				notifications: params.notifications.map(toKintoneReminderNotification)
 			};
+			if (params.timezone !== void 0) requestParams.timezone = params.timezone;
 			if (params.revision !== void 0) requestParams.revision = params.revision;
 			return { revision: (await this.client.app.updateReminderNotifications(requestParams)).revision };
 		} catch (error) {
@@ -9564,11 +9576,11 @@ const NotificationDiffDetector = { detect: (local, remote) => {
 	entries.push(...comparePerRecordSection(localPerRecord, remotePerRecord));
 	if (local.reminder && remote.reminder) {
 		entries.push(...compareReminderSection(local.reminder.notifications, remote.reminder.notifications));
-		if (local.reminder.timezone !== remote.reminder.timezone) entries.push({
+		if (local.reminder.timezone !== void 0 && local.reminder.timezone !== remote.reminder.timezone) entries.push({
 			type: "modified",
 			section: "reminder",
 			name: "timezone",
-			details: `${remote.reminder.timezone} -> ${local.reminder.timezone}`
+			details: `${remote.reminder.timezone ?? "(unset)"} -> ${local.reminder.timezone}`
 		});
 	} else if (local.reminder && !remote.reminder) entries.push({
 		type: "added",
@@ -9585,28 +9597,46 @@ const NotificationDiffDetector = { detect: (local, remote) => {
 	return buildDiffResult(entries);
 } };
 //#endregion
-//#region src/core/application/notification/detectNotificationDiff.ts
-async function detectNotificationDiff({ container }) {
-	const [storageResult, generalResult, perRecordResult, reminderResult] = await Promise.all([
-		container.notificationStorage.get(),
+//#region src/core/application/notification/loadNotificationRemote.ts
+/**
+* Fetches the three remote sub-configs (general / perRecord / reminder) and
+* bundles them into a single {@link NotificationRemote}.
+*
+* The three getters each carry the app (preview) revision; since the revision is
+* app-scoped and the three are fetched at (essentially) the same moment, the
+* general getter's revision is used as the observed remote revision for the
+* TOCTOU guard. kintone always returns all three sections, so the bundled config
+* always has `general` / `perRecord` / `reminder` defined (an unset reminder
+* timezone stays absent).
+*/
+async function loadNotificationRemote(container) {
+	const [general, perRecord, reminder] = await Promise.all([
 		container.notificationConfigurator.getGeneralNotifications(),
 		container.notificationConfigurator.getPerRecordNotifications(),
 		container.notificationConfigurator.getReminderNotifications()
 	]);
-	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Notification config file not found");
-	const localConfig = parseNotificationConfigText(container.configCodec, storageResult.content);
-	const remoteConfig = {
-		general: {
-			notifyToCommenter: generalResult.notifyToCommenter,
-			notifications: generalResult.notifications
+	return {
+		config: {
+			general: {
+				notifyToCommenter: general.notifyToCommenter,
+				notifications: general.notifications
+			},
+			perRecord: perRecord.notifications,
+			reminder: {
+				...reminder.timezone !== void 0 ? { timezone: reminder.timezone } : {},
+				notifications: reminder.notifications
+			}
 		},
-		perRecord: perRecordResult.notifications,
-		reminder: {
-			timezone: reminderResult.timezone,
-			notifications: reminderResult.notifications
-		}
+		revision: general.revision
 	};
-	return NotificationDiffDetector.detect(localConfig, remoteConfig);
+}
+//#endregion
+//#region src/core/application/notification/detectNotificationDiff.ts
+async function detectNotificationDiff({ container }) {
+	const [storageResult, remote] = await Promise.all([container.notificationStorage.get(), loadNotificationRemote(container)]);
+	if (!storageResult.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Notification config file not found");
+	const localConfig = parseNotificationConfigText(container.configCodec, storageResult.content);
+	return NotificationDiffDetector.detect(localConfig, remote.config);
 }
 //#endregion
 //#region src/core/domain/plugin/services/diffDetector.ts
@@ -11209,7 +11239,7 @@ const NotificationConfigSerializer = { serialize: (config) => {
 	};
 	if (config.perRecord !== void 0) serialized.perRecord = config.perRecord.map(serializePerRecordNotification);
 	if (config.reminder !== void 0) serialized.reminder = {
-		timezone: config.reminder.timezone,
+		...config.reminder.timezone !== void 0 ? { timezone: config.reminder.timezone } : {},
 		notifications: config.reminder.notifications.map(serializeReminderNotification)
 	};
 	return serialized;
@@ -11217,22 +11247,7 @@ const NotificationConfigSerializer = { serialize: (config) => {
 //#endregion
 //#region src/core/application/notification/captureNotification.ts
 async function captureNotification({ container }) {
-	const [general, perRecord, reminder] = await Promise.all([
-		container.notificationConfigurator.getGeneralNotifications(),
-		container.notificationConfigurator.getPerRecordNotifications(),
-		container.notificationConfigurator.getReminderNotifications()
-	]);
-	const config = {
-		general: {
-			notifyToCommenter: general.notifyToCommenter,
-			notifications: general.notifications
-		},
-		perRecord: perRecord.notifications,
-		reminder: {
-			timezone: reminder.timezone,
-			notifications: reminder.notifications
-		}
-	};
+	const { config } = await loadNotificationRemote(container);
 	return {
 		configText: stringifyConfig(container.configCodec, NotificationConfigSerializer.serialize(config)),
 		hasExistingConfig: (await container.notificationStorage.get()).exists
@@ -13800,7 +13815,8 @@ var capture_default$8 = createCaptureCommand({
 * conflict-resolution namespace:
 *
 * - **reminder** = `code` stable key (`compareReminderSection`, diffDetector
-*   reminder map). Plus the `timezone` scalar as a single whole-entity 3-way.
+*   reminder map). Plus the `timezone` scalar as a single whole-entity 3-way
+*   when the local config manages it (sets a timezone).
 * - **perRecord** = group by `filterCond`, then within a group match by index
 *   (`filterCond#i` composite key — `comparePerRecordSection`). `perRecordLabel`
 *   is display-only and is NOT used as a match key.
@@ -13863,7 +13879,7 @@ function computeNotificationThreeWayMerge(base, local, remote) {
 	const perRecord = classifyThreeWay(buildPerRecordMap(base.perRecord), buildPerRecordMap(local.perRecord), buildPerRecordMap(remote.perRecord), isPerRecordEqual);
 	const reminder = classifyThreeWay(buildReminderMap(base.reminder), buildReminderMap(local.reminder), buildReminderMap(remote.reminder), isReminderEqual);
 	const generalScalar = computeSingleThreeWayMerge(base.general?.notifyToCommenter ?? false, local.general?.notifyToCommenter ?? false, remote.general?.notifyToCommenter ?? false, (a, b) => a === b);
-	const reminderTimezone = computeSingleThreeWayMerge(base.reminder?.timezone ?? "", local.reminder?.timezone ?? "", remote.reminder?.timezone ?? "", (a, b) => a === b);
+	const reminderTimezone = local.reminder?.timezone !== void 0 ? computeSingleThreeWayMerge(base.reminder?.timezone ?? null, local.reminder.timezone, remote.reminder?.timezone ?? null, (a, b) => a === b) : void 0;
 	const entries = [
 		...general.entries,
 		...perRecord.entries,
@@ -13874,12 +13890,12 @@ function computeNotificationThreeWayMerge(base, local, remote) {
 		...perRecord.conflicts.map((e) => ({ key: e.key })),
 		...reminder.conflicts.map((e) => ({ key: e.key })),
 		...scalarConflictKey(generalScalar, GENERAL_SCALAR_KEY),
-		...scalarConflictKey(reminderTimezone, REMINDER_TIMEZONE_KEY)
+		...reminderTimezone !== void 0 ? scalarConflictKey(reminderTimezone, REMINDER_TIMEZONE_KEY) : []
 	];
 	return {
 		entries,
 		generalScalar,
-		reminderTimezone,
+		...reminderTimezone !== void 0 ? { reminderTimezone } : {},
 		conflicts,
 		hasConflict: conflicts.length > 0
 	};
@@ -13929,7 +13945,7 @@ function collectReminderNotifications(entries, resolution) {
 */
 function resolveNotificationMerge(merge, resolution) {
 	const notifyToCommenter = resolveSingleMerge(merge.generalScalar, resolution.get(GENERAL_SCALAR_KEY), NotificationErrorCode.NtUnresolvedConflict);
-	const timezone = resolveSingleMerge(merge.reminderTimezone, resolution.get(REMINDER_TIMEZONE_KEY), NotificationErrorCode.NtUnresolvedConflict);
+	const timezone = merge.reminderTimezone !== void 0 ? resolveSingleMerge(merge.reminderTimezone, resolution.get(REMINDER_TIMEZONE_KEY), NotificationErrorCode.NtUnresolvedConflict) : null;
 	return {
 		general: {
 			notifyToCommenter,
@@ -13937,7 +13953,7 @@ function resolveNotificationMerge(merge, resolution) {
 		},
 		perRecord: collectPerRecordNotifications(merge.entries, resolution),
 		reminder: {
-			timezone,
+			...timezone !== null ? { timezone } : {},
 			notifications: collectReminderNotifications(merge.entries, resolution)
 		}
 	};
@@ -13956,37 +13972,6 @@ const NotificationStateParser = { parse: (parsed) => ({ config: NotificationConf
 //#endregion
 //#region src/core/application/notification/loadNotificationThreeWayInputs.ts
 /**
-* Fetches the three remote sub-configs (general / perRecord / reminder) and
-* bundles them into a single {@link NotificationRemote}.
-*
-* The three getters each carry the app (preview) revision; since the revision is
-* app-scoped and the three are fetched at (essentially) the same moment, the
-* general getter's revision is used as the observed remote revision for the
-* TOCTOU guard. kintone always returns all three sections, so the bundled config
-* always has `general` / `perRecord` / `reminder` defined.
-*/
-async function loadNotificationRemote(container) {
-	const [general, perRecord, reminder] = await Promise.all([
-		container.notificationConfigurator.getGeneralNotifications(),
-		container.notificationConfigurator.getPerRecordNotifications(),
-		container.notificationConfigurator.getReminderNotifications()
-	]);
-	return {
-		config: {
-			general: {
-				notifyToCommenter: general.notifyToCommenter,
-				notifications: general.notifications
-			},
-			perRecord: perRecord.notifications,
-			reminder: {
-				timezone: reminder.timezone,
-				notifications: reminder.notifications
-			}
-		},
-		revision: general.revision
-	};
-}
-/**
 * Loads the four inputs of a 3-way notification sync (base snapshot, base app
 * revision, local YAML, remote config + revision) via the generic
 * {@link loadThreeWayInputs}. Notification bundles three sub-configs into one
@@ -14089,7 +14074,7 @@ function buildThreeWay(merge) {
 		}
 	}
 	pushScalar(merge.generalScalar, "general:notifyToCommenter", "notifyToCommenter", localChanges, remoteDrift, conflicts, extras);
-	pushScalar(merge.reminderTimezone, "reminder:timezone", "timezone", localChanges, remoteDrift, conflicts, extras);
+	if (merge.reminderTimezone !== void 0) pushScalar(merge.reminderTimezone, "reminder:timezone", "timezone", localChanges, remoteDrift, conflicts, extras);
 	return {
 		mode: "three-way",
 		localChanges,
@@ -14312,7 +14297,7 @@ async function pushNotification({ container, input }) {
 			return false;
 		};
 		const isDriftKind = (kind) => kind === "remoteOnly" || kind === "conflict";
-		if (merge.entries.some((e) => isManaged(e.key) && isDriftKind(e.change.kind)) || local.general !== void 0 && isDriftKind(merge.generalScalar.change.kind) || local.reminder !== void 0 && isDriftKind(merge.reminderTimezone.change.kind)) throw buildDriftConflict(NOTIFICATION_PULL_COMMAND);
+		if (merge.entries.some((e) => isManaged(e.key) && isDriftKind(e.change.kind)) || local.general !== void 0 && isDriftKind(merge.generalScalar.change.kind) || merge.reminderTimezone !== void 0 && isDriftKind(merge.reminderTimezone.change.kind)) throw buildDriftConflict(NOTIFICATION_PULL_COMMAND);
 	}
 	const sendRevision = !(input.force || firstTime);
 	let revision = remote.revision;
@@ -14338,11 +14323,14 @@ async function pushNotification({ container, input }) {
 	}
 	if (local.reminder !== void 0) {
 		revision = (await container.notificationConfigurator.updateReminderNotifications({
-			timezone: local.reminder.timezone,
-			notifications: local.reminder.notifications,
+			...local.reminder,
 			...sendRevision ? { revision } : {}
 		})).revision;
-		newBase.reminder = local.reminder;
+		const timezone = local.reminder.timezone ?? remote.config.reminder?.timezone;
+		newBase.reminder = {
+			...timezone !== void 0 ? { timezone } : {},
+			notifications: local.reminder.notifications
+		};
 	}
 	await saveNotificationSnapshotAndRevision(container, newBase, revision);
 	return {