orval 8.0.0-rc.1 → 8.0.0-rc.2

package/dist/bin/orval.mjs

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+import { c as name, i as startWatcher, l as version, n as loadConfigFile, o as normalizeOptions, r as generateSpec, s as description, t as findConfigFile } from "../config-BH1mpZT1.mjs";
+import path from "node:path";
+import { Option, program } from "@commander-js/extra-typings";
+import { ErrorWithTag, OutputClient, OutputMode, isString, log, logError, startMessage } from "@orval/core";
+
+//#region src/bin/orval.ts
+const orvalMessage = startMessage({
+	name,
+	version,
+	description
+});
+const cli = program.name("orval").description(orvalMessage).version(version);
+cli.addOption(new Option("-o, --output <path>", "output file destination").conflicts(["config", "project"])).addOption(new Option("-i, --input <path>", "input file (yaml or json openapi specs)").conflicts(["config", "project"])).addOption(new Option("-c, --config <path>", "override flags by a config file").conflicts(["input", "output"])).addOption(new Option("-p, --project <name>", "focus a project of the config").conflicts(["input", "output"])).addOption(new Option("-m, --mode <name>", "default mode that will be used").choices(Object.values(OutputMode))).option("-w, --watch [paths...]", "Watch mode, if path is not specified, it watches the input target").addOption(new Option("--client <name>", "default client that will be used").choices(Object.values(OutputClient))).option("--mock", "activate the mock").option("--clean [paths...]", "Clean output directory").option("--prettier", "Prettier generated files").option("--biome", "biome generated files").option("--tsconfig <path>", "path to your tsconfig file").action(async (options) => {
+	log(orvalMessage);
+	if (isString(options.input) && isString(options.output)) {
+		const normalizedOptions = await normalizeOptions({
+			input: options.input,
+			output: {
+				target: options.output,
+				clean: options.clean,
+				prettier: options.prettier,
+				biome: options.biome,
+				mock: options.mock,
+				client: options.client,
+				mode: options.mode,
+				tsconfig: options.tsconfig
+			}
+		});
+		if (options.watch) await startWatcher(options.watch, async () => {
+			try {
+				await generateSpec(process.cwd(), normalizedOptions);
+			} catch (error) {
+				logError(error);
+				process.exit(1);
+			}
+		}, normalizedOptions.input.target);
+		else try {
+			await generateSpec(process.cwd(), normalizedOptions);
+		} catch (error) {
+			if (error instanceof ErrorWithTag) logError(error.cause, error.tag);
+			else logError(error);
+			process.exit(1);
+		}
+	} else {
+		const configFilePath = findConfigFile(options.config);
+		const workspace = path.dirname(configFilePath);
+		const configFile = await loadConfigFile(configFilePath);
+		if (isString(options.project) && !Object.hasOwn(configFile, options.project)) {
+			logError("Project not found in config", options.project);
+			process.exit(1);
+		}
+		const configs = Object.entries(configFile).filter(([projectName]) => !isString(options.project) || projectName === options.project);
+		let hasErrors = false;
+		for (const [projectName, config] of configs) {
+			const normalizedOptions = await normalizeOptions(config, workspace, options);
+			if (options.watch === void 0) try {
+				await generateSpec(workspace, normalizedOptions, projectName);
+			} catch (error) {
+				hasErrors = true;
+				logError(error, projectName);
+			}
+			else {
+				const fileToWatch = isString(normalizedOptions.input.target) ? normalizedOptions.input.target : void 0;
+				await startWatcher(options.watch, async () => {
+					try {
+						await generateSpec(workspace, normalizedOptions, projectName);
+					} catch (error) {
+						logError(error, projectName);
+					}
+				}, fileToWatch);
+			}
+		}
+		if (hasErrors) logError("One or more project failed, see above for details");
+	}
+});
+await cli.parseAsync(process.argv);
+
+//#endregion
+export {  };
+//# sourceMappingURL=orval.mjs.map

