@kubb/studio 5.11.5 → 5.12.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { E as InstalledExtensions, N as PublishedSnapshot, U as SnapshotUploadMetadata, a as AgentConnectInfo, c as AgentPermissions, d as ConfigEditOutcome, s as AgentPermission, u as ConfigEdit } from "./protocol--vpA4DkB.cjs";
+import { F as PublishedSnapshot, G as SnapshotUploadMetadata, O as InstalledExtensions, a as AgentConnectInfo, c as AgentPermissions, d as ConfigEditOutcome, s as AgentPermission, u as ConfigEdit } from "./protocol-Dn1jdnFB.cjs";
 import { Config, Hookable, KubbHooks } from "@kubb/core";
 //#region src/connect.d.ts
 /**
@@ -80,9 +80,10 @@ type ConnectAgentOptions = {
    */
   configPath: string;
   /**
-   * Called for every handshake and every generation, so edits on disk show up.
+   * Called for every handshake and every generation, so edits on disk show up. One entry per
+   * `defineConfig(...)` entry, and a generation names the one it runs.
    */
-  loadConfig: () => Promise<Config>;
+  loadConfigs: () => Promise<Array<Config>>;
   /**
    * The host's own version, reported to Studio next to the runtime's.
    */
@@ -122,7 +123,7 @@ type ConnectAgentOptions = {
  * 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 })
  * ```
  */
 export declare function connectAgent(options: ConnectAgentOptions): Promise<void>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { E as InstalledExtensions, N as PublishedSnapshot, U as SnapshotUploadMetadata, a as AgentConnectInfo, c as AgentPermissions, d as ConfigEditOutcome, s as AgentPermission, u as ConfigEdit } from "./protocol--vpA4DkB.js";
+import { F as PublishedSnapshot, G as SnapshotUploadMetadata, O as InstalledExtensions, a as AgentConnectInfo, c as AgentPermissions, d as ConfigEditOutcome, s as AgentPermission, u as ConfigEdit } from "./protocol-Dn1jdnFB.js";
 import { Config, Hookable, KubbHooks } from "@kubb/core";
 //#region src/connect.d.ts
 /**
@@ -80,9 +80,10 @@ type ConnectAgentOptions = {
    */
   configPath: string;
   /**
-   * Called for every handshake and every generation, so edits on disk show up.
+   * Called for every handshake and every generation, so edits on disk show up. One entry per
+   * `defineConfig(...)` entry, and a generation names the one it runs.
    */
-  loadConfig: () => Promise<Config>;
+  loadConfigs: () => Promise<Array<Config>>;
   /**
    * The host's own version, reported to Studio next to the runtime's.
    */
@@ -122,7 +123,7 @@ type ConnectAgentOptions = {
  * 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 })
  * ```
  */
 export declare function connectAgent(options: ConnectAgentOptions): Promise<void>;

package/dist/index.js

@@ -196,7 +196,7 @@ function getElapsedMs(hrStart) {
 }
 //#endregion
 //#region package.json
-var version = "5.11.5";
+var version = "5.12.0";
 //#endregion
 //#region src/resolveConfig.ts
 /**
@@ -2045,19 +2045,25 @@ var Agent = class extends 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
@@ -2066,30 +2072,8 @@ var Agent = class extends RpcTarget {
 			config: {
 				path: configPath,
 				file,
-				plugins: config.plugins.map((plugin) => ({
-					name: toStudioName({
-						name: resolveMeta(plugin).name,
-						extensions
-					}),
-					options: toJSONOptions(plugin.options)
-				})),
-				adapter: config.adapter && {
-					name: toStudioName({
-						name: resolveMeta(config.adapter).name,
-						extensions,
-						kind: "adapter"
-					}),
-					options: toJSONOptions(config.adapter.options)
-				},
-				parsers: config.parsers.map((parser) => ({
-					name: toStudioName({
-						name: resolveMeta(parser).name,
-						extensions,
-						kind: "parser"
-					}),
-					options: toJSONOptions(parser.options)
-				})),
-				extensions: [...extensions.values()]
+				extensions: [...extensions.values()],
+				configs: entries
 			},
 			permissions: this.#permissions
 		};
@@ -2177,7 +2161,9 @@ var Agent = class extends RpcTarget {
 		const { jobId, config: patch } = input;
 		const studioInput = this.#sandbox ? patch?.input : void 0;
 		if (this.#sandbox && (typeof studioInput !== "string" || !studioInput.trim() || getInputKind(studioInput) !== "inline")) return this.#refuse({ message: 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: AgentMessage.CONFIG_ENTRY_NOT_FOUND });
 		const [plugins, adapter, parsers] = await Promise.all([
 			mergePlugins({
 				diskPlugins: config.plugins,
@@ -2481,6 +2467,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 = getInputKind(input);
+	if (kind === "inline") return void 0;
+	if (kind !== "url" && kind !== "git" || !URL.canParse(input)) 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: resolveMeta(plugin).name,
+				extensions
+			}),
+			options: toJSONOptions(plugin.options)
+		})),
+		adapter: config.adapter && {
+			name: toStudioName({
+				name: resolveMeta(config.adapter).name,
+				extensions,
+				kind: "adapter"
+			}),
+			options: toJSONOptions(config.adapter.options)
+		},
+		parsers: config.parsers.map((parser) => ({
+			name: toStudioName({
+				name: resolveMeta(parser).name,
+				extensions,
+				kind: "parser"
+			}),
+			options: toJSONOptions(parser.options)
+		}))
+	};
+}
 async function runAgent({ options, openRpc }) {
 	const root = options.root ?? process$1.cwd();
 	const resolved = {
@@ -2542,7 +2577,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) {