orval 8.14.0 → 8.16.0

package/dist/bin/orval.mjs

@@ -1,5 +1,5 @@
 #!/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-yIkhToq8.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-4RhXX__A.mjs";
 import path from "node:path";
 import { Option, program } from "@commander-js/extra-typings";
 import { ErrorWithTag, OutputClient, OutputMode, SupportedFormatter, getWarningCount, isString, log, logError, resetWarnings, setVerbose, startMessage } from "@orval/core";

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  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 mock generation (msw handlers + faker factories)')\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":"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"}
+{"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 mock generation (msw handlers + faker factories)')\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":"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"}

package/dist/{config-yIkhToq8.mjs → config-4RhXX__A.mjs}

@@ -1,11 +1,11 @@
 import path from "node:path";
-import { FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SupportedFormatter, asyncReduce, collectReferencedComponents, conventionName, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateMutator, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getBaseUrlRuntimeImports, getFileInfo, getFullRoute, getImportExtension, getMockFileExtensionByTypeName, getRefInfo, getRoute, isBoolean, isComponentRef, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, log, logError, logVerbose, logWarning, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, resolveValue, splitSchemasByType, upath, writeGeneratedFile, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
+import { FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SupportedFormatter, asyncReduce, buildDynamicScope, collectReferencedComponents, conventionName, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateMutator, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getBaseUrlRuntimeImports, getFileInfo, getFullRoute, getImportExtension, getMockFileExtensionByTypeName, getRefInfo, getRoute, isBoolean, isComponentRef, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, log, logError, logVerbose, logWarning, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, resolveValue, splitSchemasByType, upath, writeGeneratedFile, 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";
 import { isNullish as isNullish$1, pick, unique } from "remeda";
 import * as mock from "@orval/mock";
-import { generateFakerForSchemas, generateMockImports, getDefaultMockOptionsForType } from "@orval/mock";
+import { dedupeStrictMockTypeDeclarations, generateFakerForSchemas, generateMockImports, getDefaultMockOptionsForType } from "@orval/mock";
 import angular from "@orval/angular";
 import axios from "@orval/axios";
 import effect from "@orval/effect";
@@ -28,8 +28,8 @@ import fs$2 from "node:fs";
 import { createJiti } from "jiti";
 //#region package.json
 var name = "orval";
+var version = "8.16.0";
 var description = "A swagger client generator for typescript";
-var version = "8.14.0";
 //#endregion
 //#region src/client.ts
 const DEFAULT_CLIENT = OutputClient.AXIOS;
@@ -172,7 +172,8 @@ const generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options
 			return {
 				type: isFunction(entry) ? OutputMockType.MSW : entry.type,
 				implementation: generated.implementation,
-				imports: generated.imports
+				imports: generated.imports,
+				strictMockSchemaTypeNames: generated.strictMockSchemaTypeNames
 			};
 		});
 		const hasImplementation = client.implementation.trim().length > 0;
@@ -266,6 +267,7 @@ async function getApiBuilder({ input, output, context }) {
 		footer: generateClientFooter,
 		imports: generateClientImports,
 		importsMock: generateMockImports,
+		finalizeMockImplementation: dedupeStrictMockTypeDeclarations,
 		extraFiles
 	};
 }
