orval 8.6.2 → 8.7.0

package/README.md

@@ -3,7 +3,7 @@
 [![tests](https://github.com/orval-labs/orval/actions/workflows/tests.yaml/badge.svg)](https://github.com/orval-labs/orval/actions/workflows/tests.yaml)
 
 <p align="center">
-  <img src="./logo/orval-logo-horizontal.svg?raw=true" width="500" height="160" alt="orval - Restfull Client Generator" />
+  <img src="https://raw.githubusercontent.com/orval-labs/orval/master/logo/orval-logo-horizontal.svg" width="500" height="160" alt="orval - Restfull Client Generator" />
 </p>
 <h1 align="center">
   Visit <a href="https://orval.dev" target="_blank">orval.dev</a> for docs, guides, API and beer!

package/dist/bin/orval.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { c as description, i as startWatcher, l as name, n as loadConfigFile, r as generateSpec, s as normalizeOptions, t as findConfigFile, u as version } from "../config-CPV4lUaV.mjs";
+import { c as description, i as startWatcher, l as name, n as loadConfigFile, r as generateSpec, s as normalizeOptions, t as findConfigFile, u as version } from "../config-CO914zjc.mjs";
 import path from "node:path";
 import { Option, program } from "@commander-js/extra-typings";
-import { ErrorWithTag, OutputClient, OutputMode, isString, log, logError, setVerbose, startMessage } from "@orval/core";
+import { ErrorWithTag, OutputClient, OutputMode, SupportedFormatter, getWarningCount, isString, log, logError, resetWarnings, setVerbose, startMessage } from "@orval/core";
 
 //#region src/bin/orval.ts
 const orvalMessage = startMessage({
@@ -11,8 +11,9 @@ const orvalMessage = startMessage({
 	description
 });
 const cli = program.name("orval").description("Instantly generate TypeScript clients from your OpenAPI specification").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 one or more projects 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").option("--verbose", "Enable verbose logging").action(async (options) => {
+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 one or more projects 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").addOption(new Option("--formatter <name>", "Format generated files (prettier, biome, oxfmt)").choices(Object.values(SupportedFormatter))).option("--tsconfig <path>", "path to your tsconfig file").option("--verbose", "Enable verbose logging").option("--fail-on-warnings", "Exit with error code 1 when warnings are emitted").action(async (options) => {
 	if (options.verbose) setVerbose(true);
+	resetWarnings();
 	log(orvalMessage);
 	if (isString(options.input) && isString(options.output)) {
 		const normalizedOptions = await normalizeOptions({
@@ -20,29 +21,33 @@ cli.addOption(new Option("-o, --output <path>", "output file destination").confl
 			output: {
 				target: options.output,
 				clean: options.clean,
-				prettier: options.prettier,
-				biome: options.biome,
+				formatter: options.formatter,
 				mock: options.mock,
 				client: options.client,
 				mode: options.mode,
 				tsconfig: options.tsconfig
 			}
 		});
+		try {
+			await generateSpec(process.cwd(), normalizedOptions);
+		} catch (error) {
+			if (error instanceof ErrorWithTag) logError(error.cause, error.tag);
+			else logError(error);
+			process.exit(1);
+		}
 		if (options.watch) await startWatcher(options.watch, async () => {
+			resetWarnings();
 			try {
 				await generateSpec(process.cwd(), normalizedOptions);
 			} catch (error) {
 				logError(error);
 				process.exit(1);
 			}
+			if (options.failOnWarnings && getWarningCount() > 0) {
+				logError(`Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`);
+				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);
@@ -56,20 +61,25 @@ cli.addOption(new Option("-o, --output <path>", "output file destination").confl
 		let hasErrors = false;
 		for (const [projectName, config] of configs) {
 			const normalizedOptions = await normalizeOptions(config, workspace, options);
-			if (options.watch === void 0) try {
+			try {
 				await generateSpec(workspace, normalizedOptions, projectName);
 			} catch (error) {
 				hasErrors = true;
 				logError(error, projectName);
 			}
-			else {
+			if (options.watch !== void 0) {
 				const fileToWatch = isString(normalizedOptions.input.target) ? normalizedOptions.input.target : void 0;
 				await startWatcher(options.watch, async () => {
+					resetWarnings();
 					try {
 						await generateSpec(workspace, normalizedOptions, projectName);
 					} catch (error) {
 						logError(error, projectName);
 					}
+					if (options.failOnWarnings && getWarningCount() > 0) {
+						logError(`Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`);
+						process.exit(1);
+					}
 				}, fileToWatch);
 			}
 		}
@@ -78,6 +88,10 @@ cli.addOption(new Option("-o, --output <path>", "output file destination").confl
 			process.exit(1);
 		}
 	}
+	if (options.failOnWarnings && getWarningCount() > 0) {
+		logError(`Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`);
+		process.exit(1);
+	}
 });
 await cli.parseAsync(process.argv);
 

package/dist/bin/orval.mjs.map

@@ -1 +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  setVerbose,\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(\n    'Instantly generate TypeScript clients from your OpenAPI specification',\n  )\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 one or more projects 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  .option('--verbose', 'Enable verbose logging')\n  .action(async (options) => {\n    if (options.verbose) {\n      setVerbose(true);\n    }\n\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      const missingProjects = options.project?.filter(\n        (p) => !Object.hasOwn(configFile, p),\n      );\n\n      if (missingProjects?.length) {\n        logError(`Project not found in config: ${missingProjects.join(', ')}`);\n        process.exit(1);\n      }\n\n      const configs = Object.entries(configFile).filter(\n        ([projectName]) =>\n          // only filter by project if specified\n          !Array.isArray(options.project) ||\n          options.project.includes(projectName),\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        process.exit(1);\n      }\n    }\n  });\n\nawait cli.parseAsync(process.argv);\n"],"mappings":";;;;;;;AAqBA,MAAM,eAAe,aAAa;CAC1BA;CACGC;CACIC;CACd,CAAC;AACF,MAAM,MAAM,QACT,KAAK,QAAQ,CACb,YACC,wEACD,CACA,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,2BACA,2CACD,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,aAAa,yBAAyB,CAC7C,OAAO,OAAO,YAAY;AACzB,KAAI,QAAQ,QACV,YAAW,KAAK;AAGlB,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;EAEvD,MAAM,kBAAkB,QAAQ,SAAS,QACtC,MAAM,CAAC,OAAO,OAAO,YAAY,EAAE,CACrC;AAED,MAAI,iBAAiB,QAAQ;AAC3B,YAAS,gCAAgC,gBAAgB,KAAK,KAAK,GAAG;AACtE,WAAQ,KAAK,EAAE;;EAGjB,MAAM,UAAU,OAAO,QAAQ,WAAW,CAAC,QACxC,CAAC,iBAEA,CAAC,MAAM,QAAQ,QAAQ,QAAQ,IAC/B,QAAQ,QAAQ,SAAS,YAAY,CACxC;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,WAAW;AACb,YAAS,oDAAoD;AAC7D,WAAQ,KAAK,EAAE;;;EAGnB;AAEJ,MAAM,IAAI,WAAW,QAAQ,KAAK"}
+{"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  getWarningCount,\n  isString,\n  log,\n  logError,\n  OutputClient,\n  OutputMode,\n  resetWarnings,\n  setVerbose,\n  startMessage,\n  SupportedFormatter,\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(\n    'Instantly generate TypeScript clients from your OpenAPI specification',\n  )\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 one or more projects 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  .addOption(\n    new Option(\n      '--formatter <name>',\n      'Format generated files (prettier, biome, oxfmt)',\n    ).choices(Object.values(SupportedFormatter)),\n  )\n  .option('--tsconfig <path>', 'path to your tsconfig file')\n  .option('--verbose', 'Enable verbose logging')\n  .option(\n    '--fail-on-warnings',\n    'Exit with error code 1 when warnings are emitted',\n  )\n  .action(async (options) => {\n    if (options.verbose) {\n      setVerbose(true);\n    }\n\n    resetWarnings();\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          formatter: options.formatter,\n          mock: options.mock,\n          client: options.client,\n          mode: options.mode,\n          tsconfig: options.tsconfig,\n        },\n      });\n\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      if (options.watch) {\n        await startWatcher(\n          options.watch,\n          async () => {\n            resetWarnings();\n            try {\n              await generateSpec(process.cwd(), normalizedOptions);\n            } catch (error) {\n              logError(error);\n              process.exit(1);\n            }\n            if (options.failOnWarnings && getWarningCount() > 0) {\n              logError(\n                `Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`,\n              );\n              process.exit(1);\n            }\n          },\n          normalizedOptions.input.target as string,\n        );\n      }\n    } else {\n      const configFilePath = findConfigFile(options.config);\n      const workspace = path.dirname(configFilePath);\n      const configFile = await loadConfigFile(configFilePath);\n\n      const missingProjects = options.project?.filter(\n        (p) => !Object.hasOwn(configFile, p),\n      );\n\n      if (missingProjects?.length) {\n        logError(`Project not found in config: ${missingProjects.join(', ')}`);\n        process.exit(1);\n      }\n\n      const configs = Object.entries(configFile).filter(\n        ([projectName]) =>\n          // only filter by project if specified\n          !Array.isArray(options.project) ||\n          options.project.includes(projectName),\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        try {\n          await generateSpec(workspace, normalizedOptions, projectName);\n        } catch (error) {\n          hasErrors = true;\n          logError(error, projectName);\n        }\n\n        if (options.watch !== undefined) {\n          const fileToWatch = isString(normalizedOptions.input.target)\n            ? normalizedOptions.input.target\n            : undefined;\n\n          await startWatcher(\n            options.watch,\n            async () => {\n              resetWarnings();\n              try {\n                await generateSpec(workspace, normalizedOptions, projectName);\n              } catch (error) {\n                logError(error, projectName);\n              }\n              if (options.failOnWarnings && getWarningCount() > 0) {\n                logError(\n                  `Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`,\n                );\n                process.exit(1);\n              }\n            },\n            fileToWatch,\n          );\n        }\n      }\n\n      if (hasErrors) {\n        logError('One or more project failed, see above for details');\n        process.exit(1);\n      }\n    }\n\n    if (options.failOnWarnings && getWarningCount() > 0) {\n      logError(\n        `Process exited with ${getWarningCount()} warning(s) due to --fail-on-warnings flag`,\n      );\n      process.exit(1);\n    }\n  });\n\nawait cli.parseAsync(process.argv);\n"],"mappings":";;;;;;;AAwBA,MAAM,eAAe,aAAa;CAC1BA;CACGC;CACIC;CACd,CAAC;AACF,MAAM,MAAM,QACT,KAAK,QAAQ,CACb,YACC,wEACD,CACA,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,2BACA,2CACD,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,UACC,IAAI,OACF,sBACA,kDACD,CAAC,QAAQ,OAAO,OAAO,mBAAmB,CAAC,CAC7C,CACA,OAAO,qBAAqB,6BAA6B,CACzD,OAAO,aAAa,yBAAyB,CAC7C,OACC,sBACA,mDACD,CACA,OAAO,OAAO,YAAY;AACzB,KAAI,QAAQ,QACV,YAAW,KAAK;AAGlB,gBAAe;AACf,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,WAAW,QAAQ;IACnB,MAAM,QAAQ;IACd,QAAQ,QAAQ;IAChB,MAAM,QAAQ;IACd,UAAU,QAAQ;IACnB;GACF,CAAC;AAEF,MAAI;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;;AAGjB,MAAI,QAAQ,MACV,OAAM,aACJ,QAAQ,OACR,YAAY;AACV,kBAAe;AACf,OAAI;AACF,UAAM,aAAa,QAAQ,KAAK,EAAE,kBAAkB;YAC7C,OAAO;AACd,aAAS,MAAM;AACf,YAAQ,KAAK,EAAE;;AAEjB,OAAI,QAAQ,kBAAkB,iBAAiB,GAAG,GAAG;AACnD,aACE,uBAAuB,iBAAiB,CAAC,4CAC1C;AACD,YAAQ,KAAK,EAAE;;KAGnB,kBAAkB,MAAM,OACzB;QAEE;EACL,MAAM,iBAAiB,eAAe,QAAQ,OAAO;EACrD,MAAM,YAAY,KAAK,QAAQ,eAAe;EAC9C,MAAM,aAAa,MAAM,eAAe,eAAe;EAEvD,MAAM,kBAAkB,QAAQ,SAAS,QACtC,MAAM,CAAC,OAAO,OAAO,YAAY,EAAE,CACrC;AAED,MAAI,iBAAiB,QAAQ;AAC3B,YAAS,gCAAgC,gBAAgB,KAAK,KAAK,GAAG;AACtE,WAAQ,KAAK,EAAE;;EAGjB,MAAM,UAAU,OAAO,QAAQ,WAAW,CAAC,QACxC,CAAC,iBAEA,CAAC,MAAM,QAAQ,QAAQ,QAAQ,IAC/B,QAAQ,QAAQ,SAAS,YAAY,CACxC;EAED,IAAI,YAAY;AAChB,OAAK,MAAM,CAAC,aAAa,WAAW,SAAS;GAC3C,MAAM,oBAAoB,MAAM,iBAC9B,QACA,WACA,QACD;AAED,OAAI;AACF,UAAM,aAAa,WAAW,mBAAmB,YAAY;YACtD,OAAO;AACd,gBAAY;AACZ,aAAS,OAAO,YAAY;;AAG9B,OAAI,QAAQ,UAAU,QAAW;IAC/B,MAAM,cAAc,SAAS,kBAAkB,MAAM,OAAO,GACxD,kBAAkB,MAAM,SACxB;AAEJ,UAAM,aACJ,QAAQ,OACR,YAAY;AACV,oBAAe;AACf,SAAI;AACF,YAAM,aAAa,WAAW,mBAAmB,YAAY;cACtD,OAAO;AACd,eAAS,OAAO,YAAY;;AAE9B,SAAI,QAAQ,kBAAkB,iBAAiB,GAAG,GAAG;AACnD,eACE,uBAAuB,iBAAiB,CAAC,4CAC1C;AACD,cAAQ,KAAK,EAAE;;OAGnB,YACD;;;AAIL,MAAI,WAAW;AACb,YAAS,oDAAoD;AAC7D,WAAQ,KAAK,EAAE;;;AAInB,KAAI,QAAQ,kBAAkB,iBAAiB,GAAG,GAAG;AACnD,WACE,uBAAuB,iBAAiB,CAAC,4CAC1C;AACD,UAAQ,KAAK,EAAE;;EAEjB;AAEJ,MAAM,IAAI,WAAW,QAAQ,KAAK"}

package/dist/{config-CPV4lUaV.mjs → config-CO914zjc.mjs}

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMode, PropertySortOrder, RefComponentSuffix, asyncReduce, conventionName, createLogger, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getFileInfo, getFullRoute, getMockFileExtensionByTypeName, getRoute, isBoolean, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, log, logError, logVerbose, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, splitSchemasByType, upath, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
+import { FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMode, PropertySortOrder, RefComponentSuffix, SupportedFormatter, asyncReduce, conventionName, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getBaseUrlRuntimeImports, getFileInfo, getFullRoute, getMockFileExtensionByTypeName, getRoute, isBoolean, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, log, logError, logVerbose, logWarning, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, splitSchemasByType, upath, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
 import { bundle } from "@scalar/json-magic/bundle";
 import { fetchUrls, parseJson, parseYaml, readFiles } from "@scalar/json-magic/bundle/plugins/node";
 import { upgrade, validate } from "@scalar/openapi-parser";
@@ -15,10 +15,10 @@ import query from "@orval/query";
 import solidStart from "@orval/solid-start";
 import swr from "@orval/swr";
 import zod, { dereference, generateZodValidationSchemaDefinition, isZodVersionV4, parseZodValidationSchemaDefinition } from "@orval/zod";
-import { styleText } from "node:util";
 import { ExecaError, execa } from "execa";
 import fs from "fs-extra";
 import fs$1, { access } from "node:fs/promises";
+import { styleText } from "node:util";
 import { parseArgsStringToArgv } from "string-argv";
 import { findUp, findUpMultiple } from "find-up";
 import yaml from "js-yaml";
@@ -29,7 +29,7 @@ import { createJiti } from "jiti";
 //#region package.json
 var name = "orval";
 var description = "A swagger client generator for typescript";
-var version = "8.6.2";
+var version = "8.7.0";
 
 //#endregion
 //#region src/client.ts
@@ -103,7 +103,7 @@ const generateClientFooter = ({ outputClient, operationNames, hasMutator, hasAwa
 	try {
 		if (isFunction(outputClient)) {
 			implementation = footer(operationNames);
-			console.warn("[WARN] Passing an array of strings for operations names to the footer function is deprecated and will be removed in a future major release. Please pass them in an object instead: { operationNames: string[] }.");
+			logWarning("⚠️  Passing an array of strings for operations names to the footer function is deprecated and will be removed in a future major release. Please pass them in an object instead: { operationNames: string[] }.");
 		} else implementation = footer({
 			operationNames,
 			title: titles.implementation,
@@ -154,6 +154,7 @@ const generateMock = (verbOption, options) => {
 	return mock.generateMock(verbOption, options);
 };
 const generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options, output) => {
+	const baseUrlImports = getBaseUrlRuntimeImports(output.baseUrl);
 	return asyncReduce(verbsOptions, async (acc, verbOption) => {
 		const { client: generatorClient } = getGeneratorClient(outputClient, output);
 		const client = await generatorClient(verbOption, options, outputClient, output);
@@ -170,7 +171,7 @@ const generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options
 		}
 		acc[operationKey] = {
 			implementation: hasImplementation ? verbOption.doc + client.implementation : client.implementation,
-			imports: client.imports,
+			imports: [...baseUrlImports, ...client.imports],
 			implementationMock: generatedMock.implementation,
 			importsMock: generatedMock.imports,
 			tags: verbOption.tags,
@@ -521,8 +522,8 @@ async function formatWithPrettier(paths, projectTitle) {
 				await fs$1.writeFile(filePath, formatted);
 			} catch (error) {
 				if (isMissingFileError(error)) return;
-				if (error instanceof Error) if (error.name === "UndefinedParserError") {} else log(styleText("yellow", `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Failed to format file ${filePath}: ${error.toString()}`));
-				else log(styleText("yellow", `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Failed to format file ${filePath}: unknown error}`));
+				if (error instanceof Error) if (error.name === "UndefinedParserError") {} else logWarning(`⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Failed to format file ${filePath}: ${error.toString()}`);
+				else logWarning(`⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Failed to format file ${filePath}: unknown error`);
 			}
 		}));
 		return;
@@ -530,7 +531,7 @@ async function formatWithPrettier(paths, projectTitle) {
 	try {
 		await execa("prettier", ["--write", ...paths]);
 	} catch {
-		log(styleText("yellow", `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}prettier not found. Install it as a project dependency or globally.`));
+		logWarning(`⚠️  ${projectTitle ? `${projectTitle} - ` : ""}prettier not found. Install it as a project dependency or globally.`);
 	}
 }
 function isMissingFileError(error) {
@@ -674,7 +675,7 @@ const maybeReplaceCatalog = async (pkg, workspace) => {
 	if (!hasCatalogReferences(pkg)) return pkg;
 	const catalogData = await loadPnpmWorkspaceCatalog(workspace) ?? await loadPackageJsonCatalog(workspace) ?? await loadYarnrcCatalog(workspace);
 	if (!catalogData) {
-		log(`⚠️  ${styleText("yellow", "package.json contains catalog: references, but no catalog source was found (checked: pnpm-workspace.yaml, package.json, .yarnrc.yml).")}`);
+		logWarning("⚠️  package.json contains catalog: references, but no catalog source was found (checked: pnpm-workspace.yaml, package.json, .yarnrc.yml).");
 		return pkg;
 	}
 	performSubstitution(pkg.dependencies, catalogData);
@@ -686,12 +687,12 @@ const performSubstitution = (dependencies, catalogData) => {
 	if (!dependencies) return;
 	for (const [packageName, version] of Object.entries(dependencies)) if (version === "catalog:" || version === "catalog:default") {
 		if (!catalogData.catalog) {
-			log(`⚠️  ${styleText("yellow", `catalog: substitution for the package '${packageName}' failed as there is no default catalog.`)}`);
+			logWarning(`⚠️  catalog: substitution for the package '${packageName}' failed as there is no default catalog.`);
 			continue;
 		}
 		const sub = catalogData.catalog[packageName];
 		if (!sub) {
-			log(`⚠️  ${styleText("yellow", `catalog: substitution for the package '${packageName}' failed as there is no matching package in the default catalog.`)}`);
+			logWarning(`⚠️  catalog: substitution for the package '${packageName}' failed as there is no matching package in the default catalog.`);
 			continue;
 		}
 		dependencies[packageName] = sub;
@@ -699,12 +700,12 @@ const performSubstitution = (dependencies, catalogData) => {
 		const catalogName = version.slice(8);
 		const catalog = catalogData.catalogs?.[catalogName];
 		if (!catalog) {
-			log(`⚠️  ${styleText("yellow", `'${version}' substitution for the package '${packageName}' failed as there is no matching catalog named '${catalogName}'. (available named catalogs are: ${Object.keys(catalogData.catalogs ?? {}).join(", ")})`)}`);
+			logWarning(`⚠️  '${version}' substitution for the package '${packageName}' failed as there is no matching catalog named '${catalogName}'. (available named catalogs are: ${Object.keys(catalogData.catalogs ?? {}).join(", ")})`);
 			continue;
 		}
 		const sub = catalog[packageName];
 		if (!sub) {
-			log(`⚠️  ${styleText("yellow", `'${version}' substitution for the package '${packageName}' failed as there is no package in the catalog named '${catalogName}'. (packages in the catalog are: ${Object.keys(catalog).join(", ")})`)}`);
+			logWarning(`⚠️  '${version}' substitution for the package '${packageName}' failed as there is no package in the catalog named '${catalogName}'. (packages in the catalog are: ${Object.keys(catalog).join(", ")})`);
 			continue;
 		}
 		dependencies[packageName] = sub;
@@ -788,7 +789,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 	const inputOptions = isString(options.input) || Array.isArray(options.input) ? { target: options.input } : options.input;
 	const outputOptions = isString(options.output) ? { target: options.output } : options.output;
 	const outputWorkspace = normalizePath(outputOptions.workspace ?? "", workspace);
-	const { clean, prettier, client, httpClient, mode, biome } = globalOptions;
+	const { clean, client, httpClient, mode } = globalOptions;
 	const tsconfig = await loadTsconfig(outputOptions.tsconfig ?? globalOptions.tsconfig, workspace);
 	const packageJson = await loadPackageJson(outputOptions.packageJson ?? globalOptions.packageJson, workspace);
 	const mockOption = outputOptions.mock ?? globalOptions.mock;
@@ -831,8 +832,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 			mock,
 			clean: outputOptions.clean ?? clean ?? false,
 			docs: outputOptions.docs ?? false,
-			prettier: outputOptions.prettier ?? prettier ?? false,
-			biome: outputOptions.biome ?? biome ?? false,
+			formatter: outputOptions.formatter ?? globalOptions.formatter,
 			tsconfig,
 			packageJson,
 			headers: outputOptions.headers ?? false,
@@ -910,6 +910,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 						...outputOptions.override?.zod?.preprocess?.response ? { response: normalizeMutator(workspace, outputOptions.override.zod.preprocess.response) } : {}
 					},
 					generateEachHttpStatus: outputOptions.override?.zod?.generateEachHttpStatus ?? false,
+					useBrandedTypes: outputOptions.override?.zod?.useBrandedTypes ?? false,
 					dateTimeOptions: outputOptions.override?.zod?.dateTimeOptions ?? {},
 					timeOptions: outputOptions.override?.zod?.timeOptions ?? {}
 				},
@@ -927,6 +928,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 					includeHttpResponseReturnType: outputOptions.override?.fetch?.includeHttpResponseReturnType ?? true,
 					forceSuccessResponse: outputOptions.override?.fetch?.forceSuccessResponse ?? false,
 					runtimeValidation: outputOptions.override?.fetch?.runtimeValidation ?? false,
+					useRuntimeFetcher: outputOptions.override?.fetch?.useRuntimeFetcher ?? false,
 					...outputOptions.override?.fetch,
 					...outputOptions.override?.fetch?.jsonReviver ? { jsonReviver: normalizeMutator(outputWorkspace, outputOptions.override.fetch.jsonReviver) } : {}
 				},
@@ -935,6 +937,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 				enumGenerationType: outputOptions.override?.enumGenerationType ?? "const",
 				suppressReadonlyModifier: outputOptions.override?.suppressReadonlyModifier ?? false,
 				preserveReadonlyRequestBodies: outputOptions.override?.preserveReadonlyRequestBodies ?? "strip",
+				splitByContentType: outputOptions.override?.splitByContentType ?? false,
 				aliasCombinedTypes: outputOptions.override?.aliasCombinedTypes ?? false
 			},
 			allParamsOptional: outputOptions.allParamsOptional ?? false,
@@ -1067,6 +1070,7 @@ function normalizeOperationsAndTags(operationsOrTags, workspace, global) {
 					...zod.preprocess?.response ? { response: normalizeMutator(workspace, zod.preprocess.response) } : {}
 				},
 				generateEachHttpStatus: zod.generateEachHttpStatus ?? false,
+				useBrandedTypes: zod.useBrandedTypes ?? false,
 				dateTimeOptions: zod.dateTimeOptions ?? {},
 				timeOptions: zod.timeOptions ?? {}
 			} } : {},
@@ -1081,7 +1085,7 @@ function normalizeOperationsAndTags(operationsOrTags, workspace, global) {
 function normalizeOutputMode(mode) {
 	if (!mode) return OutputMode.SINGLE;
 	if (!Object.values(OutputMode).includes(mode)) {
-		createLogger().warn(styleText("yellow", `Unknown provided mode => ${mode}`));
+		logWarning(`⚠️  Unknown provided mode => ${mode}`);
 		return OutputMode.SINGLE;
 	}
 	return mode;
@@ -1107,10 +1111,12 @@ function normalizeJSDocOptions(jsdoc = {}) {
 	return { ...jsdoc };
 }
 function normalizeQueryOptions(queryOptions = {}, outputWorkspace, globalOptions = {}) {
-	if (queryOptions.options) console.warn("[WARN] Using query options is deprecated and will be removed in a future major release. Please use queryOptions or mutationOptions instead.");
+	if (queryOptions.options) logWarning("⚠️  Using query options is deprecated and will be removed in a future major release. Please use queryOptions or mutationOptions instead.");
 	return {
 		...isNullish(queryOptions.usePrefetch) ? {} : { usePrefetch: queryOptions.usePrefetch },
 		...isNullish(queryOptions.useInvalidate) ? {} : { useInvalidate: queryOptions.useInvalidate },
+		...isNullish(queryOptions.useSetQueryData) ? {} : { useSetQueryData: queryOptions.useSetQueryData },
+		...isNullish(queryOptions.useGetQueryData) ? {} : { useGetQueryData: queryOptions.useGetQueryData },
 		...isNullish(queryOptions.useQuery) ? {} : { useQuery: queryOptions.useQuery },
 		...isNullish(queryOptions.useSuspenseQuery) ? {} : { useSuspenseQuery: queryOptions.useSuspenseQuery },
 		...isNullish(queryOptions.useMutation) ? {} : { useMutation: queryOptions.useMutation },
@@ -1178,13 +1184,17 @@ async function startWatcher(watchOptions, watchFn, defaultTarget = ".") {
 	const ignored = ["**/{.git,node_modules}/**"];
 	const watchPaths = isBoolean(watchOptions) ? defaultTarget : watchOptions;
 	log(`Watching for changes in ${Array.isArray(watchPaths) ? watchPaths.map((v) => "\"" + v + "\"").join(" | ") : "\"" + watchPaths + "\""}`);
-	watch(watchPaths, {
+	const watcher = watch(watchPaths, {
 		ignorePermissionErrors: true,
 		ignored
-	}).on("all", (type, file) => {
-		log(`Change detected: ${type} ${file}`);
-		watchFn().catch((error) => {
-			logError(error);
+	});
+	watcher.on("ready", () => {
+		log("Initial scan complete. Watching for changes...");
+		watcher.on("all", (type, file) => {
+			log(`Change detected: ${type} ${file}`);
+			watchFn().catch((error) => {
+				logError(error);
+			});
 		});
 	});
 }
@@ -1228,7 +1238,7 @@ const groupSchemasByFilePath = (schemas) => {
 };
 async function writeZodSchemaIndex(schemasPath, fileExtension, header, schemaNames, namingConvention, shouldMergeExisting = false) {
 	const importFileExtension = fileExtension.replace(/\.ts$/, "");
-	const indexPath = path.join(schemasPath, `index${fileExtension}`);
+	const indexPath = path.join(schemasPath, `index.ts`);
 	let existingExports = "";
 	if (shouldMergeExisting && await fs.pathExists(indexPath)) {
 		const existingContent = await fs.readFile(indexPath, "utf8");
@@ -1243,6 +1253,31 @@ async function writeZodSchemaIndex(schemasPath, fileExtension, header, schemaNam
 	const uniqueExports = [...new Set(allExports.split("\n"))].filter((line) => line.trim()).toSorted().join("\n");
 	await fs.outputFile(indexPath, `${header}\n${uniqueExports}\n`);
 }
+function generateZodSchemasInline(builder, output) {
+	const schemasWithOpenApiDef = builder.schemas.filter((s) => s.schema);
+	if (schemasWithOpenApiDef.length === 0) return "";
+	const isZodV4 = !!output.packageJson && isZodVersionV4(output.packageJson);
+	const strict = output.override.zod.strict.body;
+	const coerce = output.override.zod.coerce.body;
+	const schemas = [];
+	for (const { name, schema: schemaObject } of schemasWithOpenApiDef) {
+		if (!schemaObject) continue;
+		const context = {
+			spec: builder.spec,
+			target: builder.target,
+			workspace: "",
+			output
+		};
+		const parsedZodDefinition = parseZodValidationSchemaDefinition(generateZodValidationSchemaDefinition(dereference(schemaObject, context), context, name, strict, isZodV4, { required: true }), context, coerce, strict, isZodV4);
+		schemas.push({
+			schemaName: name,
+			consts: parsedZodDefinition.consts,
+			zodExpression: parsedZodDefinition.zod
+		});
+	}
+	if (schemas.length === 0) return "";
+	return generateZodSchemaFileContent("", schemas);
+}
 async function writeZodSchemas(builder, schemasPath, fileExtension, header, output) {
 	const schemasWithOpenApiDef = builder.schemas.filter((s) => s.schema);
 	const schemasToWrite = [];
@@ -1342,6 +1377,34 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 
 //#endregion
 //#region src/write-specs.ts
+async function runExternalFormatter(bin, args, projectTitle) {
+	try {
+		await execa(bin, args);
+	} catch (error) {
+		let message;
+		if (error instanceof ExecaError) message = error.code === "ENOENT" ? `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}${bin} not found` : error.message;
+		else if (error instanceof Error) message = error.message;
+		else message = `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}${bin} failed`;
+		logWarning(message);
+	}
+}
+async function runFormatter(formatter, paths, projectTitle) {
+	switch (formatter) {
+		case SupportedFormatter.PRETTIER:
+			await formatWithPrettier(paths, projectTitle);
+			break;
+		case SupportedFormatter.BIOME:
+			await runExternalFormatter(SupportedFormatter.BIOME, [
+				"check",
+				"--write",
+				...paths
+			], projectTitle);
+			break;
+		case SupportedFormatter.OXFMT:
+			await runExternalFormatter(SupportedFormatter.OXFMT, paths, projectTitle);
+			break;
+	}
+}
 function getHeader(option, info) {
 	if (!option) return "";
 	const header = option(info);
@@ -1351,8 +1414,8 @@ function getHeader(option, info) {
 * Add re-export of operation schemas from the main schemas index file.
 * Handles the case where the index file doesn't exist (no regular schemas).
 */
-async function addOperationSchemasReExport(schemaPath, operationSchemasPath, fileExtension, header) {
-	const schemaIndexPath = path.join(schemaPath, `index${fileExtension}`);
+async function addOperationSchemasReExport(schemaPath, operationSchemasPath, header) {
+	const schemaIndexPath = path.join(schemaPath, `index.ts`);
 	const esmImportPath = upath.getRelativeImportPath(schemaIndexPath, operationSchemasPath);
 	const exportLine = `export * from '${esmImportPath}';\n`;
 	if (await fs.pathExists(schemaIndexPath)) {
@@ -1396,7 +1459,7 @@ async function writeSpecs(builder, workspace, options, projectName) {
 					header,
 					indexFiles: output.indexFiles
 				});
-				if (output.indexFiles) await addOperationSchemasReExport(schemaPath, output.operationSchemas, fileExtension, header);
+				if (output.indexFiles) await addOperationSchemasReExport(schemaPath, output.operationSchemas, header);
 			}
 		} else await writeSchemas({
 			schemaPath,
@@ -1434,7 +1497,7 @@ async function writeSpecs(builder, workspace, options, projectName) {
 					header,
 					indexFiles: output.indexFiles
 				});
-				if (output.indexFiles) await addOperationSchemasReExport(output.schemas.path, output.operationSchemas, fileExtension, header);
+				if (output.indexFiles) await addOperationSchemasReExport(output.schemas.path, output.operationSchemas, header);
 			}
 		} else await writeSchemas({
 			schemaPath: output.schemas.path,
@@ -1456,14 +1519,21 @@ async function writeSpecs(builder, workspace, options, projectName) {
 		});
 	}
 	let implementationPaths = [];
-	if (output.target) implementationPaths = await getWriteMode(output.mode)({
-		builder,
-		workspace,
-		output,
-		projectName,
-		header,
-		needSchema: !output.schemas && output.client !== "zod"
-	});
+	if (output.target) {
+		const writeMode = getWriteMode(output.mode);
+		const isZodClient = output.client === "zod";
+		const hasOperations = Object.keys(builder.operations).length > 0;
+		const needZodSchemasInline = isZodClient && !output.schemas && !hasOperations;
+		implementationPaths = await writeMode({
+			builder,
+			workspace,
+			output,
+			projectName,
+			header,
+			needSchema: !output.schemas && !isZodClient || needZodSchemasInline,
+			generateSchemasInline: needZodSchemasInline ? () => generateZodSchemasInline(builder, output) : void 0
+		});
+	}
 	if (output.workspace) {
 		const workspacePath = output.workspace;
 		const indexFile = path.join(workspacePath, "index.ts");
@@ -1492,18 +1562,7 @@ async function writeSpecs(builder, workspace, options, projectName) {
 		...implementationPaths
 	];
 	if (options.hooks.afterAllFilesWrite) await executeHook("afterAllFilesWrite", options.hooks.afterAllFilesWrite, paths);
-	if (output.prettier) await formatWithPrettier(paths, projectTitle);
-	if (output.biome) try {
-		await execa("biome", [
-			"check",
-			"--write",
-			...paths
-		]);
-	} catch (error) {
-		let message = `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}biome not found`;
-		if (error instanceof ExecaError && error.exitCode === 1) message = error.message;
-		log(styleText("yellow", message));
-	}
+	await runFormatter(output.formatter, paths, projectTitle);
 	if (output.docs) try {
 		let config = {};
 		let configPath;
@@ -1527,10 +1586,10 @@ async function writeSpecs(builder, workspace, options, projectName) {
 		if (project) {
 			const outputPath = app.options.getValue("out");
 			await app.generateDocs(project, outputPath);
-			if (output.prettier) await formatWithPrettier([outputPath], projectTitle);
+			await runFormatter(output.formatter, [outputPath], projectTitle);
 		} else throw new Error("TypeDoc not initialized");
 	} catch (error) {
-		log(styleText("yellow", error instanceof Error ? error.message : `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Unable to generate docs`));
+		logWarning(error instanceof Error ? error.message : `⚠️  ${projectTitle ? `${projectTitle} - ` : ""}Unable to generate docs`);
 	}
 	createSuccessMessage(projectTitle);
 }
@@ -1630,4 +1689,4 @@ async function loadConfigFile(configFilePath) {
 
 //#endregion
 export { defineConfig as a, description as c, startWatcher as i, name as l, loadConfigFile as n, defineTransformer as o, generateSpec as r, normalizeOptions as s, findConfigFile as t, version as u };
-//# sourceMappingURL=config-CPV4lUaV.mjs.map
+//# sourceMappingURL=config-CO914zjc.mjs.map