@kubb/studio 5.5.0 → 5.5.2

package/dist/index.js

@@ -16,7 +16,7 @@ import { Diagnostics, Hookable, cacheStorage, createKubb, fsStorage, memoryStora
 import { builders, detectCodeFormat, generateCode, parseModule } from "magicast";
 import { existsSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { mergeDeep } from "remeda";
+import { isPlainObject } from "remeda";
 import { gzip } from "node:zlib";
 import { build } from "tsdown";
 import { RpcTarget, newWebSocketRpcSession } from "capnweb";
@@ -695,7 +695,7 @@ function resolveAgentCapacity(env = process.env) {
 }
 //#endregion
 //#region package.json
-var version = "5.5.0";
+var version = "5.5.2";
 //#endregion
 //#region src/operations/resolveConfig.ts
 /**
@@ -808,8 +808,46 @@ async function resolvePlugins(plugins) {
 	}));
 }
 /**
+* Whether `value` comes back unchanged from a JSON round trip. A function, a `RegExp` or another
+* class instance does not: the agent reports options to Studio as JSON, so what Studio sends back
+* for such a value is a lossy copy (`macros: [{ name }]` without its hooks, `pattern: {}`).
+*/
+function survivesJson(value) {
+	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+	if (typeof value === "number") return Number.isFinite(value);
+	if (Array.isArray(value)) return value.every(survivesJson);
+	if (isPlainObject(value)) return Object.values(value).every(survivesJson);
+	return false;
+}
+/**
+* Deep-merges Studio's options over the disk options, with Studio taking priority, except where the
+* disk value cannot survive JSON. Studio only ever saw a lossy copy of such a value, so the disk
+* value is kept rather than replaced by what Studio echoes back. Plain objects merge key by key, so
+* Studio can still change a literal that sits next to a function (e.g. `group.type` beside `group.name`).
+*
+* @example
+* ```ts
+* mergeOptions({ macros: [camelCaseMacro], syntaxType: 'type' }, { macros: [{ name: 'camelCase' }], syntaxType: 'interface' })
+* // { macros: [camelCaseMacro], syntaxType: 'interface' }
+* ```
+*/
+function mergeOptions(disk, studio) {
+	const merged = { ...disk };
+	for (const [key, value] of Object.entries(studio)) {
+		const current = disk[key];
+		if (isPlainObject(current) && isPlainObject(value)) {
+			merged[key] = mergeOptions(current, value);
+			continue;
+		}
+		if (current !== void 0 && !survivesJson(current)) continue;
+		merged[key] = value;
+	}
+	return merged;
+}
+/**
 * Merges studio plugin options with disk config plugins.
-* Studio takes priority: options from studio win over disk, and a plugin Studio explicitly
+* Studio takes priority: options from studio win over disk (except values only the disk config
+* can express, see {@link mergeOptions}), and a plugin Studio explicitly
 * disabled is dropped even when the disk config still lists it. Disk plugins without a studio
 * counterpart are kept as-is. Studio plugins not present on disk are appended.
 *
@@ -828,7 +866,7 @@ async function mergePlugins(diskPlugins, studioPlugins) {
 	const merged = await Promise.all(activeDiskPlugins.map(async (diskPlugin) => {
 		const studioEntry = studioEntryByName.get(diskPlugin.name);
 		if (!studioEntry) return diskPlugin;
-		const options = mergeDeep(diskPlugin.options ?? {}, studioEntry.options ?? {});
+		const options = mergeOptions(diskPlugin.options ?? {}, studioEntry.options ?? {});
 		const [resolved] = await resolvePlugins([{
 			name: studioEntry.name,
 			options
@@ -852,7 +890,7 @@ async function mergeAdapter(diskAdapter, studioOptions) {
 	const packageName = `@kubb/adapter-${diskAdapter.name}`;
 	const factory = (await importFromProject(packageName))[toExportName(packageName)];
 	if (typeof factory !== "function") return diskAdapter;
-	return factory(mergeDeep(diskAdapter.options ?? {}, studioOptions));
+	return factory(mergeOptions(diskAdapter.options ?? {}, studioOptions));
 }
 //#endregion
 //#region src/operations/configFile.ts