@kubb/studio 5.8.0 → 5.8.2

package/dist/index.cjs

@@ -216,7 +216,7 @@ function getElapsedMs(hrStart) {
 }
 //#endregion
 //#region package.json
-var version = "5.8.0";
+var version = "5.8.2";
 //#endregion
 //#region src/resolveConfig.ts
 /**
@@ -286,7 +286,7 @@ function isInstalled({ packageName, root }) {
 /**
 * The name Studio knows a plugin by: its `@kubb/plugin-*` package when one is installed, otherwise
 * the plugin's own `name`, so a plugin defined in the user's project is never reported as a Kubb
-* package that does not exist.
+* package that does not exist. An installed extension whose manifest `name` matches wins.
 *
 * @example
 * ```ts
@@ -294,7 +294,9 @@ function isInstalled({ packageName, root }) {
 * toStudioName({ name: 'plugin-zod-operations', root })  // 'plugin-zod-operations', a local plugin
 * ```
 */
-function toStudioName({ name, root }) {
+function toStudioName({ name, root, extensions = /* @__PURE__ */ new Map() }) {
+	const installed = [...extensions.values()].find(({ manifest }) => manifest.kind === "plugin" && manifest.name === name);
+	if (installed) return installed.package;
 	const packageName = toPackageName(name);
 	return packageName !== name && isInstalled({
 		packageName,
@@ -313,59 +315,69 @@ function toStudioName({ name, root }) {
 function toExportName(packageName) {
 	return camelCase(toPluginName(packageName));
 }
-/**
-* A `@kubb/plugin-*` package specifier. Nothing else may reach `import()`: only Kubb's own
-* plugins are supported, so a payload naming anything else, a third-party package or a path, is
-* refused before it can execute.
-*/
 const KUBB_PLUGIN_SPECIFIER = /^@kubb\/plugin-[\w.-]+$/;
 /**
-* Whether `name` is a `@kubb/plugin-*` specifier. Exported so `configFile.ts` can refuse the same
-* shape before printing a Studio-supplied plugin name into the config file's source text.
+* Whether Studio may import `packageName` as a plugin: a `@kubb/plugin-*` package, or an installed
+* package whose `kubb-extension.json` has `kind: "plugin"`. A path, URL or arbitrary package is
+* refused before it can execute. `configFile.ts` applies the same rule before printing a plugin name.
 */
-function isKubbPluginSpecifier(name) {
-	return KUBB_PLUGIN_SPECIFIER.test(name);
+function isAllowedPlugin({ packageName, extensions }) {
+	if (!(0, _kubb_core.isPackageName)(packageName)) return false;
+	return KUBB_PLUGIN_SPECIFIER.test(packageName) || extensions.get(packageName)?.manifest.kind === "plugin";
 }
 /**
-* Dynamically imports a `@kubb/plugin-*` package and returns its factory function.
+* Dynamically imports a plugin package and returns its factory. Only packages
+* {@link isAllowedPlugin} accepts reach `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.
 *
-* Resolution order: the camelCase named export the package name implies (e.g. `pluginTs`), then
-* the default export.
+* 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 cannot be imported or exports no callable factory.
+* @throws if the package is not allowed, cannot be imported, or exports no callable factory.
 */
-async function loadPluginFactory(packageName) {
-	if (!isKubbPluginSpecifier(packageName)) throw new Error(`Plugin "${packageName}" is not a @kubb/plugin-* package. Kubb Studio only supports Kubb's own plugins.`);
+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".`);
 	let mod;
 	try {
 		mod = await importFromProject(packageName);
 	} catch (cause) {
 		throw new Error(`Plugin "${packageName}" could not be loaded. Make sure it is installed: \`npm install ${packageName}\``, { cause });
 	}
+	const manifestExport = extensions.get(packageName)?.manifest.export;
+	if (manifestExport) {
+		if (typeof mod[manifestExport] === "function") return mod[manifestExport];
+		throw new Error(`Plugin "${packageName}" does not export "${manifestExport}", the factory its kubb-extension.json names.`);
+	}
 	const exportName = toExportName(packageName);
 	if (typeof mod[exportName] === "function") return mod[exportName];
 	if (typeof mod["default"] === "function") return mod["default"];
 	throw new Error(`Plugin "${packageName}" does not export a callable factory. Tried the named export "${exportName}" and "default".`);
 }
 /**
-* Resolves each plugin entry by dynamically importing the `@kubb/plugin-*` package and
-* calling its factory with the provided options.
-*
-* Packages must be pre-installed in the Docker image at build time, use the `KUBB_PACKAGES`
-* build ARG to control which ones are available at runtime.
+* 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.
 *
 * @example
 * ```ts
-* { name: '@kubb/plugin-react-query', options: { output: { path: './hooks' } } }
-* { name: '@kubb/plugin-ts', options: { output: { path: './types' } } }
+* const plugins = await resolvePlugins({
+*   plugins: [
+*     { name: '@kubb/plugin-react-query', options: { output: { path: './hooks' } } },
+*     { name: '@kubb/plugin-ts', options: { output: { path: './types' } } },
+*   ],
+* })
 * ```
 */
-async function resolvePlugins(plugins) {
+async function resolvePlugins({ plugins, extensions = /* @__PURE__ */ new Map() }) {
 	return Promise.all(plugins.map(async ({ name, options }) => {
-		return (await loadPluginFactory(name))(options ?? {});
+		return (await loadPluginFactory({
+			packageName: name,
+			extensions
+		}))(options ?? {});
 	}));
 }
 /** The installed version of each plugin's package, plus the names that could not be resolved. */
@@ -483,14 +495,18 @@ function mergeOptions(disk, studio) {
 * For plugins present in both configs, the plugin is re-instantiated with merged options
 * so that all internal closures correctly reference the merged values.
 */
-async function mergePlugins(diskPlugins, studioPlugins) {
-	const disabledNames = new Set((studioPlugins ?? []).filter((entry) => entry.disabled).map((entry) => toPluginName(entry.name)));
+async function mergePlugins({ diskPlugins, studioPlugins, extensions = /* @__PURE__ */ new Map() }) {
+	const pluginNameOf = (packageName) => extensions.get(packageName)?.manifest.name ?? toPluginName(packageName);
+	const disabledNames = new Set((studioPlugins ?? []).filter((entry) => entry.disabled).map((entry) => pluginNameOf(entry.name)));
 	const activeDiskPlugins = disabledNames.size ? diskPlugins?.filter((plugin) => !disabledNames.has((0, _kubb_core.resolveMeta)(plugin).name)) : diskPlugins;
 	const activeStudioPlugins = studioPlugins?.filter((entry) => !entry.disabled);
 	if (!activeDiskPlugins && !activeStudioPlugins?.length) return void 0;
 	if (!activeStudioPlugins?.length) return activeDiskPlugins;
-	if (!activeDiskPlugins) return resolvePlugins(activeStudioPlugins);
-	const studioEntryByName = new Map(activeStudioPlugins.map((entry) => [toPluginName(entry.name), entry]));
+	if (!activeDiskPlugins) return resolvePlugins({
+		plugins: activeStudioPlugins,
+		extensions
+	});
+	const studioEntryByName = new Map(activeStudioPlugins.map((entry) => [pluginNameOf(entry.name), entry]));
 	const diskNames = new Set(activeDiskPlugins.map((plugin) => plugin.name));
 	const merged = await Promise.all(activeDiskPlugins.map(async (diskPlugin) => {
 		const studioEntry = studioEntryByName.get((0, _kubb_core.resolveMeta)(diskPlugin).name);
@@ -498,17 +514,23 @@ async function mergePlugins(diskPlugins, studioPlugins) {
 		const diskOptions = diskPlugin.options ?? {};
 		const options = mergeOptions(diskOptions, studioEntry.options ?? {});
 		const unchanged = JSON.stringify(toJSONOptions(options)) === JSON.stringify(toJSONOptions(diskOptions));
-		const [resolved] = await resolvePlugins([{
-			name: studioEntry.name,
-			options
-		}]).catch((cause) => {
+		const [resolved] = await resolvePlugins({
+			plugins: [{
+				name: studioEntry.name,
+				options
+			}],
+			extensions
+		}).catch((cause) => {
 			if (unchanged) return [diskPlugin];
-			throw new Error(`Plugin "${diskPlugin.name}" is not an installed @kubb/plugin-* package, so Studio cannot change its options. Edit it in the config file, or only enable or disable it from Studio.`, { cause });
+			throw new Error(`Plugin "${diskPlugin.name}" is not an installed @kubb/plugin-* package or Kubb extension, so Studio cannot change its options. Edit it in the config file, or only enable or disable it from Studio.`, { cause });
 		});
 		return resolved ?? diskPlugin;
 	}));
-	const studioOnly = activeStudioPlugins.filter((entry) => !diskNames.has(toPluginName(entry.name)));
-	return [...merged, ...await resolvePlugins(studioOnly)];
+	const studioOnly = activeStudioPlugins.filter((entry) => !diskNames.has(pluginNameOf(entry.name)));
+	return [...merged, ...await resolvePlugins({
+		plugins: studioOnly,
+		extensions
+	})];
 }
 /**
 * Merges Studio-provided adapter option overrides into the disk config's adapter.
@@ -875,6 +897,14 @@ function readConfig(source) {
 		})
 	};
 }
+/** The modules the config file imports, in source order. Empty when the file cannot be parsed. */
+function readImports(source) {
+	try {
+		return [...new Set(importedFrom((0, magicast.parseModule)(source)).values())];
+	} catch {
+		return [];
+	}
+}
 /**
 * Walks `path` through a plugin's options to the literal at its last key. Returns `missing` with
 * the index of the first key that is not there yet, so `set` can write the rest of the path as one
@@ -948,9 +978,12 @@ function insertImport(source, { mod, kind }, importName, moduleSpecifier) {
 * Adds a `pluginX(...)` call to a config's plugins array, and its import. Replaying the same add is
 * a no-op, while an import name collision with an unrelated package remains an error.
 */
-function applyAddPlugin(source, parsed, config, edit, quote) {
-	if (!isKubbPluginSpecifier(edit.plugin)) return { reason: `"${edit.plugin}" is not a @kubb/plugin-* package` };
-	const importName = edit.importName ?? toExportName(edit.plugin);
+function applyAddPlugin({ source, parsed, config, edit, quote, extensions }) {
+	if (!isAllowedPlugin({
+		packageName: edit.plugin,
+		extensions
+	})) return { reason: `"${edit.plugin}" is not a @kubb/plugin-* package or an installed Kubb plugin` };
+	const importName = extensions.get(edit.plugin)?.manifest.export ?? edit.importName ?? toExportName(edit.plugin);
 	if (!IDENTIFIER.test(importName)) return { reason: `"${importName}" is not a valid import name` };
 	if (pluginCalls(parsed.mod, config).some((plugin) => plugin.packageName === edit.plugin)) return { source };
 	const taken = importedFrom(parsed.mod).get(importName);
@@ -985,7 +1018,7 @@ function enablePlugin(source, config, plugin) {
 	return { source: lines.join("\n") };
 }
 /** Applies one edit to `source`. Every edit re-parses the file, since the previous one rewrote it. */
-function applyEdit(source, edit, quote) {
+function applyEdit({ source, edit, quote, extensions }) {
 	const parsed = parseConfigs(source);
 	if ("reason" in parsed) return parsed;
 	const ref = edit.config;
@@ -993,7 +1026,14 @@ function applyEdit(source, edit, quote) {
 	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 === "enable-plugin") return enablePlugin(source, config, edit.plugin);
-	if (edit.operation === "add-plugin") return applyAddPlugin(source, parsed, config, edit, quote);
+	if (edit.operation === "add-plugin") return applyAddPlugin({
+		source,
+		parsed,
+		config,
+		edit,
+		quote,
+		extensions
+	});
 	const call = pluginCalls(parsed.mod, config).find((plugin) => plugin.packageName === edit.plugin)?.call;
 	if (!call) return { reason: disabledBlocks(source, config).some((block) => block.packageName === edit.plugin) ? `${edit.plugin} is disabled, enable it first` : `${edit.plugin} is not in the plugins array` };
 	return edit.operation === "set" ? applySet(source, call, edit.path, edit.value, quote) : applyRemove(source, call, edit.path);
@@ -1006,12 +1046,13 @@ function applyEdit(source, edit, quote) {
 *
 * @example
 * ```ts
-* const { source, outcomes } = applyConfigEdits(current, [
-*   { operation: 'set', plugin: '@kubb/plugin-ts', path: ['enum', 'type'], value: 'enum' },
-* ])
+* const { source, outcomes } = applyConfigEdits({
+*   source: current,
+*   edits: [{ operation: 'set', plugin: '@kubb/plugin-ts', path: ['enum', 'type'], value: 'enum' }],
+* })
 * ```
 */
-function applyConfigEdits(source, edits) {
+function applyConfigEdits({ source, edits, extensions = /* @__PURE__ */ new Map() }) {
 	let current = source;
 	const quote = (0, magicast.detectCodeFormat)(source).quote === "double" ? `"` : `'`;
 	const outcomes = edits.map((edit) => {
@@ -1022,7 +1063,12 @@ function applyConfigEdits(source, edits) {
 			reason: invalid
 		};
 		try {
-			const result = applyEdit(current, edit, quote);
+			const result = applyEdit({
+				source: current,
+				edit,
+				quote,
+				extensions
+			});
 			if ("reason" in result) return {
 				edit,
 				applied: false,
@@ -1047,13 +1093,46 @@ function applyConfigEdits(source, edits) {
 		changed: current !== source
 	};
 }
-/** Applies `edits` to the config file at `filePath`, writing it only when something changed. */
-async function writeConfigEdits({ filePath, edits }) {
-	const result = applyConfigEdits(await read(filePath), edits);
+/**
+* Applies `edits` to the config file at `filePath`, writing it only when something changed.
+* `add-plugin` accepts `@kubb/plugin-*` packages and the plugins in `extensions`.
+*/
+async function writeConfigEdits({ filePath, edits, extensions }) {
+	const result = applyConfigEdits({
+		source: await read(filePath),
+		edits,
+		extensions
+	});
 	if (result.changed) await (0, node_fs_promises.writeFile)(filePath, result.source, "utf-8");
 	return result;
 }
 //#endregion
+//#region src/extensions.ts
+/** Extensions `kubb` ships with, so they count as installed without being a direct dependency. */
+const BUILT_IN_PACKAGES = [
+	"@kubb/adapter-oas",
+	"@kubb/parser-ts",
+	"@kubb/parser-md",
+	"@kubb/plugin-barrel"
+];
+/**
+* Finds the extensions installed in the project at `root`: its `dependencies` and `devDependencies`,
+* the `packages` its config file imports, and the extensions `kubb` ships with. Keeps each package
+* that resolves and ships a valid `kubb-extension.json`. Never throws.
+*/
+async function discoverExtensions({ root, packages = [] }) {
+	const installed = await (0, _kubb_core.readInstalledPackages)({
+		root,
+		packages: [...packages, ...BUILT_IN_PACKAGES],
+		resolveFrom: ["kubb"]
+	});
+	return new Map(installed.flatMap(({ package: name, version, manifest }) => version !== void 0 && manifest ? [[name, {
+		package: name,
+		version,
+		manifest
+	}]] : []));
+}
+//#endregion
 //#region src/generations.ts
 const READ_CONCURRENCY = 50;
 const MB = 1048576;
@@ -1568,10 +1647,21 @@ var Agent = class extends capnweb.RpcTarget {
 			return;
 		}
 	}
+	async #installedExtensions() {
+		const source = await read(this.#options.configFile).catch(() => "");
+		return discoverExtensions({
+			root: this.#options.root,
+			packages: readImports(source)
+		});
+	}
 	async connect(info) {
 		this.#session.info = info;
 		const { configPath, root, version: version$1, loadConfig } = this.#options;
-		const [config, file] = await Promise.all([loadConfig(), this.#readConfigFileView()]);
+		const [config, file, extensions] = await Promise.all([
+			loadConfig(),
+			this.#readConfigFileView(),
+			this.#installedExtensions()
+		]);
 		this.#session.connected.resolve(info);
 		return {
 			versions: {
@@ -1585,10 +1675,12 @@ var Agent = class extends capnweb.RpcTarget {
 				plugins: config.plugins.map((plugin) => ({
 					name: toStudioName({
 						name: (0, _kubb_core.resolveMeta)(plugin).name,
-						root
+						root,
+						extensions
 					}),
 					options: toJSONOptions(plugin.options)
-				}))
+				})),
+				extensions: [...extensions.values()]
 			},
 			permissions: this.#permissions
 		};
@@ -1646,8 +1738,12 @@ 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: "A sandbox agent generates only from the OpenAPI document content Studio sends, not from a file path or URL" });
-		const config = await this.#options.loadConfig();
-		const [plugins, adapter] = await Promise.all([mergePlugins(config.plugins, patch?.plugins), mergeAdapter(config.adapter, patch?.adapter)]).catch(async (error) => {
+		const [config, extensions] = await Promise.all([this.#options.loadConfig(), this.#installedExtensions()]);
+		const [plugins, adapter] = await Promise.all([mergePlugins({
+			diskPlugins: config.plugins,
+			studioPlugins: patch?.plugins,
+			extensions
+		}), mergeAdapter(config.adapter, patch?.adapter)]).catch(async (error) => {
 			await emit(this.#options.hooks, "kubb:error", { error: toError(error) });
 			throw error;
 		});
@@ -1735,7 +1831,8 @@ var Agent = class extends capnweb.RpcTarget {
 		try {
 			const { source, outcomes, changed } = await writeConfigEdits({
 				filePath: configFile,
-				edits
+				edits,
+				extensions: await this.#installedExtensions()
 			});
 			const applied = outcomes.filter((outcome) => outcome.applied).length;
 			return {
@@ -2269,5 +2366,6 @@ exports.connectAgent = connectAgent;
 exports.createSnapshot = createSnapshot;
 exports.defaultStudioUrl = defaultStudioUrl;
 exports.pairAgent = pairAgent;
+exports.writeConfigEdits = writeConfigEdits;
 
 //# sourceMappingURL=index.cjs.map