kintone-migrator 0.34.1 → 0.34.3

package/dist/index.mjs

@@ -6724,12 +6724,26 @@ async function applyPlugin({ container }) {
 	if (!result.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Plugin config file not found");
 	const config = parsePluginConfigText(container.configCodec, result.content);
 	const current = await container.pluginConfigurator.getPlugins();
-	const currentIds = new Set(current.plugins.map((p) => p.id));
-	const missingIds = config.plugins.map((p) => p.id).filter((id) => !currentIds.has(id));
-	if (missingIds.length > 0) await container.pluginConfigurator.addPlugins({
-		ids: missingIds,
+	const remoteById = new Map(current.plugins.map((p) => [p.id, p]));
+	const idsToAdd = [];
+	const skipped = [];
+	for (const plugin of config.plugins) {
+		const remote = remoteById.get(plugin.id);
+		if (plugin.enabled) {
+			if (remote === void 0) idsToAdd.push(plugin.id);
+		} else if (remote === void 0 || remote.enabled) skipped.push({
+			pluginId: plugin.id,
+			reason: "disabled"
+		});
+	}
+	if (idsToAdd.length > 0) await container.pluginConfigurator.addPlugins({
+		ids: idsToAdd,
 		revision: current.revision
 	});
+	return {
+		addedPluginIds: idsToAdd,
+		skipped
+	};
 }
 //#endregion
 //#region src/core/domain/processManagement/services/configParser.ts
@@ -7428,6 +7442,7 @@ function buildPhases$1(args) {
 				storageExists: async () => (await c.schema.schemaStorage.get()).exists,
 				run: async () => {
 					await executeMigration({ container: c.schema });
+					return [];
 				}
 			}]
 		},
@@ -7441,12 +7456,14 @@ function buildPhases$1(args) {
 						container: c.customization,
 						input: { basePath: args.customizeBasePath }
 					});
+					return [];
 				}
 			}, {
 				domain: "view",
 				storageExists: async () => (await c.view.viewStorage.get()).exists,
 				run: async () => {
 					await applyView({ container: c.view });
+					return [];
 				}
 			}]
 		},
@@ -7458,6 +7475,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.fieldPermission.fieldPermissionStorage.get()).exists,
 					run: async () => {
 						await applyFieldPermission({ container: c.fieldPermission });
+						return [];
 					}
 				},
 				{
@@ -7465,6 +7483,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.appPermission.appPermissionStorage.get()).exists,
 					run: async () => {
 						await applyAppPermission({ container: c.appPermission });
+						return [];
 					}
 				},
 				{
@@ -7472,6 +7491,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.recordPermission.recordPermissionStorage.get()).exists,
 					run: async () => {
 						await applyRecordPermission({ container: c.recordPermission });
+						return [];
 					}
 				}
 			]
@@ -7484,6 +7504,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.settings.generalSettingsStorage.get()).exists,
 					run: async () => {
 						await applyGeneralSettings({ container: c.settings });
+						return [];
 					}
 				},
 				{
@@ -7491,6 +7512,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.notification.notificationStorage.get()).exists,
 					run: async () => {
 						await applyNotification({ container: c.notification });
+						return [];
 					}
 				},
 				{
@@ -7498,6 +7520,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.report.reportStorage.get()).exists,
 					run: async () => {
 						await applyReport({ container: c.report });
+						return [];
 					}
 				},
 				{
@@ -7505,6 +7528,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.action.actionStorage.get()).exists,
 					run: async () => {
 						await applyAction({ container: c.action });
+						return [];
 					}
 				},
 				{
@@ -7512,6 +7536,7 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.process.processManagementStorage.get()).exists,
 					run: async () => {
 						await applyProcessManagement({ container: c.process });
+						return [];
 					}
 				},
 				{
@@ -7519,13 +7544,19 @@ function buildPhases$1(args) {
 					storageExists: async () => (await c.adminNotes.adminNotesStorage.get()).exists,
 					run: async () => {
 						await applyAdminNotes({ container: c.adminNotes });
+						return [];
 					}
 				},
 				{
 					domain: "plugin",
 					storageExists: async () => (await c.plugin.pluginStorage.get()).exists,
 					run: async () => {
-						await applyPlugin({ container: c.plugin });
+						const disabled = (await applyPlugin({ container: c.plugin })).skipped.map((s) => s.pluginId);
+						if (disabled.length === 0) return [];
+						return [{
+							domain: "plugin",
+							message: `enabled: false is not supported by the kintone plugin API (add-only; cannot disable); handle in the kintone admin UI: ${disabled.join(", ")}`
+						}];
 					}
 				}
 			]