package/dist/bin/orval.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"orval.mjs","names":["pkg.name","pkg.version","pkg.description"],"sources":["../../src/bin/orval.ts"],"sourcesContent":["#!/usr/bin/env node\nimport path from 'node:path';\n\nimport { Option, program } from '@commander-js/extra-typings';\nimport {\n  ErrorWithTag,\n  isString,\n  log,\n  logError,\n  OutputClient,\n  OutputMode,\n  startMessage,\n} from '@orval/core';\n\nimport pkg from '../../package.json';\nimport { generateSpec } from '../generate-spec';\nimport { findConfigFile, loadConfigFile } from '../utils/config';\nimport { normalizeOptions } from '../utils/options';\nimport { startWatcher } from '../utils/watcher';\n\nconst orvalMessage = startMessage({\n  name: pkg.name,\n  version: pkg.version,\n  description: pkg.description,\n});\nconst cli = program\n  .name('orval')\n  .description(orvalMessage)\n  .version(pkg.version);\n\ncli\n  .addOption(\n    new Option('-o, --output <path>', 'output file destination').conflicts([\n      'config',\n      'project',\n    ]),\n  )\n  .addOption(\n    new Option(\n      '-i, --input <path>',\n      'input file (yaml or json openapi specs)',\n    ).conflicts(['config', 'project']),\n  )\n  .addOption(\n    new Option(\n      '-c, --config <path>',\n      'override flags by a config file',\n    ).conflicts(['input', 'output']),\n  )\n  .addOption(\n    new Option(\n      '-p, --project <name>',\n      'focus a project of the config',\n    ).conflicts(['input', 'output']),\n  )\n  .addOption(\n    new Option('-m, --mode <name>', 'default mode that will be used').choices(\n      Object.values(OutputMode),\n    ),\n  )\n  .option(\n    '-w, --watch [paths...]',\n    'Watch mode, if path is not specified, it watches the input target',\n  )\n  .addOption(\n    new Option('--client <name>', 'default client that will be used').choices(\n      Object.values(OutputClient),\n    ),\n  )\n  .option('--mock', 'activate the mock')\n  .option('--clean [paths...]', 'Clean output directory')\n  .option('--prettier', 'Prettier generated files')\n  .option('--biome', 'biome generated files')\n  .option('--tsconfig <path>', 'path to your tsconfig file')\n  .action(async (options) => {\n    log(orvalMessage);\n\n    if (isString(options.input) && isString(options.output)) {\n      const normalizedOptions = await normalizeOptions({\n        input: options.input,\n        output: {\n          target: options.output,\n          clean: options.clean,\n          prettier: options.prettier,\n          biome: options.biome,\n          mock: options.mock,\n          client: options.client,\n          mode: options.mode,\n          tsconfig: options.tsconfig,\n        },\n      });\n\n      if (options.watch) {\n        await startWatcher(\n          options.watch,\n          async () => {\n            try {\n              await generateSpec(process.cwd(), normalizedOptions);\n            } catch (error) {\n              logError(error);\n              process.exit(1);\n            }\n          },\n          normalizedOptions.input.target as string,\n        );\n      } else {\n        try {\n          await generateSpec(process.cwd(), normalizedOptions);\n        } catch (error) {\n          if (error instanceof ErrorWithTag) {\n            logError(error.cause, error.tag);\n          } else {\n            logError(error);\n          }\n          process.exit(1);\n        }\n      }\n    } else {\n      const configFilePath = findConfigFile(options.config);\n      const workspace = path.dirname(configFilePath);\n      const configFile = await loadConfigFile(configFilePath);\n\n      if (\n        isString(options.project) &&\n        !Object.hasOwn(configFile, options.project)\n      ) {\n        logError('Project not found in config', options.project);\n        process.exit(1);\n      }\n\n      const configs = Object.entries(configFile).filter(\n        ([projectName]) =>\n          // only filter by project if specified\n          !isString(options.project) || projectName === options.project,\n      );\n\n      let hasErrors = false;\n      for (const [projectName, config] of configs) {\n        const normalizedOptions = await normalizeOptions(\n          config,\n          workspace,\n          options,\n        );\n\n        if (options.watch === undefined) {\n          try {\n            await generateSpec(workspace, normalizedOptions, projectName);\n          } catch (error) {\n            hasErrors = true;\n            logError(error, projectName);\n          }\n        } else {\n          const fileToWatch = isString(normalizedOptions.input.target)\n            ? normalizedOptions.input.target\n            : undefined;\n\n          await startWatcher(\n            options.watch,\n            async () => {\n              try {\n                await generateSpec(workspace, normalizedOptions, projectName);\n              } catch (error) {\n                logError(error, projectName);\n              }\n            },\n            fileToWatch,\n          );\n        }\n      }\n\n      if (hasErrors)\n        logError('One or more project failed, see above for details');\n    }\n  });\n\nawait cli.parseAsync(process.argv);\n"],"mappings":";;;;;;;AAoBA,MAAM,eAAe,aAAa;CAC1BA;CACGC;CACIC;CACd,CAAC;AACF,MAAM,MAAM,QACT,KAAK,QAAQ,CACb,YAAY,aAAa,CACzB,QAAQD,QAAY;AAEvB,IACG,UACC,IAAI,OAAO,uBAAuB,0BAA0B,CAAC,UAAU,CACrE,UACA,UACD,CAAC,CACH,CACA,UACC,IAAI,OACF,sBACA,0CACD,CAAC,UAAU,CAAC,UAAU,UAAU,CAAC,CACnC,CACA,UACC,IAAI,OACF,uBACA,kCACD,CAAC,UAAU,CAAC,SAAS,SAAS,CAAC,CACjC,CACA,UACC,IAAI,OACF,wBACA,gCACD,CAAC,UAAU,CAAC,SAAS,SAAS,CAAC,CACjC,CACA,UACC,IAAI,OAAO,qBAAqB,iCAAiC,CAAC,QAChE,OAAO,OAAO,WAAW,CAC1B,CACF,CACA,OACC,0BACA,oEACD,CACA,UACC,IAAI,OAAO,mBAAmB,mCAAmC,CAAC,QAChE,OAAO,OAAO,aAAa,CAC5B,CACF,CACA,OAAO,UAAU,oBAAoB,CACrC,OAAO,sBAAsB,yBAAyB,CACtD,OAAO,cAAc,2BAA2B,CAChD,OAAO,WAAW,wBAAwB,CAC1C,OAAO,qBAAqB,6BAA6B,CACzD,OAAO,OAAO,YAAY;AACzB,KAAI,aAAa;AAEjB,KAAI,SAAS,QAAQ,MAAM,IAAI,SAAS,QAAQ,OAAO,EAAE;EACvD,MAAM,oBAAoB,MAAM,iBAAiB;GAC/C,OAAO,QAAQ;GACf,QAAQ;IACN,QAAQ,QAAQ;IAChB,OAAO,QAAQ;IACf,UAAU,QAAQ;IAClB,OAAO,QAAQ;IACf,MAAM,QAAQ;IACd,QAAQ,QAAQ;IAChB,MAAM,QAAQ;IACd,UAAU,QAAQ;IACnB;GACF,CAAC;AAEF,MAAI,QAAQ,MACV,OAAM,aACJ,QAAQ,OACR,YAAY;AACV,OAAI;AACF,UAAM,aAAa,QAAQ,KAAK,EAAE,kBAAkB;YAC7C,OAAO;AACd,aAAS,MAAM;AACf,YAAQ,KAAK,EAAE;;KAGnB,kBAAkB,MAAM,OACzB;MAED,KAAI;AACF,SAAM,aAAa,QAAQ,KAAK,EAAE,kBAAkB;WAC7C,OAAO;AACd,OAAI,iBAAiB,aACnB,UAAS,MAAM,OAAO,MAAM,IAAI;OAEhC,UAAS,MAAM;AAEjB,WAAQ,KAAK,EAAE;;QAGd;EACL,MAAM,iBAAiB,eAAe,QAAQ,OAAO;EACrD,MAAM,YAAY,KAAK,QAAQ,eAAe;EAC9C,MAAM,aAAa,MAAM,eAAe,eAAe;AAEvD,MACE,SAAS,QAAQ,QAAQ,IACzB,CAAC,OAAO,OAAO,YAAY,QAAQ,QAAQ,EAC3C;AACA,YAAS,+BAA+B,QAAQ,QAAQ;AACxD,WAAQ,KAAK,EAAE;;EAGjB,MAAM,UAAU,OAAO,QAAQ,WAAW,CAAC,QACxC,CAAC,iBAEA,CAAC,SAAS,QAAQ,QAAQ,IAAI,gBAAgB,QAAQ,QACzD;EAED,IAAI,YAAY;AAChB,OAAK,MAAM,CAAC,aAAa,WAAW,SAAS;GAC3C,MAAM,oBAAoB,MAAM,iBAC9B,QACA,WACA,QACD;AAED,OAAI,QAAQ,UAAU,OACpB,KAAI;AACF,UAAM,aAAa,WAAW,mBAAmB,YAAY;YACtD,OAAO;AACd,gBAAY;AACZ,aAAS,OAAO,YAAY;;QAEzB;IACL,MAAM,cAAc,SAAS,kBAAkB,MAAM,OAAO,GACxD,kBAAkB,MAAM,SACxB;AAEJ,UAAM,aACJ,QAAQ,OACR,YAAY;AACV,SAAI;AACF,YAAM,aAAa,WAAW,mBAAmB,YAAY;cACtD,OAAO;AACd,eAAS,OAAO,YAAY;;OAGhC,YACD;;;AAIL,MAAI,UACF,UAAS,oDAAoD;;EAEjE;AAEJ,MAAM,IAAI,WAAW,QAAQ,KAAK"}

