@orval/core 8.0.2 → 8.0.3

package/dist/index.d.mts

@@ -1160,6 +1160,7 @@ interface GenerateAxiosOptions {
   headers?: GeneratorSchema;
   requestOptions?: object | boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isVue: boolean;
   isAngular: boolean;
   paramsSerializer?: GeneratorMutator;
@@ -1172,6 +1173,7 @@ declare function generateAxiosOptions({
   headers,
   requestOptions,
   hasSignal,
+  hasSignalParam,
   isVue,
   isAngular,
   paramsSerializer,
@@ -1190,6 +1192,7 @@ interface GenerateOptionsOptions {
   isAngular?: boolean;
   isExactOptionalPropertyTypes: boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isVue?: boolean;
   paramsSerializer?: GeneratorMutator;
   paramsSerializerOptions?: ParamsSerializerOptions;
@@ -1207,6 +1210,7 @@ declare function generateOptions({
   isAngular,
   isExactOptionalPropertyTypes,
   hasSignal,
+  hasSignalParam,
   isVue,
   paramsSerializer,
   paramsSerializerOptions
@@ -1223,6 +1227,7 @@ interface GenerateMutatorConfigOptions {
   isFormData: boolean;
   isFormUrlEncoded: boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isExactOptionalPropertyTypes: boolean;
   isVue?: boolean;
 }
@@ -1236,6 +1241,7 @@ declare function generateMutatorConfig({
   isFormData,
   isFormUrlEncoded,
   hasSignal,
+  hasSignalParam,
   isExactOptionalPropertyTypes,
   isVue
 }: GenerateMutatorConfigOptions): string;

package/dist/index.mjs

@@ -234,7 +234,7 @@ function joinSafe(...values) {
 * @param property
 */
 function isReference(obj) {
-	return Object.hasOwn(obj, "$ref");
+	return !isNull(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(path$2) {
 	return !extname(path$2);
@@ -1383,12 +1383,13 @@ function getScalar({ item, name, context }) {
 function combineValues({ resolvedData, resolvedValue, separator: separator$1, context }) {
 	if (resolvedData.isEnum.every(Boolean)) return `${resolvedData.values.join(` | `)}${resolvedValue ? ` | ${resolvedValue.value}` : ""}`;
 	if (separator$1 === "allOf") {
-		let resolvedDataValue = resolvedData.values.join(` & `);
+		let resolvedDataValue = resolvedData.values.map((v) => v.includes(" | ") ? `(${v})` : v).join(` & `);
 		if (resolvedData.originalSchema.length > 0 && resolvedValue) {
 			const discriminatedPropertySchemas = resolvedData.originalSchema.filter((s) => s?.discriminator && resolvedValue.value.includes(` ${s.discriminator.propertyName}:`));
 			if (discriminatedPropertySchemas.length > 0) resolvedDataValue = `Omit<${resolvedDataValue}, '${discriminatedPropertySchemas.map((s) => s.discriminator?.propertyName).join("' | '")}'>`;
 		}
-		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValue.value}` : ""}`;
+		const resolvedValueStr = resolvedValue?.value.includes(" | ") ? `(${resolvedValue.value})` : resolvedValue?.value;
+		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValueStr}` : ""}`;
 		const overrideRequiredProperties = resolvedData.requiredProperties.filter((prop$1) => !resolvedData.originalSchema.some((schema) => schema?.properties?.[prop$1] && schema.required?.includes(prop$1)));
 		if (overrideRequiredProperties.length > 0) return `${joined} & Required<Pick<${joined}, '${overrideRequiredProperties.join("' | '")}'>>`;
 		return joined;
@@ -1488,6 +1489,16 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		name,
 		context
 	});
+	else if (separator$1 === "allOf" && (schema.oneOf || schema.anyOf)) {
+		const siblingCombiner = schema.oneOf ? "oneOf" : "anyOf";
+		resolvedValue = combineSchemas({
+			schema: { [siblingCombiner]: schema[siblingCombiner] },
+			name,
+			separator: siblingCombiner,
+			context,
+			nullable: ""
+		});
+	}
 	return {
 		value: combineValues({
 			resolvedData,
@@ -1804,10 +1815,15 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 		if (res.content) return Object.entries(res.content).map(([contentType, mediaType], index, arr) => {
 			let propName = key ? pascal(name) + pascal(key) : void 0;
 			if (propName && arr.length > 1) propName = propName + pascal(getNumberWord(index + 1));
+			let effectivePropName = propName;
+			if (mediaType.schema && isReference(mediaType.schema)) {
+				const { imports } = resolveRef(mediaType.schema, context);
+				if (imports[0]?.name) effectivePropName = imports[0].name;
+			}
 			const isFormData = formDataContentTypes.has(contentType);
 			const resolvedValue = getResReqContentTypes({
 				mediaType,
-				propName,
+				propName: effectivePropName,
 				context,
 				isFormData,
 				contentType
@@ -1827,7 +1843,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				return;
 			}
 			const isFormUrlEncoded = formUrlEncodedContentTypes.has(contentType);
-			if (!isFormData && !isFormUrlEncoded || !propName) return {
+			if (!isFormData && !isFormUrlEncoded || !effectivePropName) return {
 				...resolvedValue,
 				imports: resolvedValue.imports,
 				contentType,
@@ -1835,18 +1851,20 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				examples: resolveExampleRefs(mediaType.examples, context)
 			};
 			const formData = isFormData ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const formUrlEncoded = isFormUrlEncoded ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isUrlEncoded: true,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const additionalImports = getFormDataAdditionalImports({
@@ -2875,18 +2893,20 @@ function generateBodyOptions(body, isFormData, isFormUrlEncoded) {
 	if (body.implementation) return `\n      ${body.implementation},`;
 	return "";
 }
-function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
+function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, hasSignalParam = false, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
 	const isRequestOptions = requestOptions !== false;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
 	if (!queryParams && !headers && !response.isBlob && response.definition.success !== "string") {
 		if (isRequestOptions) return "options";
-		if (hasSignal) return isExactOptionalPropertyTypes ? "...(signal ? { signal } : {})" : "signal";
+		if (hasSignal) return isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} } : {})` : signalProp;
 		return "";
 	}
 	let value = "";
 	if (!isRequestOptions) {
 		if (queryParams) value += "\n        params,";
 		if (headers) value += "\n        headers,";
-		if (hasSignal) value += isExactOptionalPropertyTypes ? "\n        ...(signal ? { signal } : {})," : "\n        signal,";
+		if (hasSignal) value += isExactOptionalPropertyTypes ? `\n        ...(${signalVar} ? { ${signalProp} } : {}),` : `\n        ${signalProp},`;
 	}
 	if (!isObject(requestOptions) || !requestOptions.hasOwnProperty("responseType")) {
 		if (response.isBlob) value += `\n        responseType: 'blob',`;
@@ -2903,7 +2923,7 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryPar
 	if (!isAngular && queryParams && (paramsSerializer || paramsSerializerOptions?.qs)) value += paramsSerializer ? `\n        paramsSerializer: ${paramsSerializer.name},` : `\n        paramsSerializer: (params) => qs.stringify(params, ${JSON.stringify(paramsSerializerOptions.qs)}),`;
 	return value;
 }
-function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, isVue, paramsSerializer, paramsSerializerOptions }) {
+function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, hasSignalParam, isVue, paramsSerializer, paramsSerializerOptions }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : "";
 	const axiosOptions = generateAxiosOptions({
 		response,
@@ -2912,6 +2932,7 @@ function generateOptions({ route, body, headers, queryParams, response, verb, re
 		requestOptions,
 		isExactOptionalPropertyTypes,
 		hasSignal,
+		hasSignalParam,
 		isVue: isVue ?? false,
 		isAngular: isAngular ?? false,
 		paramsSerializer,
@@ -2937,11 +2958,13 @@ function generateQueryParamsAxiosConfig(response, isVue, queryParams) {
 	if (response.isBlob) value += `,\n        responseType: 'blob'`;
 	return value;
 }
-function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, isExactOptionalPropertyTypes, isVue }) {
+function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, hasSignalParam = false, isExactOptionalPropertyTypes, isVue }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) : "";
 	const queryParamsOptions = generateQueryParamsAxiosConfig(response, isVue ?? false, queryParams);
 	const headerOptions = body.contentType ? `,\n      headers: {'Content-Type': '${body.contentType}', ${headers ? "...headers" : ""}}` : headers ? ",\n      headers" : "";
-	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? "...(signal ? { signal }: {})" : "signal"}` : ""}\n    }`;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
+	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} }: {})` : signalProp}` : ""}\n    }`;
 }
 function generateMutatorRequestOptions(requestOptions, hasSecondArgument) {
 	if (!hasSecondArgument) return isObject(requestOptions) ? `{${stringify(requestOptions)?.slice(1, -1)}}` : "";
@@ -3364,7 +3387,7 @@ function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingCo
 			const fileName = conventionName(imp.name, namingConvention);
 			return {
 				...imp,
-				importPath: join(relativePath, fileName)
+				importPath: joinSafe(relativePath, fileName)
 			};
 		}
 		return imp;
@@ -3510,12 +3533,13 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	if (!output.indexFiles) return uniqueBy(imports, (x) => x.name).map((i) => {
 		const name = conventionName(i.schemaName || i.name, output.namingConvention);
 		const suffix = isZodSchemaOutput ? ".zod" : "";
+		const importExtension = output.fileExtension?.replace(/\.ts$/, "") || "";
 		return {
 			exports: isZodSchemaOutput ? [{
 				...i,
 				values: true
 			}] : [i],
-			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}`)
+			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}${importExtension}`)
 		};
 	});
 	else if (isZodSchemaOutput) return [{