@kubb/studio 5.9.3 → 5.9.4

package/dist/index.cjs

@@ -176,10 +176,18 @@ function getElapsedMs(hrStart) {
 }
 //#endregion
 //#region package.json
-var version = "5.9.3";
+var version = "5.9.4";
 //#endregion
 //#region src/resolveConfig.ts
 /**
+* Turns the JSON config Studio sends back into live Kubb objects.
+*
+* A plugin or adapter instance carries closures (`parse`, `getImports`, ...) that cannot survive
+* JSON, so both sides pass options over the wire and the factory is re-invoked here with the merged
+* result. Only packages {@link isAllowedPlugin} accepts are resolved this way, never an arbitrary
+* module the payload names.
+*/
+/**
 * Imports a package, falling back to how the user's project would resolve it.
 *
 * `import()` resolves from this file, so a linked or globally installed Studio (`pnpm link`,
@@ -258,8 +266,9 @@ function isAllowedPlugin({ packageName, extensions }) {
 	return KUBB_PLUGIN_SPECIFIER.test(packageName) || extensions.get(packageName)?.manifest.kind === "plugin";
 }
 /**
-* Dynamically imports a plugin package and returns its factory. Only packages
-* {@link isAllowedPlugin} accepts reach `import()`.
+* Dynamically imports an extension package and returns its factory. Callers check
+* {@link isAllowedPlugin} or derive the package from a disk instance first, so an arbitrary module
+* never reaches `import()`.
 *
 * Packages must be pre-installed in the Docker image at build time via the `KUBB_PACKAGES`
 * build ARG, no runtime installation is possible in the distroless container.
@@ -267,13 +276,9 @@ function isAllowedPlugin({ packageName, extensions }) {
 * Resolution order: the manifest's `export`, else the camelCase named export the package name
 * implies (e.g. `pluginTs`), then the default export.
 *
-* @throws if the package is not allowed, cannot be imported, or exports no callable factory.
+* @throws if the package cannot be imported or exports no callable factory.
 */
