orval 8.20.0 → 8.21.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-C8B9Lol2.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-DGhExJ4J.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/{config-C8B9Lol2.mjs → config-DGhExJ4J.mjs}

@@ -29,7 +29,7 @@ import { parseTsconfig } from "get-tsconfig";
 import { createJiti } from "jiti";
 //#region package.json
 var name = "orval";
-var version = "8.20.0";
+var version = "8.21.0";
 var description = "A swagger client generator for typescript";
 //#endregion
 //#region src/client.ts
@@ -98,7 +98,7 @@ const generateClientHeader = ({ outputClient = DEFAULT_CLIENT, isRequestOptions,
 		sharedTypes: normalizedHeader.sharedTypes
 	};
 };
-const generateClientFooter = ({ outputClient, operationNames, hasMutator, hasAwaitedType, titles, output }) => {
+const generateClientFooter = ({ outputClient, operationNames, operations, hasMutator, hasAwaitedType, titles, output }) => {
 	const { footer } = getGeneratorClient(outputClient, output);
 	if (!footer) return {
 		implementation: "",
@@ -111,6 +111,7 @@ const generateClientFooter = ({ outputClient, operationNames, hasMutator, hasAwa
 			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,
+			operations,
 			title: titles.implementation,
 			hasMutator,
 			hasAwaitedType
@@ -118,6 +119,7 @@ const generateClientFooter = ({ outputClient, operationNames, hasMutator, hasAwa
 	} catch {
 		implementation = footer({
 			operationNames,
+			operations,
 			title: titles.implementation,
 			hasMutator,
 			hasAwaitedType
@@ -202,7 +204,8 @@ const generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options
 			paramsSerializer: verbOption.paramsSerializer,
 			paramsFilter: verbOption.paramsFilter,
 			operationName: verbOption.operationName,
-			fetchReviver: verbOption.fetchReviver
+			fetchReviver: verbOption.fetchReviver,
+			...client.returnType ? { types: { result: client.returnType } } : void 0
 		};
 		return acc;
 	}, {});
@@ -252,10 +255,12 @@ async function getApiBuilder({ input, output, context }) {
 		}, output);
 		for (const verbOption of verbsOptions) acc.verbOptions[verbOption.operationId] = verbOption;
 		acc.schemas.push(...schemas);
-		acc.operations = {
-			...acc.operations,
-			...pathOperations
-		};
+		for (const [key, value] of Object.entries(pathOperations)) {
+			let operationKey = key;
+			let counter = 1;
+			while (Object.hasOwn(acc.operations, operationKey)) operationKey = `${key}::${++counter}`;
+			acc.operations[operationKey] = value;
+		}
 		return acc;
 	}, {
 		operations: {},
@@ -1126,6 +1131,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 					useBrandedTypes: outputOptions.override?.zod?.useBrandedTypes ?? false,
 					generateReusableSchemas: outputOptions.override?.zod?.generateReusableSchemas ?? false,
 					generateMeta: outputOptions.override?.zod?.generateMeta ?? false,
+					generateDiscriminatedUnion: outputOptions.override?.zod?.generateDiscriminatedUnion ?? false,
 					dateTimeOptions: outputOptions.override?.zod?.dateTimeOptions ?? { offset: true },
 					timeOptions: outputOptions.override?.zod?.timeOptions ?? {}
 				},
@@ -1138,6 +1144,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 					provideIn: outputOptions.override?.angular?.provideIn ?? "root",
 					client: outputOptions.override?.angular?.retrievalClient ?? outputOptions.override?.angular?.client ?? "httpClient",
 					runtimeValidation: outputOptions.override?.angular?.runtimeValidation ?? false,
+					queryObjectSerialization: outputOptions.override?.angular?.queryObjectSerialization ?? "spec",
 					...outputOptions.override?.angular?.httpResource ? { httpResource: outputOptions.override.angular.httpResource } : {}
 				},
 				fetch: {
@@ -1274,7 +1281,8 @@ function normalizeOperationsAndTags(operationsOrTags, workspace, global, source)
 		"timeOptions",
 		"generateEachHttpStatus",
 		"generateReusableSchemas",
-		"generateMeta"
+		"generateMeta",
+		"generateDiscriminatedUnion"
 	];
 	return Object.fromEntries(Object.entries(operationsOrTags).map(([key, { transformer, mutator, formData, formUrlEncoded, paramsSerializer, paramsFilter, query, angular, zod, effect, ...rest }]) => {
 		const unsupportedOperationZodKeys = zod && unsupportedZodKeys.filter((unsupportedKey) => zod[unsupportedKey] !== void 0);
@@ -1286,6 +1294,7 @@ function normalizeOperationsAndTags(operationsOrTags, workspace, global, source)
 				provideIn: angular.provideIn ?? "root",
 				client: angular.retrievalClient ?? angular.client ?? "httpClient",
 				runtimeValidation: angular.runtimeValidation ?? false,
+				queryObjectSerialization: angular.queryObjectSerialization ?? "spec",
 				...angular.httpResource ? { httpResource: angular.httpResource } : {}
 			} } : {},
 			...query ? { query: normalizeQueryOptions(query, workspace, global.query) } : {},
@@ -2038,7 +2047,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		const [bodyContentType, bodyMedia] = jsonBodyMedia ? ["application/json", jsonBodyMedia] : formDataBodyMedia ? ["multipart/form-data", formDataBodyMedia] : formUrlEncodedBodyMedia ? ["application/x-www-form-urlencoded", formUrlEncodedBodyMedia] : [void 0, void 0];
 		const bodySchema = bodyMedia?.schema;
 		const bodySchemas = shouldGenerate.body && bodySchema ? [{
-			name: `${pascal(verbOption.operationName)}Body`,
+			name: `${pascal(verbOption.typeName)}Body`,
 			schema: useReusableSchemas ? bodySchema : dereference(bodySchema, zodContext),
 			bodyContentType,
 			encoding: bodyMedia?.encoding
@@ -2046,7 +2055,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		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`,
+			name: `${pascal(verbOption.typeName)}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)])),
@@ -2055,7 +2064,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		}] : [];
 		const queryParams = parameters?.filter((p) => "in" in p && p.in === "query");
 		const queryParamsSchemas = shouldGenerate.query && queryParams && queryParams.length > 0 ? [{
-			name: `${pascal(verbOption.operationName)}Params`,
+			name: `${pascal(verbOption.typeName)}Params`,
 			schema: {
 				type: "object",
 				properties: Object.fromEntries(queryParams.filter((p) => "schema" in p && p.schema).map((p) => [p.name, useReusableSchemas ? p.schema : dereference(p.schema, zodContext)])),
@@ -2064,7 +2073,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		}] : [];
 		const headerParams = parameters?.filter((p) => "in" in p && p.in === "header");
 		const headerParamsSchemas = shouldGenerate.header && headerParams && headerParams.length > 0 ? [{
-			name: `${pascal(verbOption.operationName)}Headers`,
+			name: `${pascal(verbOption.typeName)}Headers`,
 			schema: {
 				type: "object",
 				properties: Object.fromEntries(headerParams.filter((p) => "schema" in p && p.schema).map((p) => [p.name, useReusableSchemas ? p.schema : dereference(p.schema, zodContext)])),
@@ -2601,4 +2610,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-C8B9Lol2.mjs.map
+//# sourceMappingURL=config-DGhExJ4J.mjs.map