@@ -7540,6 +7571,7 @@ function buildPhases$1(args) {
 						container: c.seed,
 						input: {}
 					});
+					return [];
 				}
 			}]
 		}
@@ -7575,11 +7607,12 @@ async function executeSchemaPhase$1(phase, containers, state) {
 			continue;
 		}
 		try {
-			await task.run();
+			const warnings = await task.run();
 			await deployApp({ container: containers.schema });
 			results.push({
 				domain: task.domain,
-				success: true
+				success: true,
+				warnings
 			});
 		} catch (error) {
 			const err = toError$2(error);
@@ -7620,10 +7653,11 @@ async function executeStandardPhase$1(phase, state) {
 			continue;
 		}
 		try {
-			await task.run();
+			const warnings = await task.run();
 			results.push({
 				domain: task.domain,
-				success: true
+				success: true,
+				warnings
 			});
 		} catch (error) {
 			const err = toError$2(error);
@@ -9974,6 +10008,7 @@ function printPhaseResult$1(phaseResult) {
 	for (const result of phaseResult.results) {
 		p.log.message(formatTaskResult$2(result));
 		if (!result.success && !result.skipped) logError(result.error);
+		if (result.success) for (const warning of result.warnings) p.log.warn(warning.message);
 	}
 }
 function printApplyAllResults(output) {
@@ -13783,6 +13818,11 @@ var apply_default$6 = createApplyCommand({
 	successMessage: "Plugins applied successfully.",
 	createContainer: createPluginCliContainer,
 	applyFn: applyPlugin,
+	onResult: (result) => {
+		if (result.addedPluginIds.length > 0) p.log.info(`Added plugins: ${result.addedPluginIds.join(", ")}`);
+		const disabled = result.skipped.map((s) => s.pluginId);
+		if (disabled.length > 0) p.log.warn(`enabled: false is not supported by the kintone plugin API (add-only; cannot disable); handle in the kintone admin UI: ${disabled.join(", ")}`);
+	},
 	diffPreview: {
 		detectDiff: detectPluginDiff,
 		printResult: printPluginDiffResult
@@ -14064,18 +14104,52 @@ var pull_default$7 = createPullCommand({
 /** Pull command name surfaced in the drift hint message. */
 const PLUGIN_PULL_COMMAND = "plugin pull";
 /**
+* Splits the local→remote diff into the ids that can actually be added
+* (`enabled: true`, missing on the remote) and the inexpressible ops surfaced
+* as `skipped`: `add-disabled` (`enabled: false`, missing), `delete` (remote
+* plugin absent locally), and `modify` (existing plugin with name/enabled
+* change).
+*/
+function partitionPushOps(local, remoteById, localById, remotePlugins) {
+	const idsToAdd = [];
+	const skipped = [];
+	for (const localPlugin of local.plugins) {
+		const remotePlugin = remoteById.get(localPlugin.id);
+		if (remotePlugin === void 0) if (localPlugin.enabled) idsToAdd.push(localPlugin.id);
+		else skipped.push({
+			pluginId: localPlugin.id,
+			reason: "add-disabled"
+		});
+		else if (remotePlugin.name !== localPlugin.name || remotePlugin.enabled !== localPlugin.enabled) skipped.push({
+			pluginId: localPlugin.id,
+			reason: "modify"
+		});
+	}
+	for (const remotePlugin of remotePlugins) if (!localById.has(remotePlugin.id)) skipped.push({
+		pluginId: remotePlugin.id,
+		reason: "delete"
+	});
+	return {
+		idsToAdd,
+		skipped
+	};
+}
+/**
 * Applies the local plugin config to the remote with drift detection.
 *
 * The plugin API is **add-only**: `addPlugins` can only install a plugin id
 * that is not yet on the app. It has no remove API and cannot control the
-* `enabled` flag (MEMORY: plugin-enabled-no-disable-api). So this push:
+* `enabled` flag. So this push:
 *
 * - Loads base/local/remote and rejects on drift (remoteOnly / conflict) unless
 *   `--force`.
-* - Adds only the plugin ids that are present locally but missing on the remote.
-* - Surfaces every requested-but-inexpressible operation (a local deletion of a
-*   remote plugin, or a name/enabled change to an existing plugin) as a
-*   `skipped` warning instead of applying it — the only inexpressible case.
+* - Adds only the `enabled: true` plugin ids that are present locally but
+*   missing on the remote.
+* - Surfaces every requested-but-inexpressible operation as a `skipped` warning
+*   instead of applying it: a local deletion of a remote plugin (`delete`), a
+*   name/enabled change to an existing plugin (`modify`), and an `enabled: false`
+*   plugin missing on the remote (`add-disabled`, since `addPlugins` would
+*   force-enable it).
 *
 * The expected revision (the observed remote revision) is sent to `addPlugins`
 * as a TOCTOU guard on a normal push; `--force` / first run omit it. When there is nothing to add, the remote is not touched but
@@ -14095,19 +14169,7 @@ async function pushPlugin({ container, input }) {
 	}
 	const remoteById = new Map(remote.config.plugins.map((p) => [p.id, p]));
 	const localById = new Map(local.plugins.map((p) => [p.id, p]));
-	const idsToAdd = local.plugins.filter((p) => !remoteById.has(p.id)).map((p) => p.id);
-	const skipped = [];
-	for (const remotePlugin of remote.config.plugins) if (!localById.has(remotePlugin.id)) skipped.push({
-		pluginId: remotePlugin.id,
-		reason: "delete"
-	});
-	for (const localPlugin of local.plugins) {
-		const remotePlugin = remoteById.get(localPlugin.id);
-		if (remotePlugin !== void 0 && (remotePlugin.name !== localPlugin.name || remotePlugin.enabled !== localPlugin.enabled)) skipped.push({
-			pluginId: localPlugin.id,
-			reason: "modify"
-		});
-	}
+	const { idsToAdd, skipped } = partitionPushOps(local, remoteById, localById, remote.config.plugins);
 	let newRevision = remote.revision;
 	if (idsToAdd.length > 0) {
 		const expectedRevision = input.force || firstTime ? void 0 : remote.revision;
@@ -14150,8 +14212,10 @@ var plugin_default = define({
 				if (result.addedPluginIds.length > 0) p.log.info(`Added plugins: ${result.addedPluginIds.join(", ")}`);
 				const deletions = result.skipped.filter((o) => o.reason === "delete").map((o) => o.pluginId);
 				const modifications = result.skipped.filter((o) => o.reason === "modify").map((o) => o.pluginId);
+				const addDisabled = result.skipped.filter((o) => o.reason === "add-disabled").map((o) => o.pluginId);
 				if (deletions.length > 0) p.log.warn(`Cannot remove plugins via the kintone API (add-only); left on the app: ${deletions.join(", ")}`);
 				if (modifications.length > 0) p.log.warn(`Cannot modify existing plugins (name/enabled) via the kintone API (add-only); unchanged: ${modifications.join(", ")}`);
+				if (addDisabled.length > 0) p.log.warn(`Cannot add plugins in a disabled state via the kintone API (add-only; adding would force-enable them); not added — set enabled: false manually in the kintone admin UI: ${addDisabled.join(", ")}`);
 			},
 			resolveContainerConfig: resolvePluginContainerConfig,
 			resolveAppContainerConfig: resolvePluginAppContainerConfig