-async function loadPluginFactory({ packageName, extensions }) {
-	if (!isAllowedPlugin({
-		packageName,
-		extensions
-	})) throw new Error(`Plugin "${packageName}" is not an installed Kubb plugin. Studio loads @kubb/plugin-* packages and installed packages that ship a kubb-extension.json with kind "plugin".`);
+async function loadFactory({ packageName, extensions }) {
 	let mod;
 	try {
 		mod = await importFromProject(packageName);
@@ -292,7 +297,7 @@ async function loadPluginFactory({ packageName, extensions }) {
 }
 /**
 * Resolves each plugin entry by dynamically importing its package and calling its factory with the
-* provided options. See {@link loadPluginFactory} for which packages are allowed.
+* provided options. Only packages {@link isAllowedPlugin} accepts are loaded.
 *
 * @example
 * ```ts
@@ -306,7 +311,11 @@ async function loadPluginFactory({ packageName, extensions }) {
 */
 async function resolvePlugins({ plugins, extensions = /* @__PURE__ */ new Map() }) {
 	return Promise.all(plugins.map(async ({ name, options }) => {
-		return (await loadPluginFactory({
+		if (!isAllowedPlugin({
+			packageName: name,
+			extensions
+		})) throw new Error(`Plugin "${name}" is not an installed Kubb plugin. Studio loads @kubb/plugin-* packages and installed packages that ship a kubb-extension.json with kind "plugin".`);
+		return (await loadFactory({
 			packageName: name,
 			extensions
 		}))(options ?? {});
@@ -454,13 +463,12 @@ async function mergePlugins({ diskPlugins, studioPlugins, extensions = /* @__PUR
 async function rebuildExtension({ disk, studioOptions, kind, extensions }) {
 	if (!studioOptions || !Object.keys(studioOptions).length) return disk;
 	const { name } = (0, _kubb_core.resolveMeta)(disk);
-	const installed = [...extensions.values()].find(({ manifest }) => manifest.kind === kind && manifest.name === name);
-	const packageName = installed?.package ?? `@kubb/${kind}-${name}`;
-	const factory = await importFromProject(packageName).then((mod) => mod[installed?.manifest.export ?? toExportName(packageName)]).catch((cause) => {
+	return (await loadFactory({
+		packageName: [...extensions.values()].find(({ manifest }) => manifest.kind === kind && manifest.name === name)?.package ?? `@kubb/${kind}-${name}`,
+		extensions
+	}).catch((cause) => {
 		throw new Error(`The ${kind} "${name}" is not an installed Kubb extension, so Studio cannot change its options. Edit it in the config file.`, { cause });
-	});
-	if (typeof factory !== "function") throw new Error(`The ${kind} "${name}" is not an installed Kubb extension, so Studio cannot change its options. Edit it in the config file.`);
-	return factory(mergeOptions(disk.options ?? {}, studioOptions));
+	}))(mergeOptions(disk.options ?? {}, studioOptions));
 }
 /**
 * Merges Studio-provided adapter option overrides into the disk config's adapter, see {@link rebuildExtension}.
@@ -1455,7 +1463,6 @@ function createGenerationStream(hooks, jobId) {
 	return {
 		stream,
 		close,
-		dispose: () => fail(),
 		fail
 	};
 }
@@ -1588,29 +1595,29 @@ var Agent = class extends capnweb.RpcTarget {
 		});
 		throw new Error(message);
 	}
-	async #command({ command, run }) {
+	#assertConnected() {
 		if (!this.#session.info) throw new Error("Studio must call connect() before any other command");
-		const { value, info } = await run();
-		if (info !== void 0) await emit(this.#options.hooks, "studio:command", {
+	}
+	#logCommand(command, info) {
+		return emit(this.#options.hooks, "studio:command", {
 			command,
 			info
 		});
-		return value;
 	}
-	async #readConfigFileView() {
+	async #readConfigFileView(source) {
 		if (!this.#permissions.allowConfigEdit) return void 0;
 		try {
-			return readConfig(await read(this.#options.configFile));
+			return readConfig(await source);
 		} catch (error) {
 			await this.#warn({ message: `Could not read ${this.#options.configFile}: ${getErrorMessage(error)}` });
 			return;
 		}
 	}
-	async #installedExtensions() {
-		const source = await read(this.#options.configFile).catch(() => "");
+	async #installedExtensions(source = read(this.#options.configFile)) {
+		const imports = await source.then(readImports, () => []);
 		const installed = await (0, _kubb_core.readInstalledPackages)({
 			root: this.#options.root,
-			packages: [...readImports(source), ...BUILT_IN_PACKAGES],
+			packages: [...imports, ...BUILT_IN_PACKAGES],
 			resolveFrom: ["kubb"]
 		});
 		return new Map(installed.flatMap(({ package: name, version, manifest }) => version !== void 0 && manifest ? [[name, {
@@ -1621,11 +1628,12 @@ var Agent = class extends capnweb.RpcTarget {
 	}
 	async connect(info) {
 		this.#session.info = info;
-		const { configPath, root, version: version$1, loadConfig } = this.#options;
+		const { configPath, root, version: version$1, loadConfig, configFile } = this.#options;
+		const source = read(configFile);
 		const [config, file, extensions] = await Promise.all([
 			loadConfig(),
-			this.#readConfigFileView(),
-			this.#installedExtensions()
+			this.#readConfigFileView(source),
+			this.#installedExtensions(source)
 		]);
 		this.#session.connected.resolve(info);
 		return {
@@ -1678,11 +1686,12 @@ var Agent = class extends capnweb.RpcTarget {
 			result,
 			stop: () => {
 				controller.abort(/* @__PURE__ */ new Error("Generation canceled"));
-				stream.dispose();
+				stream.fail();
 			}
 		});
 	}
 	async #runGeneration(input, controller) {
+		this.#assertConnected();
 		if (this.#session.closed) throw new Error("Connection is closed");
 		if (this.#session.active) return this.#refuse({ message: "A generation is already in progress, please wait for it to finish" });
 		const settled = Promise.withResolvers();
@@ -1694,13 +1703,10 @@ var Agent = class extends capnweb.RpcTarget {
 		let root = this.#options.root;
 		try {
 			if (this.#sandbox) root = await (0, node_fs_promises.mkdtemp)(node_path.default.join((0, node_os.tmpdir)(), "kubb-job-"));
-			return await this.#command({
-				command: "generate",
-				run: () => this.#generate({
-					input,
-					root,
-					signal: controller.signal
-				})
+			return await this.#generate({
+				input,
+				root,
+				signal: controller.signal
 			});
 		} finally {
 			if (root !== this.#options.root) await Promise.all([(0, node_fs_promises.rm)(root, {
@@ -1777,31 +1783,24 @@ var Agent = class extends capnweb.RpcTarget {
 			output,
 			disk
 		});
+		await this.#logCommand("generate", `${activePlugins.length} plugin${activePlugins.length === 1 ? "" : "s"}, ${this.#permissions.allowWrite ? "written to disk" : "in memory"}${studioInput !== void 0 ? ", from a Studio spec" : ""}`);
 		return {
-			value: {
-				status: "success",
-				files: [...files.paths],
-				fileCount: files.paths.size,
-				hashes: output.hashes,
-				disk: disk ? { hashes: disk.hashes } : void 0
-			},
-			info: `${activePlugins.length} plugin${activePlugins.length === 1 ? "" : "s"}, ${this.#permissions.allowWrite ? "written to disk" : "in memory"}${studioInput !== void 0 ? ", from a Studio spec" : ""}`
+			status: "success",
+			files: [...files.paths],
+			fileCount: files.paths.size,
+			hashes: output.hashes,
+			disk: disk ? { hashes: disk.hashes } : void 0
 		};
 	}
-	saveConfig(input) {
-		return this.#command({
-			command: "saveConfig",
-			run: () => this.#saveConfig(input)
-		});
-	}
-	async #saveConfig(input) {
+	async saveConfig(input) {
+		this.#assertConnected();
 		const { configPath, configFile } = this.#options;
 		if (!Array.isArray(input.edits)) {
 			await this.#warn({ message: "Ignored save: the message carried no edits" });
-			return { value: {
+			return {
 				outcomes: [],
 				changed: false
-			} };
+			};
 		}
 		const edits = input.edits;
 		const refuse = (reason) => ({
@@ -1814,9 +1813,9 @@ var Agent = class extends capnweb.RpcTarget {
 		});
 		if (!this.#permissions.allowConfigEdit) {
 			await this.#warn({ message: "Ignored save: editing kubb.config.ts was not granted" });
-			return { value: refuse("the agent was not granted permission to edit kubb.config.ts") };
+			return refuse("the agent was not granted permission to edit kubb.config.ts");
 		}
-		if (this.#session.active) return { value: refuse("a generation is in progress") };
+		if (this.#session.active) return refuse("a generation is in progress");
 		try {
 			const { outcomes, changed } = await writeConfigEdits({
 				filePath: configFile,
@@ -1824,25 +1823,18 @@ 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}`);
 			return {
-				value: {
-					outcomes,
-					changed
-				},
-				info: `applied ${applied}/${outcomes.length} edits to ${configPath}`
+				outcomes,
+				changed
 			};
 		} catch (error) {
 			await emit(this.#options.hooks, "studio:error", { error: toError(error) });
-			return { value: refuse(getErrorMessage(error)) };
+			return refuse(getErrorMessage(error));
 		}
 	}
-	readFiles(input) {
-		return this.#command({
-			command: "readFiles",
-			run: () => this.#readFiles(input)
-		});
-	}
-	async #readFiles(input) {
+	async readFiles(input) {
+		this.#assertConnected();
 		if (!this.#permissions.allowRead) return this.#refuse({
 			message: "The agent was not granted permission to read generated files",
 			permission: "allowRead"
@@ -1862,10 +1854,8 @@ var Agent = class extends capnweb.RpcTarget {
 			cursor: input.cursor,
 			limit: input.limit
 		});
-		return {
-			value: result,
-			info: `read ${Object.keys(result.files).length}/${paths.length} requested file${paths.length === 1 ? "" : "s"}`
-		};
+		await this.#logCommand("readFiles", `read ${Object.keys(result.files).length}/${paths.length} requested file${paths.length === 1 ? "" : "s"}`);
+		return result;
 	}
 };
 const openWebSocketRpc = ({ url, token, instanceId, agent }) => {
@@ -2156,7 +2146,6 @@ async function pairAgent({ onCode, onRetry, maxAttempts = 1, ...options }) {
 }
 //#endregion
 //#region src/snapshot.ts
-const gzipAsync = (0, node_util.promisify)(node_zlib.gzip);
 const UPLOAD_TIMEOUT_MS = 12e4;
 const BUNDLED_DEPENDENCIES = ["@kubb/plugin-barrel"];
 /**
@@ -2276,7 +2265,7 @@ async function createSnapshotPackage({ files, packageInfo }) {
 				Buffer.alloc((512 - bytes.length % 512) % 512)
 			];
 		});
-		return await gzipAsync(Buffer.concat([...chunks, Buffer.alloc(1024)]));
+		return (0, node_zlib.gzipSync)(Buffer.concat([...chunks, Buffer.alloc(1024)]));
 	} finally {
 		await (0, node_fs_promises.rm)(root, {
 			recursive: true,