@orval/core 6.21.0 → 6.22.1

package/dist/index.d.ts

@@ -42,6 +42,8 @@ type NormalizedOutputOptions = {
     headers: boolean;
     indexFiles: boolean;
     baseUrl?: string;
+    allParamsOptional: boolean;
+    urlEncodeParameters: boolean;
 };
 type NormalizedParamsSerializerOptions = {
     qs?: Record<string, any>;
@@ -144,6 +146,8 @@ type OutputOptions = {
     headers?: boolean;
     indexFiles?: boolean;
     baseUrl?: string;
+    allParamsOptional?: boolean;
+    urlEncodeParameters?: boolean;
 };
 type SwaggerParserOptions = Omit<SwaggerParser.Options, 'validate'> & {
     validate?: boolean;
@@ -165,6 +169,8 @@ declare const OutputClient: {
     readonly REACT_QUERY: "react-query";
     readonly SVELTE_QUERY: "svelte-query";
     readonly VUE_QUERY: "vue-query";
+    readonly SWR: "swr";
+    readonly ZOD: "zod";
 };
 type OutputClient = typeof OutputClient[keyof typeof OutputClient];
 declare const OutputMode: {
@@ -504,7 +510,7 @@ type GeneratorMutator = {
     isHook: boolean;
     bodyTypeName?: string;
 };
-type ClientBuilder = (verbOptions: GeneratorVerbOptions, options: GeneratorOptions, outputClient: OutputClient | OutputClientFunc) => GeneratorClient | Promise<GeneratorClient>;
+type ClientBuilder = (verbOptions: GeneratorVerbOptions, options: GeneratorOptions, outputClient: OutputClient | OutputClientFunc, output?: NormalizedOutputOptions) => GeneratorClient | Promise<GeneratorClient>;
 type ClientHeaderBuilder = (params: {
     title: string;
     isRequestOptions: boolean;
@@ -678,6 +684,7 @@ type GeneratorClientTitle = (data: {
     outputClient?: OutputClient | OutputClientFunc;
     title: string;
     customTitleFunc?: (title: string) => string;
+    output: NormalizedOutputOptions;
 }) => GeneratorClientExtra;
 type GeneratorClientHeader = (data: {
     outputClient?: OutputClient | OutputClientFunc;
@@ -687,6 +694,7 @@ type GeneratorClientHeader = (data: {
     provideIn: boolean | 'root' | 'any';
     hasAwaitedType: boolean;
     titles: GeneratorClientExtra;
+    output: NormalizedOutputOptions;
 }) => GeneratorClientExtra;
 type GeneratorClientFooter = (data: {
     outputClient: OutputClient | OutputClientFunc;
@@ -694,6 +702,7 @@ type GeneratorClientFooter = (data: {
     hasMutator: boolean;
     hasAwaitedType: boolean;
     titles: GeneratorClientExtra;
+    output: NormalizedOutputOptions;
 }) => GeneratorClientExtra;
 type GeneratorClientImports = (data: {
     client: OutputClient | OutputClientFunc;
@@ -708,6 +717,7 @@ type GeneratorClientImports = (data: {
     hasGlobalMutator: boolean;
     hasParamsSerializerOptions: boolean;
     packageJson?: PackageJson;
+    output: NormalizedOutputOptions;
 }) => string;
 type GenerateMockImports = (data: {
     implementation: string;
@@ -774,17 +784,18 @@ declare const generateMutator: ({ output, mutator, name, workspace, tsconfig, }:
 }) => Promise<GeneratorMutator | undefined>;
 
 declare const generateBodyOptions: (body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean) => string;
-declare const generateAxiosOptions: ({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, paramsSerializer, paramsSerializerOptions, }: {
+declare const generateAxiosOptions: ({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, isVue, paramsSerializer, paramsSerializerOptions, }: {
     response: GetterResponse;
     isExactOptionalPropertyTypes: boolean;
     queryParams?: GeneratorSchema | undefined;
     headers?: GeneratorSchema | undefined;
     requestOptions?: boolean | object | undefined;
     hasSignal: boolean;
+    isVue: boolean;
     paramsSerializer?: GeneratorMutator | undefined;
     paramsSerializerOptions?: ParamsSerializerOptions | undefined;
 }) => string;
-declare const generateOptions: ({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, paramsSerializer, paramsSerializerOptions, }: {
+declare const generateOptions: ({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, isVue, paramsSerializer, paramsSerializerOptions, }: {
     route: string;
     body: GetterBody;
     headers?: GetterQueryParam | undefined;
@@ -797,12 +808,13 @@ declare const generateOptions: ({ route, body, headers, queryParams, response, v
     isAngular?: boolean | undefined;
     isExactOptionalPropertyTypes: boolean;
     hasSignal: boolean;
+    isVue?: boolean | undefined;
     paramsSerializer?: GeneratorMutator | undefined;
     paramsSerializerOptions?: ParamsSerializerOptions | undefined;
 }) => string;
 declare const generateBodyMutatorConfig: (body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean) => string;
-declare const generateQueryParamsAxiosConfig: (response: GetterResponse, queryParams?: GetterQueryParam) => string;
-declare const generateMutatorConfig: ({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, isBodyVerb, hasSignal, isExactOptionalPropertyTypes, }: {
+declare const generateQueryParamsAxiosConfig: (response: GetterResponse, isVue: boolean, queryParams?: GetterQueryParam) => string;
+declare const generateMutatorConfig: ({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, isBodyVerb, hasSignal, isExactOptionalPropertyTypes, isVue, }: {
     route: string;
     body: GetterBody;
     headers?: GetterQueryParam | undefined;
@@ -814,6 +826,7 @@ declare const generateMutatorConfig: ({ route, body, headers, queryParams, respo
     isBodyVerb: boolean;
     hasSignal: boolean;
     isExactOptionalPropertyTypes: boolean;
+    isVue?: boolean | undefined;
 }) => string;
 declare const generateMutatorRequestOptions: (requestOptions: boolean | object | undefined, hasSecondArgument: boolean) => string;
 declare const generateFormDataAndUrlEncodedFunction: ({ body, formData, formUrlEncoded, isFormData, isFormUrlEncoded, }: {
@@ -906,7 +919,7 @@ declare const getParameters: ({ parameters, context, }: {
  * @param path
  */
 declare const getParamsInPath: (path: string) => string[];
-declare const getParams: ({ route, pathParams, operationId, context, }: {
+declare const getParams: ({ route, pathParams, operationId, context, output, }: {
     route: string;
     pathParams?: {
         parameter: openapi3_ts.ParameterObject;
@@ -914,6 +927,7 @@ declare const getParams: ({ route, pathParams, operationId, context, }: {
     }[] | undefined;
     operationId: string;
     context: ContextSpecs;
+    output: NormalizedOutputOptions;
 }) => GetterParams;
 
 declare const getProps: ({ body, queryParams, params, operationName, headers, context, }: {
@@ -1179,7 +1193,7 @@ declare const sanitize: (value: string, options?: {
 }) => string;
 declare const toObjectString: <T>(props: T[], path?: keyof T | undefined) => string;
 declare const getNumberWord: (num: number) => string;
-declare const escape: (str: string, char?: string) => string;
+declare const escape: (str: string | null, char?: string) => string | undefined;
 /**
  * Escape all characters not included in SingleStringCharacters and
  * DoubleStringCharacters on

package/dist/index.js

@@ -39864,7 +39864,9 @@ var OutputClient = {
   AXIOS_FUNCTIONS: "axios-functions",
   REACT_QUERY: "react-query",
   SVELTE_QUERY: "svelte-query",
-  VUE_QUERY: "vue-query"
+  VUE_QUERY: "vue-query",
+  SWR: "swr",
+  ZOD: "zod"
 };
 var OutputMode = {
   SINGLE: "single",
@@ -40879,7 +40881,7 @@ var getNumberWord = (num) => {
   const arrayOfNumber = num.toString().split("");
   return arrayOfNumber.reduce((acc, n3) => acc + NUMBERS[n3], "");
 };
-var escape2 = (str, char = "'") => str.replace(char, `\\${char}`);
+var escape2 = (str, char = "'") => str?.replace(char, `\\${char}`);
 var jsStringEscape = (input) => input.replace(/["'\\\n\r\u2028\u2029]/g, (character) => {
   switch (character) {
     case '"':
@@ -41192,7 +41194,7 @@ var resolveValue = ({
 };
 
 // src/resolvers/object.ts
-var resolveObject = ({
+var resolveObjectOriginal = ({
   schema,
   propName,
   combined = false,
@@ -41251,6 +41253,31 @@ var resolveObject = ({
   }
   return resolvedValue;
 };
+var resolveObjectCacheMap = /* @__PURE__ */ new Map();
+var resolveObject = ({
+  schema,
+  propName,
+  combined = false,
+  context
+}) => {
+  const hashKey = JSON.stringify({
+    schema,
+    propName,
+    combined,
+    specKey: context.specKey
+  });
+  if (resolveObjectCacheMap.has(hashKey)) {
+    return resolveObjectCacheMap.get(hashKey);
+  }
+  const result = resolveObjectOriginal({
+    schema,
+    propName,
+    combined,
+    context
+  });
+  resolveObjectCacheMap.set(hashKey, result);
+  return result;
+};
 
 // src/getters/array.ts
 var getArray = ({
@@ -41447,49 +41474,37 @@ var getSchemaFormDataAndUrlEncoded = ({
     !isRef && isReference(schemaObject) ? imports[0].name : name
   );
   const variableName = isUrlEncoded ? "formUrlEncoded" : "formData";
-  const form = isUrlEncoded ? `const ${variableName} = new URLSearchParams();
+  let form = isUrlEncoded ? `const ${variableName} = new URLSearchParams();
 ` : `const ${variableName} = new FormData();
 `;
-  if (schema.type === "object" && schema.properties) {
-    const formDataValues = Object.entries(schema.properties).reduce(
-      (acc, [key, value]) => {
-        const { schema: property } = resolveRef(value, context);
-        let formDataValue = "";
-        const formatedKey = !import_esutils3.keyword.isIdentifierNameES5(key) ? `['${key}']` : `.${key}`;
-        if (property.type === "object") {
-          formDataValue = `${variableName}.append('${key}', JSON.stringify(${propName}${formatedKey}));
-`;
-        } else if (property.type === "array") {
-          formDataValue = `${propName}${formatedKey}.forEach(value => ${variableName}.append('${key}', value));
-`;
-        } else if (property.type === "number" || property.type === "integer" || property.type === "boolean") {
-          formDataValue = `${variableName}.append('${key}', ${propName}${formatedKey}.toString())
-`;
-        } else {
-          formDataValue = `${variableName}.append('${key}', ${propName}${formatedKey})
-`;
-        }
-        const isRequired = schema.required?.includes(key);
-        if (property.nullable) {
-          if (isRequired) {
-            return acc + `if(${propName}${formatedKey} !== null) {
- ${formDataValue} }
-`;
-          }
-          return acc + `if(${propName}${formatedKey} !== undefined && ${propName}${formatedKey} !== null) {
- ${formDataValue} }
-`;
-        }
-        if (isRequired) {
-          return acc + formDataValue;
-        }
-        return acc + `if(${propName}${formatedKey} !== undefined) {
- ${formDataValue} }
-`;
-      },
-      ""
-    );
-    return `${form}${formDataValues}`;
+  if (schema.type === "object") {
+    if (schema.oneOf || schema.anyOf || schema.allOf) {
+      const combinedSchemas = schema.oneOf || schema.anyOf || schema.allOf;
+      const shouldCast = !!schema.oneOf || !!schema.anyOf;
+      const combinedSchemasFormData = combinedSchemas.map((schema2) => {
+        const { schema: combinedSchema, imports: imports2 } = resolveRef(
+          schema2,
+          context
+        );
+        return resolveSchemaPropertiesToFormData({
+          schema: combinedSchema,
+          variableName,
+          propName: shouldCast ? `(${propName} as any)` : propName,
+          context
+        });
+      }).filter((x3) => x3).join("\n");
+      form += combinedSchemasFormData;
+    }
+    if (schema.properties) {
+      const formDataValues = resolveSchemaPropertiesToFormData({
+        schema,
+        variableName,
+        propName,
+        context
+      });
+      form += formDataValues;
+    }
+    return form;
   }
   if (schema.type === "array") {
     return `${form}${propName}.forEach(value => ${variableName}.append('data', value))
@@ -41502,6 +41517,53 @@ var getSchemaFormDataAndUrlEncoded = ({
   return `${form}${variableName}.append('data', ${propName})
 `;
 };
+var resolveSchemaPropertiesToFormData = ({
+  schema,
+  variableName,
+  propName,
+  context
+}) => {
+  const formDataValues = Object.entries(schema.properties ?? {}).reduce(
+    (acc, [key, value]) => {
+      const { schema: property } = resolveRef(value, context);
+      let formDataValue = "";
+      const formatedKey = !import_esutils3.keyword.isIdentifierNameES5(key) ? `['${key}']` : `.${key}`;
+      const valueKey = `${propName}${formatedKey}`;
+      if (property.type === "object") {
+        formDataValue = `${variableName}.append('${key}', JSON.stringify(${valueKey}));
+`;
+      } else if (property.type === "array") {
+        formDataValue = `${valueKey}.forEach(value => ${variableName}.append('${key}', value));
+`;
+      } else if (property.type === "number" || property.type === "integer" || property.type === "boolean") {
+        formDataValue = `${variableName}.append('${key}', ${valueKey}.toString())
+`;
+      } else {
+        formDataValue = `${variableName}.append('${key}', ${valueKey})
+`;
+      }
+      const isRequired = schema.required?.includes(key);
+      if (property.nullable) {
+        if (isRequired) {
+          return acc + `if(${valueKey} !== null) {
+ ${formDataValue} }
+`;
+        }
+        return acc + `if(${valueKey} !== undefined && ${valueKey} !== null) {
+ ${formDataValue} }
+`;
+      }
+      if (isRequired) {
+        return acc + formDataValue;
+      }
+      return acc + `if(${valueKey} !== undefined) {
+ ${formDataValue} }
+`;
+    },
+    ""
+  );
+  return formDataValues;
+};
 
 // src/getters/body.ts
 var getBody = ({
@@ -42063,7 +42125,8 @@ var getParams = ({
   route,
   pathParams = [],
   operationId,
-  context
+  context,
+  output
 }) => {
   const params = getParamsInPath(route);
   return params.map((p2) => {
@@ -42104,8 +42167,12 @@ var getParams = ({
         } : {}
       }
     });
+    let paramType = resolvedValue.value;
+    if (output.allParamsOptional) {
+      paramType = `${paramType} | undefined | null`;
+    }
     const definition = `${name}${!required || resolvedValue.originalSchema.default ? "?" : ""}: ${resolvedValue.value}`;
-    const implementation = `${name}${!required && !resolvedValue.originalSchema.default ? "?" : ""}${!resolvedValue.originalSchema.default ? `: ${resolvedValue.value}` : `= ${stringify(resolvedValue.originalSchema.default)}`}`;
+    const implementation = `${name}${!required && !resolvedValue.originalSchema.default ? "?" : ""}${!resolvedValue.originalSchema.default ? `: ${paramType}` : `: ${paramType} = ${stringify(resolvedValue.originalSchema.default)}`}`;
     return {
       name,
       definition,
@@ -42160,7 +42227,7 @@ var getProps = ({
  }`;
     const isOptional = params.every((param) => param.default);
     const implementation = `{ ${params.map(
-      (property) => property.default ? property.implementation : property.name
+      (property) => property.default ? `${property.name} = ${property.default}` : property.name
     ).join(", ")} }: ${parameterTypeName}${isOptional ? " = {}" : ""}`;
     const destructured = `{ ${params.map((property) => property.name).join(", ")} }`;
     paramGetterProps = [
@@ -42862,6 +42929,7 @@ var generateAxiosOptions = ({
   headers,
   requestOptions,
   hasSignal,
+  isVue,
   paramsSerializer,
   paramsSerializerOptions
 }) => {
@@ -42898,7 +42966,11 @@ var generateAxiosOptions = ({
   if (isRequestOptions) {
     value += "\n    ...options,";
     if (queryParams) {
-      value += "\n        params: {...params, ...options?.params},";
+      if (isVue) {
+        value += "\n        params: {...unref(params), ...options?.params},";
+      } else {
+        value += "\n        params: {...params, ...options?.params},";
+      }
     }
     if (headers) {
       value += "\n        headers: {...headers, ...options?.headers},";
@@ -42930,6 +43002,7 @@ var generateOptions = ({
   isAngular,
   isExactOptionalPropertyTypes,
   hasSignal,
+  isVue,
   paramsSerializer,
   paramsSerializerOptions
 }) => {
@@ -42942,6 +43015,7 @@ var generateOptions = ({
     requestOptions,
     isExactOptionalPropertyTypes,
     hasSignal,
+    isVue: isVue ?? false,
     paramsSerializer,
     paramsSerializerOptions
   });
@@ -42973,13 +43047,17 @@ var generateBodyMutatorConfig = (body, isFormData, isFormUrlEncoded) => {
   }
   return "";
 };
-var generateQueryParamsAxiosConfig = (response, queryParams) => {
+var generateQueryParamsAxiosConfig = (response, isVue, queryParams) => {
   if (!queryParams && !response.isBlob) {
     return "";
   }
   let value = "";
   if (queryParams) {
-    value += ",\n        params";
+    if (isVue) {
+      value += ",\n        params: unref(params)";
+    } else {
+      value += ",\n        params";
+    }
   }
   if (response.isBlob) {
     value += `,
@@ -42998,11 +43076,13 @@ var generateMutatorConfig = ({
   isFormUrlEncoded,
   isBodyVerb,
   hasSignal,
-  isExactOptionalPropertyTypes
+  isExactOptionalPropertyTypes,
+  isVue
 }) => {
   const bodyOptions = isBodyVerb ? generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) : "";
   const queryParamsOptions = generateQueryParamsAxiosConfig(
     response,
+    isVue ?? false,
     queryParams
   );
   const headerOptions = body.contentType ? `,
@@ -43283,7 +43363,8 @@ var generateVerbOptions = async ({
     route,
     pathParams: parameters.path,
     operationId,
-    context
+    context,
+    output
   });
   const props = getProps({
     body,
@@ -43538,7 +43619,8 @@ var generateTarget = (builder, options) => {
   const titles = builder.title({
     outputClient: options.client,
     title: pascal(builder.info.title),
-    customTitleFunc: options.override.title
+    customTitleFunc: options.override.title,
+    output: options
   });
   const target = Object.values(builder.operations).reduce(
     (acc, operation, index3, arr) => {
@@ -43575,7 +43657,8 @@ var generateTarget = (builder, options) => {
           isGlobalMutator: !!options.override.mutator,
           provideIn: options.override.angular.provideIn,
           hasAwaitedType,
-          titles
+          titles,
+          output: options
         });
         acc.implementation = header.implementation + acc.implementation;
         acc.implementationMock.handler = header.implementationMock + acc.implementationMock.handler;
@@ -43584,7 +43667,8 @@ var generateTarget = (builder, options) => {
           operationNames,
           hasMutator: !!acc.mutators.length,
           hasAwaitedType,
-          titles
+          titles,
+          output: options
         });
         acc.implementation += footer.implementation;
         acc.implementationMock.handler += footer.implementationMock;
@@ -43656,7 +43740,8 @@ var writeSingleMode = async ({
       isAllowSyntheticDefaultImports,
       hasGlobalMutator: !!output.override.mutator,
       hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
-      packageJson: output.packageJson
+      packageJson: output.packageJson,
+      output
     });
     if (output.mock) {
       data += builder.importsMock({
@@ -43743,7 +43828,8 @@ var writeSplitMode = async ({
       isAllowSyntheticDefaultImports,
       hasGlobalMutator: !!output.override.mutator,
       hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
-      packageJson: output.packageJson
+      packageJson: output.packageJson,
+      output
     });
     mockData += builder.importsMock({
       implementation: implementationMock,
@@ -43886,14 +43972,16 @@ var generateTargetForTags = (builder, options) => {
         const titles = builder.title({
           outputClient: options.client,
           title: pascal(tag),
-          customTitleFunc: options.override.title
+          customTitleFunc: options.override.title,
+          output: options
         });
         const footer = builder.footer({
           outputClient: options?.client,
           operationNames,
           hasMutator: !!target.mutators?.length,
           hasAwaitedType,
-          titles
+          titles,
+          output: options
         });
         const header = builder.header({
           outputClient: options.client,
@@ -43902,7 +43990,8 @@ var generateTargetForTags = (builder, options) => {
           isGlobalMutator: !!options.override.mutator,
           provideIn: options.override.angular.provideIn,
           hasAwaitedType,
-          titles
+          titles,
+          output: options
         });
         acc2[tag] = {
           implementation: header.implementation + target.implementation + footer.implementation,
@@ -43976,7 +44065,8 @@ var writeSplitTagsMode = async ({
           isAllowSyntheticDefaultImports,
           hasGlobalMutator: !!output.override.mutator,
           hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
-          packageJson: output.packageJson
+          packageJson: output.packageJson,
+          output
         });
         mockData += builder.importsMock({
           implementation: implementationMock,
@@ -44111,7 +44201,8 @@ var writeTagsMode = async ({
           isAllowSyntheticDefaultImports,
           hasGlobalMutator: !!output.override.mutator,
           hasParamsSerializerOptions: !!output.override.paramsSerializerOptions,
-          packageJson: output.packageJson
+          packageJson: output.packageJson,
+          output
         });
         if (output.mock) {
           data += builder.importsMock({