@kubb/studio 5.11.4 → 5.11.6

package/dist/index.cjs

@@ -220,7 +220,7 @@ function getElapsedMs(hrStart) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.4";
+var version = "5.11.6";
 //#endregion
 //#region src/resolveConfig.ts
 /**
@@ -1082,13 +1082,17 @@ function applySet(source, call, path, value, quote) {
 	}
 	return { source: splice(source, rangeOf(target.value).start, rangeOf(target.value).end, printValue(value, quote)) };
 }
-/** Deletes the option at `path`, falling the plugin back to its default for it. */
+/**
+* Deletes the option at `path`, falling the plugin back to its default for it. An option the file
+* does not set already has its default, so removing it changes nothing.
+*/
 function applyRemove(source, call, path) {
 	const options = call.arguments[0];
-	if (options?.type !== "ObjectExpression") return { reason: "the factory call has no options to remove" };
+	if (!options) return { source };
+	if (options.type !== "ObjectExpression") return { reason: "the factory was not called with an object literal" };
 	const target = walk(options, path);
 	if ("reason" in target) return target;
-	if ("missing" in target) return { reason: `${path.join(".")} is not set` };
+	if ("missing" in target) return { source };
 	return { source: removeMember(source, target.object, target.index) };
 }
 /**
@@ -1128,6 +1132,22 @@ function applyAddPlugin({ source, parsed, config, edit, quote, extensions }) {
 	const next = insertItem(source, plugins, `${importName}(${Object.keys(options).length ? printValue(options, quote) : ""})`);
 	return { source: taken ? next : insertImport(next, parsed, importName, edit.plugin) };
 }
+/**
+* Rewrites the config's `plugins` array with one item per line, so a call can be commented out without
+* taking its neighbors with it. Not done when a comment sits between the items, which would have to move.
+*/
+function expandPluginsArray(source, config) {
+	const array = property(config, "plugins");
+	if (array?.type !== "ArrayExpression") return void 0;
+	const items = array.elements.flatMap((element) => element ? [element] : []);
+	const { start, end } = rangeOf(array);
+	const ranges = items.map(rangeOf);
+	const gaps = [source.slice(start + 1, ranges[0]?.start ?? end - 1), ...ranges.map((range, index) => source.slice(range.end, ranges[index + 1]?.start ?? end - 1))];
+	if (!items.length || gaps.some((gap) => !/^[\s,]*$/.test(gap))) return void 0;
+	const lineStart = source.lastIndexOf("\n", start - 1) + 1;
+	const indent = source.slice(lineStart).match(/^[ \t]*/)?.[0] ?? "";
+	return splice(source, start, end, `[\n${ranges.map((range) => `${indent}  ${source.slice(range.start, range.end)},`).join("\n")}\n${indent}]`);
+}
 /** Comments out a plugin call in place, keeping its options on disk so `enable-plugin` can restore them exactly. */
 function disablePlugin(source, mod, config, plugin) {
 	const loc = factoryCalls(mod, config).find((entry) => entry.packageName === plugin)?.call.loc;
@@ -1155,9 +1175,17 @@ function applyEdit({ source, edit, quote, extensions }) {
 	const parsed = parseConfigs(source);
 	if ("reason" in parsed) return parsed;
 	const ref = edit.config;
-	const config = typeof ref === "string" ? parsed.configs.find((entry) => configName(entry) === ref) : parsed.configs[ref ?? 0];
+	const findConfig = (entries) => typeof ref === "string" ? entries.configs.find((entry) => configName(entry) === ref) : entries.configs[ref ?? 0];
+	const config = findConfig(parsed);
 	if (!config) return { reason: `no config entry found for ${JSON.stringify(ref)}` };
-	if (edit.operation === "disable-plugin") return disablePlugin(source, parsed.mod, config, edit.plugin);
+	if (edit.operation === "disable-plugin") {
+		const result = disablePlugin(source, parsed.mod, config, edit.plugin);
+		if (!("reason" in result) || !result.reason.includes("shares a line")) return result;
+		const expanded = expandPluginsArray(source, config);
+		const reparsed = expanded === void 0 ? void 0 : parseConfigs(expanded);
+		const reparsedConfig = reparsed && !("reason" in reparsed) ? findConfig(reparsed) : void 0;
+		return expanded !== void 0 && reparsed && !("reason" in reparsed) && reparsedConfig ? disablePlugin(expanded, reparsed.mod, reparsedConfig, edit.plugin) : result;
+	}
 	if (edit.operation === "enable-plugin") return enablePlugin(source, config, edit.plugin);
 	if (edit.operation === "add-plugin") return applyAddPlugin({
 		source,
@@ -1979,7 +2007,7 @@ var Agent = class extends capnweb.RpcTarget {
 		});
 		return this.#store;
 	}
-	async [Symbol.asyncDispose]() {
+	async clear() {
 		if (this.#sandbox) await (0, node_fs_promises.rm)((0, _kubb_core.resolveCacheDir)(this.#sandboxCacheRoot), {
 			recursive: true,
 			force: true
@@ -2009,10 +2037,12 @@ var Agent = class extends capnweb.RpcTarget {
 			message: "Studio must call connect() before any other command"
 		});
 	}
-	#logCommand(command, info) {
+	#logCommand(command, info, requestedBy, failed) {
 		return emit(this.#options.hooks, "studio:command", {
 			command,
-			info
+			info,
+			requestedBy,
+			failed
 		});
 	}
 	async #readConfigFileView(source) {
@@ -2039,19 +2069,25 @@ var Agent = class extends capnweb.RpcTarget {
 	}
 	async connect(info) {
 		this.#session.info = info;
-		const { configPath, root, version: version$1, loadConfig, configFile } = this.#options;
+		const { configPath, root, version: version$1, loadConfigs, configFile } = this.#options;
 		const source = read(configFile);
-		const [config, file, extensions] = await Promise.all([
-			loadConfig(),
+		const [configs, file, extensions] = await Promise.all([
+			loadConfigs(),
 			this.#readConfigFileView(source),
 			this.#installedExtensions(source)
 		]);
-		const output = await this.#readDiskOutput(config).catch(async (error) => {
-			await this.#warn({ message: `Could not read the output directory: ${getErrorMessage(error)}` });
-		});
+		const entries = [];
+		for (const config of configs) {
+			const disk = await this.#readDiskOutput(config).catch(async (error) => {
+				await this.#warn({ message: `Could not read the output directory: ${getErrorMessage(error)}` });
+			});
+			entries.push({
+				...toEntryView(config, extensions),
+				...disk && { disk }
+			});
+		}
 		this.#session.connected.resolve(info);
 		return {
-			output,
 			versions: {
 				kubb: version,
 				agent: version$1
@@ -2060,30 +2096,8 @@ var Agent = class extends capnweb.RpcTarget {
 			config: {
 				path: configPath,
 				file,
-				plugins: config.plugins.map((plugin) => ({
-					name: toStudioName({
-						name: (0, _kubb_core.resolveMeta)(plugin).name,
-						extensions
-					}),
-					options: toJSONOptions(plugin.options)
-				})),
-				adapter: config.adapter && {
-					name: toStudioName({
-						name: (0, _kubb_core.resolveMeta)(config.adapter).name,
-						extensions,
-						kind: "adapter"
-					}),
-					options: toJSONOptions(config.adapter.options)
-				},
-				parsers: config.parsers.map((parser) => ({
-					name: toStudioName({
-						name: (0, _kubb_core.resolveMeta)(parser).name,
-						extensions,
-						kind: "parser"
-					}),
-					options: toJSONOptions(parser.options)
-				})),
-				extensions: [...extensions.values()]
+				extensions: [...extensions.values()],
+				configs: entries
 			},
 			permissions: this.#permissions
 		};
@@ -2171,7 +2185,9 @@ var Agent = class extends capnweb.RpcTarget {
 		const { jobId, config: patch } = input;
 		const studioInput = this.#sandbox ? patch?.input : void 0;
 		if (this.#sandbox && (typeof studioInput !== "string" || !studioInput.trim() || (0, _kubb_core.getInputKind)(studioInput) !== "inline")) return this.#refuse({ message: require_protocol.AgentMessage.SANDBOX_INPUT_ONLY });
-		const [config, extensions] = await Promise.all([this.#options.loadConfig(), this.#installedExtensions()]);
+		const [configs, extensions] = await Promise.all([this.#options.loadConfigs(), this.#installedExtensions()]);
+		const config = pickConfig(configs, patch?.config);
+		if (!config) return this.#refuse({ message: require_protocol.AgentMessage.CONFIG_ENTRY_NOT_FOUND });
 		const [plugins, adapter, parsers] = await Promise.all([
 			mergePlugins({
 				diskPlugins: config.plugins,
@@ -2216,6 +2232,7 @@ var Agent = class extends capnweb.RpcTarget {
 			allowExec: this.#permissions.allowWrite && this.#permissions.allowExec
 		}).catch(async (error) => {
 			await this.#generations.drop(jobId);
+			await this.#logCommand("generate", getErrorMessage(error), input.requestedBy, true);
 			throw error;
 		});
 		const output = await this.#generations.keep({
@@ -2234,7 +2251,7 @@ var Agent = class extends capnweb.RpcTarget {
 			output,
 			inputBytes
 		});
-		await this.#logCommand("generate", `${activePlugins.length} plugin${activePlugins.length === 1 ? "" : "s"}, ${this.#permissions.allowWrite ? "written to disk" : "staged on disk"}${studioInput !== void 0 ? ", from a Studio spec" : ""}`);
+		await this.#logCommand("generate", `${activePlugins.length} plugin${activePlugins.length === 1 ? "" : "s"}, ${this.#permissions.allowWrite ? "written to disk" : "staged on disk"}${studioInput !== void 0 ? ", from a Studio spec" : ""}`, input.requestedBy);
 		return {
 			status: "success",
 			files: [...files.paths],
@@ -2273,7 +2290,7 @@ var Agent = class extends capnweb.RpcTarget {
 				extensions: await this.#installedExtensions()
 			});
 			const applied = outcomes.filter((outcome) => outcome.applied).length;
-			await this.#logCommand("saveConfig", `applied ${applied}/${outcomes.length} edits to ${configPath}`);
+			await this.#logCommand("saveConfig", `applied ${applied}/${outcomes.length} edits to ${configPath}`, input.requestedBy);
 			return {
 				outcomes,
 				changed
@@ -2465,7 +2482,7 @@ async function runSession({ options, openRpc, url, instanceId }) {
 		await emit(hooks, "studio:warn", { message: "Canceled the running generation: the connection to Kubb Studio closed" });
 	}
 	await active?.settled;
-	await agent[Symbol.asyncDispose]();
+	await agent.clear();
 	return {
 		...close,
 		connected: session.info !== void 0
@@ -2474,6 +2491,55 @@ async function runSession({ options, openRpc, url, instanceId }) {
 /**
 * The connection loop with a swappable transport. {@link connectAgent} passes a real WebSocket.
 */
+/** The entry Studio named by position or `name`, else the first. `undefined` for one the file does not have. */
+function pickConfig(configs, ref) {
+	if (typeof ref === "string") return configs.find((config) => config.name === ref);
+	if (ref !== void 0 && !Number.isSafeInteger(ref)) return void 0;
+	return configs[ref ?? 0];
+}
+/** The input path or URL Studio may show: no inline document, and no credentials from a URL. */
+function reportedInput(input) {
+	if (typeof input !== "string") return void 0;
+	const kind = (0, _kubb_core.getInputKind)(input);
+	if (kind === "inline") return void 0;
+	if (kind !== "url") return input;
+	const url = new URL(input);
+	url.username = "";
+	url.password = "";
+	return url.href;
+}
+/** A JSON copy of one resolved entry, each extension named by the package its manifest is in. */
+function toEntryView(config, extensions) {
+	const input = reportedInput(config.input);
+	return {
+		...config.name !== void 0 && { name: config.name },
+		...input !== void 0 && { input },
+		output: config.output.path,
+		plugins: config.plugins.map((plugin) => ({
+			name: toStudioName({
+				name: (0, _kubb_core.resolveMeta)(plugin).name,
+				extensions
+			}),
+			options: toJSONOptions(plugin.options)
+		})),
+		adapter: config.adapter && {
+			name: toStudioName({
+				name: (0, _kubb_core.resolveMeta)(config.adapter).name,
+				extensions,
+				kind: "adapter"
+			}),
+			options: toJSONOptions(config.adapter.options)
+		},
+		parsers: config.parsers.map((parser) => ({
+			name: toStudioName({
+				name: (0, _kubb_core.resolveMeta)(parser).name,
+				extensions,
+				kind: "parser"
+			}),
+			options: toJSONOptions(parser.options)
+		}))
+	};
+}
 async function runAgent({ options, openRpc }) {
 	const root = options.root ?? node_process.default.cwd();
 	const resolved = {
@@ -2535,7 +2601,7 @@ async function runAgent({ options, openRpc }) {
 * const hooks = new Hookable<KubbHooks>()
 * hooks.hook('studio:connected', ({ agentSlug }) => console.log(`Connected as ${agentSlug}`))
 *
-* await connectAgent({ token, configPath: 'kubb.config.ts', loadConfig, version: '1.0.0', hooks, signal })
+* await connectAgent({ token, configPath: 'kubb.config.ts', loadConfigs, version: '1.0.0', hooks, signal })
 * ```
 */
 function connectAgent(options) {
@@ -2933,6 +2999,7 @@ exports.InvalidAgentTokenError = InvalidAgentTokenError;
 exports.PairingCanceledError = PairingCanceledError;
 exports.PairingDeniedError = PairingDeniedError;
 exports.PairingExpiredError = PairingExpiredError;
+exports.applyConfigEdits = applyConfigEdits;
 exports.connectAgent = connectAgent;
 exports.createSnapshot = createSnapshot;
 exports.defaultStudioUrl = defaultStudioUrl;