package/dist/{generate-6oT76j_W.js → config-BH1mpZT1.mjs}

@@ -1,11 +1,8 @@
-import { ErrorWithTag, FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMode, PropertySortOrder, RefComponentSuffix, asyncReduce, createLogger, createSuccessMessage, dynamicImport, generateComponentDefinition, generateDependencyImports, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getFileInfo, getFullRoute, getMockFileExtensionByTypeName, getRoute, ibmOpenapiValidator, isBoolean, isFunction, isObject, isReference, isRootKey, isSchema, isString, isUndefined, isUrl, jsDoc, log, logError, mergeDeep, openApiConverter, pascal, removeFilesAndEmptyFolders, resolveRef, upath, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
-import fs from "node:fs";
 import path from "node:path";
-import process$1 from "node:process";
-import { createJiti } from "jiti";
+import { FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMode, PropertySortOrder, RefComponentSuffix, asyncReduce, createLogger, createSuccessMessage, dynamicImport, generateComponentDefinition, generateDependencyImports, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getFileInfo, getFullRoute, getMockFileExtensionByTypeName, getRoute, ibmOpenapiValidator, isBoolean, isFunction, isObject, isReference, isRootKey, isSchema, isString, isUndefined, isUrl, jsDoc, log, logError, mergeDeep, openApiConverter, pascal, removeFilesAndEmptyFolders, resolveRef, upath, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import chalk from "chalk";
-import fs$1 from "fs-extra";
+import fs from "fs-extra";
 import yaml from "js-yaml";
 import * as mock from "@orval/mock";
 import { DEFAULT_MOCK_OPTIONS, generateMockImports } from "@orval/mock";
@@ -17,14 +14,22 @@ import mcp from "@orval/mcp";
 import query from "@orval/query";
 import swr from "@orval/swr";
 import zod from "@orval/zod";
+import { ExecaError, execa } from "execa";
+import { unique } from "remeda";
+import { parseArgsStringToArgv } from "string-argv";
 import https from "node:https";
 import enquirer from "enquirer";
 import { findUp } from "find-up";
 import { parse } from "tsconfck";
-import { ExecaError, execa } from "execa";
-import { unique } from "remeda";
-import { parseArgsStringToArgv } from "string-argv";
+import fs$1 from "node:fs";
+import { createJiti } from "jiti";
+
+//#region package.json
+var name = "orval";
+var description = "A swagger client generator for typescript";
+var version = "8.0.0-rc.2";
 
+//#endregion
 //#region src/client.ts
 const DEFAULT_CLIENT = OutputClient.AXIOS;
 const getGeneratorClient = (outputClient, output) => {
@@ -347,7 +352,7 @@ const getAllSchemas = (spec, specKey) => {
 
 //#endregion
 //#region src/import-specs.ts
-const resolveSpecs = async (path$1, { validate,...options }, _isUrl, isOnlySchema) => {
+const resolveSpecs = async (path$1, { validate, ...options }, _isUrl, isOnlySchema) => {
 	try {
 		if (validate) try {
 			await SwaggerParser.validate(path$1, options);
@@ -359,7 +364,7 @@ const resolveSpecs = async (path$1, { validate,...options }, _isUrl, isOnlySchem
 		if (_isUrl) return data;
 		return Object.fromEntries(Object.entries(data).sort().map(([key, value]) => [isUrl(key) ? key : upath.resolve(key), value]));
 	} catch {
-		const file = await fs$1.readFile(path$1, "utf8");
+		const file = await fs.readFile(path$1, "utf8");
 		return { [path$1]: yaml.load(file) };
 	}
 };
@@ -383,10 +388,26 @@ const importSpecs = async (workspace, options) => {
 };
 
 //#endregion
-//#region package.json
-var name = "orval";
-var description = "A swagger client generator for typescript";
-var version = "8.0.0-rc.1";
+//#region src/utils/execute-hook.ts
+const executeHook = async (name$1, commands = [], args = []) => {
+	log(chalk.white(`Running ${name$1} hook...`));
+	for (const command of commands) try {
+		if (isString(command)) await executeCommand(command, args);
+		else if (isFunction(command)) await command(args);
+		else if (isObject(command)) await executeObjectCommand(command, args);
+	} catch (error) {
+		logError(error, `Failed to run ${name$1} hook`);
+	}
+};
+async function executeCommand(command, args) {
+	const [cmd, ..._args] = [...parseArgsStringToArgv(command), ...args];
+	await execa(cmd, _args);
+}
+async function executeObjectCommand(command, args) {
+	if (command.injectGeneratedDirsAndFiles === false) args = [];
+	if (isString(command.command)) await executeCommand(command.command, args);
+	else if (isFunction(command.command)) await command.command();
+}
 
 //#endregion
 //#region src/utils/request.ts
@@ -439,7 +460,7 @@ const getGithubSpecReq = ({ accessToken, repo, owner, branch, path: path$1 }) =>
 let githubToken = null;
 const getGithubAcessToken = async (githubTokenPath) => {
 	if (githubToken) return githubToken;
-	if (await fs$1.pathExists(githubTokenPath)) return fs$1.readFile(githubTokenPath, "utf8");
+	if (await fs.pathExists(githubTokenPath)) return fs.readFile(githubTokenPath, "utf8");
 	else {
 		const answers = await enquirer.prompt([{
 			type: "input",
@@ -451,7 +472,7 @@ const getGithubAcessToken = async (githubTokenPath) => {
 			message: "Would you like to store your token for the next time? (stored in your node_modules)"
 		}]);
 		githubToken = answers.githubToken;
-		if (answers.saveToken) await fs$1.outputFile(githubTokenPath, answers.githubToken);
+		if (answers.saveToken) await fs.outputFile(githubTokenPath, answers.githubToken);
 		return answers.githubToken;
 	}
 };
@@ -475,7 +496,7 @@ const getGithubOpenApi = async (url) => {
 					type: "confirm",
 					name: "removeToken",
 					message: "Your token doesn't have the correct permissions, should we remove it?"
-				}])).removeToken) await fs$1.unlink(githubTokenPath);
+				}])).removeToken) await fs.unlink(githubTokenPath);
 			}
 		}
 		return body.data?.repository?.object.text;