@@ -275,11 +277,12 @@ function filterSpecComponents(spec, input) {
 	const filters = input.filters;
 	if (!filters?.tags || filters.schemas) return spec;
 	const referenced = collectReferencedComponents(spec, filters.tags, filters.mode);
+	const allSchemas = spec.components?.schemas ?? {};
 	return {
 		...spec,
 		components: {
 			...spec.components,
-			schemas: pick(spec.components?.schemas ?? {}, referenced.schemas),
+			schemas: filters.includeUnreferencedSchemas ? allSchemas : pick(allSchemas, referenced.schemas),
 			responses: pick(spec.components?.responses ?? {}, referenced.responses),
 			parameters: pick(spec.components?.parameters ?? {}, referenced.parameters),
 			requestBodies: pick(spec.components?.requestBodies ?? {}, referenced.requestBodies)
@@ -337,16 +340,12 @@ function getApiSchemas({ input, output, target, workspace, spec }) {
 //#endregion
 //#region src/import-specs.ts
 async function resolveSpec(input, { parserOptions, transformer, workspace, unsafeDisableValidation = false }) {
-	const dereferencedData = dereferenceExternalRef(await bundle(input, {
-		plugins: [
-			readFiles(),
-			fetchUrls({ headers: parserOptions?.headers }),
-			parseJson(),
-			parseYaml()
-		],
-		treeShake: false
-	}));
-	const transformedData = transformer ? await applyInputTransformer(dereferencedData, transformer, workspace) : dereferencedData;
+	const dereferencedData = await bundleAndDereferenceExternalRefs(input, parserOptions);
+	let transformedData = dereferencedData;
+	if (transformer) {
+		const applied = await applyInputTransformer(dereferencedData, transformer, workspace);
+		transformedData = hasExternalRef(applied) ? await bundleAndDereferenceExternalRefs(applied, parserOptions, isString(input) ? input : void 0) : applied;
+	}
 	if (unsafeDisableValidation) logWarning("🚨 OpenAPI spec validation is disabled.\n  Code generation with invalid specs is not guaranteed to work and may break in minor updates.\n  Bug reports with validation disabled will not be accepted.");
 	else {
 		validateComponentKeys(transformedData);
@@ -365,6 +364,39 @@ async function applyInputTransformer(data, transformer, workspace) {
 	}
 	return result;
 }
+/**
+* Bundle external references into the document and then resolve the `x-ext`
+* entries that `@scalar/json-magic` produces. Shared by the initial pass and
+* the post-transformer pass (#3327); `origin` lets the second pass resolve refs
+* relative to the original spec file when the input is an in-memory object.
+*/
+async function bundleAndDereferenceExternalRefs(input, parserOptions, origin) {
+	return dereferenceExternalRef(await bundle(input, {
+		plugins: [
+			readFiles(),
+			fetchUrls({ headers: parserOptions?.headers }),
+			parseJson(),
+			parseYaml()
+		],
+		treeShake: false,
+		...origin ? { origin } : {}
+	}));
+}
+/**
+* Report whether any `$ref` in the document points to an external document.
+* Per the JSON Reference rules a ref is external when it does not start with
+* `#` (an in-document pointer). Used to decide whether a transformer introduced
+* new external refs that need a second bundle pass (#3327) — when it did not,
+* the already-bundled spec is returned untouched.
+*/
+function hasExternalRef(obj) {
+	if (Array.isArray(obj)) return obj.some((item) => hasExternalRef(item));
+	if (isObject(obj)) {
+		if ("$ref" in obj && isString(obj.$ref) && !obj.$ref.startsWith("#")) return true;
+		return Object.values(obj).some((value) => hasExternalRef(value));
+	}
+	return false;
+}
 async function importSpecs(workspace, options, projectName) {
 	const { input, output } = options;
 	return importOpenApi({
@@ -851,9 +883,15 @@ function createFormData(workspace, formData) {
 function normalizeSchemasOption(schemas, workspace) {
 	if (!schemas) return;
 	if (isString(schemas)) return normalizePath(schemas, workspace);
+	if (schemas.importPath !== void 0 && !schemas.importPath) throw new Error(`schemas.importPath must be a non-empty package specifier (e.g. '@acme/models'). Received an empty string.`);
+	if (schemas.importPath?.trim() === "") throw new Error(`schemas.importPath must be a non-empty package specifier (e.g. '@acme/models'). Received a whitespace-only string.`);
+	if (schemas.importPath && schemas.importPath.trim() !== schemas.importPath) throw new Error(`schemas.importPath must be a non-empty package specifier (e.g. '@acme/models'). Received a value with leading or trailing whitespace: "${schemas.importPath}"`);
+	if (schemas.importPath?.startsWith(".")) throw new Error(`schemas.importPath must be a package specifier (e.g. '@acme/models'), not a relative path. Received: "${schemas.importPath}"`);
+	if (schemas.importPath && (path.isAbsolute(schemas.importPath) || /^[A-Za-z]:[\\/]/.test(schemas.importPath) || schemas.importPath.startsWith("\\\\"))) throw new Error(`schemas.importPath must be a package specifier (e.g. '@acme/models'), not an absolute path. Received: "${schemas.importPath}"`);
 	return {
 		path: normalizePath(schemas.path, workspace),
-		type: schemas.type
+		type: schemas.type,
+		importPath: schemas.importPath
 	};
 }
 function normalizeEffectOptions(effect) {
@@ -1247,6 +1285,7 @@ function normalizeHooks(hooks) {
 function normalizeHonoOptions(hono = {}, workspace) {
 	return {
 		...hono.handlers ? { handlers: path.resolve(workspace, hono.handlers) } : {},
+		handlerGenerationStrategy: hono.handlerGenerationStrategy ?? "smart",
 		compositeRoute: hono.compositeRoute ? path.resolve(workspace, hono.compositeRoute) : "",
 		validator: hono.validator ?? true,
 		validatorOutputPath: hono.validatorOutputPath ? path.resolve(workspace, hono.validatorOutputPath) : ""
@@ -1260,7 +1299,7 @@ function normalizeMcpServerOptions(server, workspace) {
 	};
 }
 function normalizeMcpOptions(mcp = {}, workspace) {
-	return { ...mcp.server ? { server: normalizeMcpServerOptions(mcp.server, workspace) } : {} };
+	return mcp.server ? { server: normalizeMcpServerOptions(mcp.server, workspace) } : {};
 }
 function normalizeJSDocOptions(jsdoc = {}) {
 	return { ...jsdoc };
@@ -1289,6 +1328,8 @@ function normalizeQueryOptions(queryOptions = {}, outputWorkspace, globalOptions
 		...isNullish(queryOptions.shouldExportQueryKey) ? {} : { shouldExportQueryKey: queryOptions.shouldExportQueryKey },
 		...isNullish(globalOptions.shouldFilterQueryKey) ? {} : { shouldFilterQueryKey: globalOptions.shouldFilterQueryKey },
 		...isNullish(queryOptions.shouldFilterQueryKey) ? {} : { shouldFilterQueryKey: queryOptions.shouldFilterQueryKey },
+		...isNullish(globalOptions.queryKeyFilter) ? {} : { queryKeyFilter: globalOptions.queryKeyFilter },
+		...isNullish(queryOptions.queryKeyFilter) ? {} : { queryKeyFilter: queryOptions.queryKeyFilter },
 		...isNullish(globalOptions.shouldExportHttpClient) ? {} : { shouldExportHttpClient: globalOptions.shouldExportHttpClient },
 		...isNullish(queryOptions.shouldExportHttpClient) ? {} : { shouldExportHttpClient: queryOptions.shouldExportHttpClient },
 		...isNullish(globalOptions.shouldExportMutatorHooks) ? {} : { shouldExportMutatorHooks: globalOptions.shouldExportMutatorHooks },
@@ -1402,14 +1443,19 @@ const generateReusableSchemaSet = (refs, context, options) => {
 	const seen = new Set(refs);
 	const entries = [];
 	for (const ref of queue) {
-		const schema = componentSchemas[ref.slice(21)];
+		const schemaName = ref.slice(21);
+		const schema = componentSchemas[schemaName];
 		if (!schema) continue;
 		const name = resolveSchemaName(ref, context);
-		const parsed = parseZodValidationSchemaDefinition(generateZodValidationSchemaDefinition(schema, context, name, options.strict, options.isZodV4, {
+		const scopedContext = {
+			...context,
+			dynamicScope: buildDynamicScope(schemaName, schema, context)
+		};
+		const parsed = parseZodValidationSchemaDefinition(generateZodValidationSchemaDefinition(schema, scopedContext, name, options.strict, options.isZodV4, {
 			required: true,
 			useReusableSchemas: true,
 			emitMeta: options.generateMeta
-		}), context, options.coerce ?? false, options.strict, options.isZodV4, void 0, options.paramsMutator ? {
+		}), scopedContext, options.coerce ?? false, options.strict, options.isZodV4, void 0, options.paramsMutator ? {
 			mutator: options.paramsMutator,
 			operationId: "",
 			location: "schema",
@@ -1808,6 +1854,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 	const strict = output.override.zod.strict.body;
 	const coerce = output.override.zod.coerce.body;
 	const useReusableSchemas = output.override.zod.generateReusableSchemas === true;
+	const useNamedParameters = output.override.useNamedParameters ?? false;
 	const uniqueVerbsSchemas = dedupeSchemasByName(verbOptionsArray.flatMap((verbOption) => {
 		const operation = verbOption.originalOperation;
 		const shouldGenerate = {
@@ -1828,6 +1875,15 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 			encoding: bodyMedia?.encoding
 		}] : [];
 		const parameters = operation.parameters;
+		const pathParams = parameters?.filter((p) => "in" in p && p.in === "path");
+		const pathParamsSchemas = useNamedParameters && shouldGenerate.param && pathParams && pathParams.length > 0 ? [{
+			name: `${pascal(verbOption.operationName)}PathParameters`,
+			schema: {
+				type: "object",
+				properties: Object.fromEntries(pathParams.filter((p) => "schema" in p && p.schema).map((p) => [p.name, useReusableSchemas ? p.schema : dereference(p.schema, zodContext)])),
+				required: pathParams.filter((p) => p.required).map((p) => p.name).filter((name) => name !== void 0)
+			}
+		}] : [];
 		const queryParams = parameters?.filter((p) => "in" in p && p.in === "query");
 		const queryParamsSchemas = shouldGenerate.query && queryParams && queryParams.length > 0 ? [{
 			name: `${pascal(verbOption.operationName)}Params`,
@@ -1852,6 +1908,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		})) : [];
 		return dedupeSchemasByName([
 			...bodySchemas,
+			...pathParamsSchemas,
 			...queryParamsSchemas,
 			...headerParamsSchemas,
 			...responseSchemas
@@ -1956,13 +2013,17 @@ async function writeFakerSchemaMocks(builder, options, header) {
 	if (!fakerEntry) return;
 	const schemasWithDef = builder.schemas.filter((s) => !!s.schema);
 	if (schemasWithDef.length === 0) return;
-	const { implementation, imports } = generateFakerForSchemas(schemasWithDef, {
+	const { implementation, imports, strictMockSchemaTypeNames } = generateFakerForSchemas(schemasWithDef, {
 		spec: builder.spec,
 		target: builder.target,
 		workspace: "",
 		output
 	}, fakerEntry);
 	if (!implementation.trim()) return;
+	const finalizedImplementation = builder.finalizeMockImplementation ? builder.finalizeMockImplementation(implementation, {
+		mockOptions: output.override.mock,
+		strictSchemaTypeNames: strictMockSchemaTypeNames
+	}) : implementation;
 	let filePath;
 	let schemaImportPath;
 	const fileExtension = output.fileExtension || ".ts";
@@ -1988,7 +2049,7 @@ async function writeFakerSchemaMocks(builder, options, header) {
 		bucket.push(imp);
 		grouped.set(key, bucket);
 	}
-	const content = `${header}${generateDependencyImports(implementation, [{
+	const content = `${header}${generateDependencyImports(finalizedImplementation, [{
 		exports: [{
 			name: "faker",
 			values: true
@@ -1997,7 +2058,7 @@ async function writeFakerSchemaMocks(builder, options, header) {
 	}, ...[...grouped.entries()].map(([dependency, exports]) => ({
 		exports,
 		dependency
-	}))], void 0, !!output.schemas, false)}\n\n${implementation}`;
+	}))], void 0, !!output.schemas, false)}\n\n${finalizedImplementation}`;
 	await writeGeneratedFile(filePath, content);
 	return filePath;
 }
@@ -2262,4 +2323,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-yIkhToq8.mjs.map
+//# sourceMappingURL=config-4RhXX__A.mjs.map