@@ -486,7 +507,7 @@ const getGithubOpenApi = async (url) => {
 				type: "confirm",
 				name: "removeToken",
 				message: "Your token doesn't have the correct permissions, should we remove it?"
-			}])).removeToken) await fs$1.unlink(githubTokenPath);
+			}])).removeToken) await fs.unlink(githubTokenPath);
 		}
 		throw new Error(error.body.message || `Oups... 🍻. ${error}`);
 	}
@@ -518,7 +539,7 @@ const loadPackageJson = async (packageJson, workspace = process.cwd()) => {
 		return;
 	}
 	const normalizedPath = normalizePath(packageJson, workspace);
-	if (fs$1.existsSync(normalizedPath)) {
+	if (fs.existsSync(normalizedPath)) {
 		const pkg = await dynamicImport(normalizedPath);
 		if (isPackageJson(pkg)) return await maybeReplaceCatalog(pkg, workspace);
 		else throw new Error(`Invalid package.json file: ${normalizedPath}`);
@@ -536,7 +557,7 @@ const maybeReplaceCatalog = async (pkg, workspace) => {
 		log(`⚠️  ${chalk.yellow("package.json contains pnpm catalog: in dependencies, but no pnpm-workspace.yaml was found.")}`);
 		return pkg;
 	}
-	const file = await fs$1.readFile(filePath, "utf8");
+	const file = await fs.readFile(filePath, "utf8");
 	const pnpmWorkspaceFile = yaml.load(file);
 	performSubstitution(pkg.dependencies, pnpmWorkspaceFile);
 	performSubstitution(pkg.devDependencies, pnpmWorkspaceFile);
@@ -582,7 +603,7 @@ const loadTsconfig = async (tsconfig, workspace = process.cwd()) => {
 	}
 	if (isString(tsconfig)) {
 		const normalizedPath = normalizePath(tsconfig, workspace);
-		if (fs$1.existsSync(normalizedPath)) {
+		if (fs.existsSync(normalizedPath)) {
 			const config = await parse(normalizedPath);
 			return config.referenced?.find(({ tsconfigFile }) => tsconfigFile === normalizedPath)?.tsconfig || config.tsconfig;
 		}
@@ -813,7 +834,7 @@ const normalizePath = (path$1, workspace) => {
 	return upath.resolve(workspace, path$1);
 };
 const normalizeOperationsAndTags = (operationsOrTags, workspace, global) => {
-	return Object.fromEntries(Object.entries(operationsOrTags).map(([key, { transformer, mutator, formData, formUrlEncoded, paramsSerializer, query: query$1, zod: zod$1,...rest }]) => {
+	return Object.fromEntries(Object.entries(operationsOrTags).map(([key, { transformer, mutator, formData, formUrlEncoded, paramsSerializer, query: query$1, zod: zod$1, ...rest }]) => {
 		return [key, {
 			...rest,
 			...query$1 ? { query: normalizeQueryOptions(query$1, workspace, global.query) } : {},
@@ -943,45 +964,37 @@ const getDefaultFilesHeader = ({ title, description: description$1, version: ver
 
 //#endregion
 //#region src/utils/watcher.ts
-const startWatcher = async (watchOptions, watchFn, defaultTarget = ".") => {
+/**
+* Start a file watcher and invoke an async callback on file changes.
+*
+* If `watchOptions` is falsy the watcher is not started. Supported shapes:
+*  - boolean: when true the `defaultTarget` is watched
+*  - string: a single path to watch
+*  - string[]: an array of paths to watch
+*
+* @param watchOptions - false to disable watching, or a path/paths to watch
+* @param watchFn - async callback executed on change events
+* @param defaultTarget - path(s) to watch when `watchOptions` is `true` (default: '.')
+* @returns Resolves once the watcher has been started (or immediately if disabled)
+*
+* @example
+* await startWatcher(true, async () => { await buildProject(); }, 'src');
+*/
+async function startWatcher(watchOptions, watchFn, defaultTarget = ".") {
 	if (!watchOptions) return;
 	const { watch } = await import("chokidar");
 	const ignored = ["**/{.git,node_modules}/**"];
-	const watchPaths = typeof watchOptions === "boolean" ? defaultTarget : Array.isArray(watchOptions) ? watchOptions.filter((path$1) => typeof path$1 === "string") : watchOptions;
+	const watchPaths = typeof watchOptions === "boolean" ? defaultTarget : watchOptions;
 	log(`Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => "\"" + v + "\"").join(" | ") : "\"" + watchPaths + "\""}`);
 	watch(watchPaths, {
 		ignorePermissionErrors: true,
 		ignored
-	}).on("all", async (type, file) => {
+	}).on("all", (type, file) => {
 		log(`Change detected: ${type} ${file}`);
-		try {
-			await watchFn();
-		} catch (error) {
+		watchFn().catch((error) => {
 			logError(error);
-		}
+		});
 	});
-};
-
-//#endregion
-//#region src/utils/execute-hook.ts
-const executeHook = async (name$1, commands = [], args = []) => {
-	log(chalk.white(`Running ${name$1} hook...`));
-	for (const command of commands) try {
-		if (isString(command)) await executeCommand(command, args);
-		else if (isFunction(command)) await command(args);
-		else if (isObject(command)) await executeObjectCommand(command, args);
-	} catch (error) {
-		logError(error, `Failed to run ${name$1} hook`);
-	}
-};
-async function executeCommand(command, args) {
-	const [cmd, ..._args] = [...parseArgsStringToArgv(command), ...args];
-	await execa(cmd, _args);
-}
-async function executeObjectCommand(command, args) {
-	if (command.injectGeneratedDirsAndFiles === false) args = [];
-	if (isString(command.command)) await executeCommand(command.command, args);
-	else if (isFunction(command.command)) await command.command();
 }
 
 //#endregion
@@ -1040,16 +1053,16 @@ const writeSpecs = async (builder, workspace, options, projectName) => {
 		if (output.schemas) imports.push(upath.relativeSafe(workspacePath, getFileInfo(output.schemas).dirname));
 		if (output.indexFiles) {
 			const indexFile = upath.join(workspacePath, "/index.ts");
-			if (await fs$1.pathExists(indexFile)) {
-				const data = await fs$1.readFile(indexFile, "utf8");
+			if (await fs.pathExists(indexFile)) {
+				const data = await fs.readFile(indexFile, "utf8");
 				const importsNotDeclared = imports.filter((imp) => !data.includes(imp));
-				await fs$1.appendFile(indexFile, unique(importsNotDeclared).map((imp) => `export * from '${imp}';\n`).join(""));
-			} else await fs$1.outputFile(indexFile, unique(imports).map((imp) => `export * from '${imp}';`).join("\n") + "\n");
+				await fs.appendFile(indexFile, unique(importsNotDeclared).map((imp) => `export * from '${imp}';\n`).join(""));
+			} else await fs.outputFile(indexFile, unique(imports).map((imp) => `export * from '${imp}';`).join("\n") + "\n");
 			implementationPaths = [indexFile, ...implementationPaths];
 		}
 	}
 	if (builder.extraFiles.length > 0) {
-		await Promise.all(builder.extraFiles.map(async (file) => fs$1.outputFile(file.path, file.content)));
+		await Promise.all(builder.extraFiles.map(async (file) => fs.outputFile(file.path, file.content)));
 		implementationPaths = [...implementationPaths, ...builder.extraFiles.map((file) => file.path)];
 	}
 	const paths = [...output.schemas ? [getFileInfo(output.schemas).dirname] : [], ...implementationPaths];
@@ -1109,8 +1122,19 @@ const getWriteMode = (mode) => {
 };
 
 //#endregion
-//#region src/generate.ts
-const generateSpec = async (workspace, options, projectName) => {
+//#region src/generate-spec.ts
+/**
+* Generate client/spec files for a single Orval project.
+*
+* @param workspace - Absolute or relative workspace path used to resolve imports.
+* @param options - Normalized generation options for this project.
+* @param projectName - Optional project name used in logging output.
+* @returns A promise that resolves once generation (and optional cleaning) completes.
+*
+* @example
+* await generateSpec(process.cwd(), normalizedOptions, 'my-project');
+*/
+async function generateSpec(workspace, options, projectName) {
 	if (options.output.clean) {
 		const extraPatterns = Array.isArray(options.output.clean) ? options.output.clean : [];
 		if (options.output.target) await removeFilesAndEmptyFolders([
@@ -1123,44 +1147,35 @@ const generateSpec = async (workspace, options, projectName) => {
 			"!**/*.d.ts",
 			...extraPatterns
 		], getFileInfo(options.output.schemas).dirname);
-		log(`${projectName ? `${projectName}: ` : ""}Cleaning output folder`);
+		log(`${projectName} Cleaning output folder`);
 	}
 	await writeSpecs(await importSpecs(workspace, options), workspace, options, projectName);
-};
-const generateSpecs = async (config, workspace, projectName) => {
-	if (projectName) {
-		const options = config[projectName];
-		if (options) try {
-			await generateSpec(workspace, options, projectName);
-		} catch (error) {
-			throw new ErrorWithTag(error instanceof Error ? error.message : "unknown error", projectName, { cause: error });
-		}
-		else throw new Error("Project not found");
-		return;
-	}
-	let hasErrors;
-	for (const [projectName$1, options] of Object.entries(config)) {
-		if (!options) {
-			hasErrors = true;
-			logError("No options found", projectName$1);
-			continue;
-		}
-		try {
-			await generateSpec(workspace, options, projectName$1);
-		} catch (error) {
-			hasErrors = true;
-			logError(error, projectName$1);
-		}
-	}
-	if (hasErrors) throw new Error("One or more project failed, see above for details");
-};
+}
+
+//#endregion
+//#region src/utils/config.ts
+/**
+* Resolve the Orval config file path.
+*
+* @param configFilePath - Optional path to the config file (absolute or relative).
+* @returns The absolute path to the resolved config file.
+* @throws If a provided path does not exist or if no config file is found.
+*
+* @example
+* // explicit path
+* const p = findConfigFile('./orval.config.ts');
+*
+* @example
+* // automatic discovery (searches process.cwd())
+* const p = findConfigFile();
+*/
 function findConfigFile(configFilePath) {
 	if (configFilePath) {
-		const absolutePath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process$1.cwd(), configFilePath);
-		if (!fs.existsSync(absolutePath)) throw new Error(`Config file ${configFilePath} does not exist`);
+		const absolutePath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(process.cwd(), configFilePath);
+		if (!fs$1.existsSync(absolutePath)) throw new Error(`Config file ${configFilePath} does not exist`);
 		return absolutePath;
 	}
-	const root = process$1.cwd();
+	const root = process.cwd();
 	for (const ext of [
 		".ts",
 		".js",
@@ -1168,34 +1183,26 @@ function findConfigFile(configFilePath) {
 		".mts"
 	]) {
 		const fullPath = path.resolve(root, `orval.config${ext}`);
-		if (fs.existsSync(fullPath)) return fullPath;
+		if (fs$1.existsSync(fullPath)) return fullPath;
 	}
 	throw new Error(`No config file found in ${root}`);
 }
+/**
+* Load an Orval config file
+* @param configFilePath - Path to the config file (absolute or relative).
+* @returns The resolved Orval `Config` object.
+* @throws If the module does not provide a default export or the default export resolves to `undefined`.
+*
+* @example
+* // load a config object
+* const cfg = await loadConfigFile('./orval.config.ts');
+*/
 async function loadConfigFile(configFilePath) {
-	const module = await createJiti(import.meta.url, { interopDefault: true }).import(configFilePath, { default: true });
-	if (module === void 0) throw new Error(`${configFilePath} doesn't have a default export`);
-	return await Promise.resolve(module);
+	const configExternal = await createJiti(process.cwd(), { interopDefault: true }).import(configFilePath, { default: true });
+	if (configExternal === void 0) throw new Error(`${configFilePath} doesn't have a default export`);
+	return await (isFunction(configExternal) ? configExternal() : configExternal);
 }
-const generateConfig = async (configFile, options) => {
-	const configFilePath = findConfigFile(configFile);
-	let configExternal;
-	try {
-		configExternal = await loadConfigFile(configFilePath);
-	} catch (error) {
-		const errorMsg = error instanceof Error ? error.message : "unknown error";
-		throw new Error(`failed to load from ${configFilePath} => ${errorMsg}`);
-	}
-	const workspace = path.dirname(configFilePath);
-	const config = await (isFunction(configExternal) ? configExternal() : configExternal);
-	const normalizedConfig = await asyncReduce(Object.entries(config), async (acc, [key, value]) => {
-		acc[key] = await normalizeOptions(value, workspace, options);
-		return acc;
-	}, {});
-	const fileToWatch = Object.entries(normalizedConfig).filter(([project]) => options?.projectName === void 0 || project === options.projectName).map(([, options$1]) => options$1?.input.target).filter((target) => isString(target));
-	await (options?.watch && fileToWatch.length > 0 ? startWatcher(options.watch, () => generateSpecs(normalizedConfig, workspace, options.projectName), fileToWatch) : generateSpecs(normalizedConfig, workspace, options?.projectName));
-};
 
 //#endregion
-export { normalizeOptions as a, version as c, defineConfig as i, generateSpec as n, description as o, startWatcher as r, name as s, generateConfig as t };
-//# sourceMappingURL=generate-6oT76j_W.js.map
+export { defineConfig as a, name as c, startWatcher as i, version as l, loadConfigFile as n, normalizeOptions as o, generateSpec as r, description as s, findConfigFile as t };
+//# sourceMappingURL=config-BH1mpZT1.mjs.map