@orval/core 7.10.0 → 7.11.0

package/dist/index.d.ts

@@ -76,6 +76,9 @@ type NormalizedOverrideOutput = {
     formUrlEncoded: boolean | NormalizedMutator;
     paramsSerializer?: NormalizedMutator;
     paramsSerializerOptions?: NormalizedParamsSerializerOptions;
+    namingConvention: {
+        enum?: NamingConvention;
+    };
     components: {
         schemas: {
             suffix: string;
@@ -347,6 +350,9 @@ type OverrideOutput = {
     formUrlEncoded?: boolean | Mutator;
     paramsSerializer?: Mutator;
     paramsSerializerOptions?: ParamsSerializerOptions;
+    namingConvention?: {
+        enum?: NamingConvention;
+    };
     components?: {
         schemas?: {
             suffix?: string;
@@ -410,6 +416,9 @@ type ZodDateTimeOptions = {
     local?: boolean;
     precision?: number;
 };
+type ZodTimeOptions = {
+    precision?: -1 | 0 | 1 | 2 | 3;
+};
 type ZodOptions = {
     strict?: {
         param?: boolean;
@@ -440,6 +449,7 @@ type ZodOptions = {
         response?: Mutator;
     };
     dateTimeOptions?: ZodDateTimeOptions;
+    timeOptions?: ZodTimeOptions;
     generateEachHttpStatus?: boolean;
 };
 type ZodCoerceType = 'string' | 'number' | 'boolean' | 'bigint' | 'date';
@@ -474,6 +484,7 @@ type NormalizedZodOptions = {
     };
     generateEachHttpStatus: boolean;
     dateTimeOptions: ZodDateTimeOptions;
+    timeOptions: ZodTimeOptions;
 };
 type HonoOptions = {
     handlers?: string;
@@ -524,12 +535,15 @@ type AngularOptions = {
 };
 type SwrOptions = {
     useInfinite?: boolean;
+    useSWRMutationForGet?: boolean;
     swrOptions?: any;
     swrMutationOptions?: any;
     swrInfiniteOptions?: any;
 };
 type FetchOptions = {
-    includeHttpResponseReturnType: boolean;
+    includeHttpResponseReturnType?: boolean;
+    explode?: boolean;
+    jsonReviver?: Mutator;
 };
 type InputTransformerFn = (spec: OpenAPIObject) => OpenAPIObject;
 type InputTransformer = string | InputTransformerFn;
@@ -656,6 +670,7 @@ type GeneratorTarget = {
     formData?: GeneratorMutator[];
     formUrlEncoded?: GeneratorMutator[];
     paramsSerializer?: GeneratorMutator[];
+    fetchReviver?: GeneratorMutator[];
 };
 type GeneratorTargetFull = {
     imports: GeneratorImport[];
@@ -671,6 +686,7 @@ type GeneratorTargetFull = {
     formData?: GeneratorMutator[];
     formUrlEncoded?: GeneratorMutator[];
     paramsSerializer?: GeneratorMutator[];
+    fetchReviver?: GeneratorMutator[];
 };
 type GeneratorOperation = {
     imports: GeneratorImport[];
@@ -687,6 +703,7 @@ type GeneratorOperation = {
     formData?: GeneratorMutator;
     formUrlEncoded?: GeneratorMutator;
     paramsSerializer?: GeneratorMutator;
+    fetchReviver?: GeneratorMutator;
     operationName: string;
     types?: {
         result: (title?: string) => string;
@@ -711,6 +728,7 @@ type GeneratorVerbOptions = {
     formData?: GeneratorMutator;
     formUrlEncoded?: GeneratorMutator;
     paramsSerializer?: GeneratorMutator;
+    fetchReviver?: GeneratorMutator;
     override: NormalizedOverrideOutput;
     deprecated?: boolean;
     originalOperation: OperationObject;
@@ -771,7 +789,7 @@ type ClientFooterBuilder = (params: {
     hasMutator: boolean;
 }) => string;
 type ClientTitleBuilder = (title: string) => string;
-type ClientDependenciesBuilder = (hasGlobalMutator: boolean, hasParamsSerializerOptions: boolean, packageJson?: PackageJson, httpClient?: OutputHttpClient, hasTagsMutator?: boolean) => GeneratorDependency[];
+type ClientDependenciesBuilder = (hasGlobalMutator: boolean, hasParamsSerializerOptions: boolean, packageJson?: PackageJson, httpClient?: OutputHttpClient, hasTagsMutator?: boolean, override?: NormalizedOverrideOutput) => GeneratorDependency[];
 type ClientMockGeneratorImplementation = {
     function: string;
     handlerName: string;
@@ -1150,8 +1168,8 @@ declare const resolveDiscriminators: (schemas: SchemasObject, context: ContextSp
 
 declare const getEnumNames: (schemaObject: SchemaObject$1 | undefined) => any;
 declare const getEnumDescriptions: (schemaObject: SchemaObject$1 | undefined) => any;
-declare const getEnum: (value: string, enumName: string, names: string[] | undefined, enumGenerationType: EnumGeneration, descriptions?: string[]) => string;
-declare const getEnumImplementation: (value: string, names?: string[], descriptions?: string[]) => string;
+declare const getEnum: (value: string, enumName: string, names: string[] | undefined, enumGenerationType: EnumGeneration, descriptions?: string[], enumNamingConvention?: NamingConvention) => string;
+declare const getEnumImplementation: (value: string, names?: string[], descriptions?: string[], enumNamingConvention?: NamingConvention) => string;
 
 declare const getKey: (key: string) => string;
 
@@ -1519,6 +1537,7 @@ declare const writeSchemas: ({ schemaPath, schemas, target, namingConvention, fi
 }) => Promise<void>;
 
 declare const getOrvalGeneratedTypes: () => string;
+declare const getTypedResponse: () => string;
 
 declare const writeSingleMode: ({ builder, output, specsName, header, needSchema, }: WriteModeProps) => Promise<string[]>;
 
@@ -1532,4 +1551,4 @@ declare const generateTarget: (builder: WriteSpecsBuilder, options: NormalizedOu
 
 declare const generateTargetForTags: (builder: WriteSpecsBuilder, options: NormalizedOutputOptions) => Record<string, GeneratorTarget>;
 
-export { type AngularOptions, BODY_TYPE_NAME, type BaseUrlFromConstant, type BaseUrlFromSpec, type ClientBuilder, type ClientDependenciesBuilder, type ClientExtraFilesBuilder, type ClientFileBuilder, type ClientFooterBuilder, type ClientGeneratorsBuilder, type ClientHeaderBuilder, type ClientMockBuilder, type ClientMockGeneratorBuilder, type ClientMockGeneratorImplementation, type ClientTitleBuilder, type Config, type ConfigExternal, type ConfigFn, type ContextSpecs, EnumGeneration, type FetchOptions, FormDataArrayHandling, type FormDataType, type GenerateMockImports, type GeneratorApiBuilder, type GeneratorApiOperations, type GeneratorApiResponse, type GeneratorClient, type GeneratorClientExtra, type GeneratorClientFooter, type GeneratorClientHeader, type GeneratorClientImports, type GeneratorClientTitle, type GeneratorClients, type GeneratorDependency, type GeneratorImport, type GeneratorMutator, type GeneratorMutatorParsingInfo, type GeneratorOperation, type GeneratorOperations, type GeneratorOptions, type GeneratorSchema, type GeneratorTarget, type GeneratorTargetFull, type GeneratorVerbOptions, type GeneratorVerbsOptions, type GetterBody, type GetterParam, type GetterParameters, type GetterParams, type GetterProp, GetterPropType, type GetterProps, type GetterQueryParam, type GetterResponse, type GlobalMockOptions, type GlobalOptions, type HonoOptions, type Hook, type HookCommand, type HookFunction, type HookOption, type HooksOptions, type ImportOpenApi, type InputFiltersOption, type InputOptions, type InputTransformerFn, type JsDocOptions, type LogLevel, LogLevels, type LogOptions, type LogType, type Logger, type LoggerOptions, type MockData, type MockDataArray, type MockDataArrayFn, type MockDataObject, type MockDataObjectFn, type MockOptions, type MockProperties, type MockPropertiesObject, type MockPropertiesObjectFn, type Mutator, type MutatorObject, NamingConvention, type NormalizedConfig, type NormalizedFormDataType, type NormalizedHonoOptions, type NormalizedHookCommand, type NormalizedHookOptions, type NormalizedInputOptions, type NormalizedJsDocOptions, type NormalizedMutator, type NormalizedOperationOptions, type NormalizedOptions, type NormalizedOutputOptions, type NormalizedOverrideOutput, type NormalizedParamsSerializerOptions, type NormalizedQueryOptions, type NormalizedZodOptions, type OperationOptions, type Options, type OptionsExport, type OptionsFn, OutputClient, type OutputClientFunc, type OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, type OutputOptions, type OverrideInput, type OverrideMockOptions, type OverrideOutput, type OverrideOutputContentType, type PackageJson, type ParamsSerializerOptions, PropertySortOrder, type QueryOptions, RefComponentSuffix, type RefInfo, type ResReqTypesValue, type ResolverValue, type ScalarValue, SchemaType, type SchemaWithConst, type SwaggerParserOptions, type SwrOptions, TEMPLATE_TAG_REGEX, type TsConfigTarget, type Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, type WriteModeProps, type WriteSpecsBuilder, type ZodCoerceType, type ZodDateTimeOptions, type ZodOptions, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, dynamicImport, escape, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, loadFile, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, pascal, removeFiles, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, startMessage, stringify, toObjectString, path as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+export { type AngularOptions, BODY_TYPE_NAME, type BaseUrlFromConstant, type BaseUrlFromSpec, type ClientBuilder, type ClientDependenciesBuilder, type ClientExtraFilesBuilder, type ClientFileBuilder, type ClientFooterBuilder, type ClientGeneratorsBuilder, type ClientHeaderBuilder, type ClientMockBuilder, type ClientMockGeneratorBuilder, type ClientMockGeneratorImplementation, type ClientTitleBuilder, type Config, type ConfigExternal, type ConfigFn, type ContextSpecs, EnumGeneration, type FetchOptions, FormDataArrayHandling, type FormDataType, type GenerateMockImports, type GeneratorApiBuilder, type GeneratorApiOperations, type GeneratorApiResponse, type GeneratorClient, type GeneratorClientExtra, type GeneratorClientFooter, type GeneratorClientHeader, type GeneratorClientImports, type GeneratorClientTitle, type GeneratorClients, type GeneratorDependency, type GeneratorImport, type GeneratorMutator, type GeneratorMutatorParsingInfo, type GeneratorOperation, type GeneratorOperations, type GeneratorOptions, type GeneratorSchema, type GeneratorTarget, type GeneratorTargetFull, type GeneratorVerbOptions, type GeneratorVerbsOptions, type GetterBody, type GetterParam, type GetterParameters, type GetterParams, type GetterProp, GetterPropType, type GetterProps, type GetterQueryParam, type GetterResponse, type GlobalMockOptions, type GlobalOptions, type HonoOptions, type Hook, type HookCommand, type HookFunction, type HookOption, type HooksOptions, type ImportOpenApi, type InputFiltersOption, type InputOptions, type InputTransformerFn, type JsDocOptions, type LogLevel, LogLevels, type LogOptions, type LogType, type Logger, type LoggerOptions, type MockData, type MockDataArray, type MockDataArrayFn, type MockDataObject, type MockDataObjectFn, type MockOptions, type MockProperties, type MockPropertiesObject, type MockPropertiesObjectFn, type Mutator, type MutatorObject, NamingConvention, type NormalizedConfig, type NormalizedFormDataType, type NormalizedHonoOptions, type NormalizedHookCommand, type NormalizedHookOptions, type NormalizedInputOptions, type NormalizedJsDocOptions, type NormalizedMutator, type NormalizedOperationOptions, type NormalizedOptions, type NormalizedOutputOptions, type NormalizedOverrideOutput, type NormalizedParamsSerializerOptions, type NormalizedQueryOptions, type NormalizedZodOptions, type OperationOptions, type Options, type OptionsExport, type OptionsFn, OutputClient, type OutputClientFunc, type OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, type OutputOptions, type OverrideInput, type OverrideMockOptions, type OverrideOutput, type OverrideOutputContentType, type PackageJson, type ParamsSerializerOptions, PropertySortOrder, type QueryOptions, RefComponentSuffix, type RefInfo, type ResReqTypesValue, type ResolverValue, type ScalarValue, SchemaType, type SchemaWithConst, type SwaggerParserOptions, type SwrOptions, TEMPLATE_TAG_REGEX, type TsConfigTarget, type Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, type WriteModeProps, type WriteSpecsBuilder, type ZodCoerceType, type ZodDateTimeOptions, type ZodOptions, type ZodTimeOptions, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, dynamicImport, escape, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, getTypedResponse, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, loadFile, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, pascal, removeFiles, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, startMessage, stringify, toObjectString, path as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };

package/dist/index.js

@@ -48208,6 +48208,7 @@ __export(index_exports, {
   getRoute: () => getRoute,
   getRouteAsArray: () => getRouteAsArray,
   getScalar: () => getScalar,
+  getTypedResponse: () => getTypedResponse,
   ibmOpenapiValidator: () => ibmOpenapiValidator,
   ibmOpenapiValidatorErrors: () => ibmOpenapiValidatorErrors,
   ibmOpenapiValidatorWarnings: () => ibmOpenapiValidatorWarnings,
@@ -49471,23 +49472,34 @@ var getEnumNames = (schemaObject) => {
 var getEnumDescriptions = (schemaObject) => {
   return schemaObject?.["x-enumDescriptions"] || schemaObject?.["x-enumdescriptions"] || schemaObject?.["x-enum-descriptions"];
 };
-var getEnum = (value, enumName, names, enumGenerationType, descriptions) => {
+var getEnum = (value, enumName, names, enumGenerationType, descriptions, enumNamingConvention) => {
   if (enumGenerationType === EnumGeneration.CONST)
-    return getTypeConstEnum(value, enumName, names, descriptions);
+    return getTypeConstEnum(
+      value,
+      enumName,
+      names,
+      descriptions,
+      enumNamingConvention
+    );
   if (enumGenerationType === EnumGeneration.ENUM)
-    return getNativeEnum(value, enumName, names);
+    return getNativeEnum(value, enumName, names, enumNamingConvention);
   if (enumGenerationType === EnumGeneration.UNION)
     return getUnion(value, enumName);
   throw new Error(`Invalid enumGenerationType: ${enumGenerationType}`);
 };
-var getTypeConstEnum = (value, enumName, names, descriptions) => {
+var getTypeConstEnum = (value, enumName, names, descriptions, enumNamingConvention) => {
   let enumValue = `export type ${enumName} = typeof ${enumName}[keyof typeof ${enumName}]`;
   if (value.endsWith(" | null")) {
     value = value.replace(" | null", "");
     enumValue += " | null";
   }
   enumValue += ";\n";
-  const implementation = getEnumImplementation(value, names, descriptions);
+  const implementation = getEnumImplementation(
+    value,
+    names,
+    descriptions,
+    enumNamingConvention
+  );
   enumValue += "\n\n";
   enumValue += "// eslint-disable-next-line @typescript-eslint/no-redeclare\n";
   enumValue += `export const ${enumName} = {
@@ -49495,7 +49507,7 @@ ${implementation}} as const;
 `;
   return enumValue;
 };
-var getEnumImplementation = (value, names, descriptions) => {
+var getEnumImplementation = (value, names, descriptions, enumNamingConvention) => {
   if (value === "") return "";
   return [...new Set(value.split(" | "))].reduce((acc, val, index3) => {
     const name = names?.[index3];
@@ -49519,18 +49531,21 @@ var getEnumImplementation = (value, names, descriptions) => {
         special: true
       });
     }
+    if (enumNamingConvention) {
+      key = conventionName(key, enumNamingConvention);
+    }
     return acc + comment + `  ${import_esutils2.keyword.isIdentifierNameES5(key) ? key : `'${key}'`}: ${val},
 `;
   }, "");
 };
-var getNativeEnum = (value, enumName, names) => {
-  const enumItems = getNativeEnumItems(value, names);
+var getNativeEnum = (value, enumName, names, enumNamingConvention) => {
+  const enumItems = getNativeEnumItems(value, names, enumNamingConvention);
   const enumValue = `export enum ${enumName} {
 ${enumItems}
 }`;
   return enumValue;
 };
-var getNativeEnumItems = (value, names) => {
+var getNativeEnumItems = (value, names, enumNamingConvention) => {
   if (value === "") return "";
   return [...new Set(value.split(" | "))].reduce((acc, val, index3) => {
     const name = names?.[index3];
@@ -49551,6 +49566,9 @@ var getNativeEnumItems = (value, names) => {
         special: true
       });
     }
+    if (enumNamingConvention) {
+      key = conventionName(key, enumNamingConvention);
+    }
     return acc + `  ${import_esutils2.keyword.isIdentifierNameES5(key) ? key : `'${key}'`}= ${val},
 `;
   }, "");
@@ -49809,7 +49827,8 @@ var resolveObjectOriginal = ({
       propName,
       getEnumNames(resolvedValue.originalSchema),
       context.output.override.enumGenerationType,
-      getEnumDescriptions(resolvedValue.originalSchema)
+      getEnumDescriptions(resolvedValue.originalSchema),
+      context.output.override.namingConvention?.enum
     );
     return {
       value: propName,
@@ -50107,16 +50126,14 @@ var getFormDataAdditionalImports = ({
   context
 }) => {
   const { schema } = resolveRef(schemaObject, context);
-  if (schema.type === "object") {
-    if (schema.oneOf || schema.anyOf) {
-      const combinedSchemas = schema.oneOf || schema.anyOf;
-      return combinedSchemas.map((schema2) => {
-        const { imports } = resolveRef(schema2, context);
-        return imports[0];
-      });
-    }
+  if (schema.type !== "object") {
+    return [];
+  }
+  const combinedSchemas = schema.oneOf || schema.anyOf;
+  if (!combinedSchemas) {
+    return [];
   }
-  return [];
+  return combinedSchemas.map((schema2) => resolveRef(schema2, context).imports[0]).filter(Boolean);
 };
 var getSchemaFormDataAndUrlEncoded = ({
   name,
@@ -50390,6 +50407,51 @@ var getKey = (key) => {
   return import_esutils4.keyword.isIdentifierNameES5(key) ? key : `'${key}'`;
 };
 
+// src/getters/imports.ts
+var getAliasedImports = ({
+  name,
+  resolvedValue,
+  existingImports,
+  context
+}) => context.output.schemas && resolvedValue.isRef ? resolvedValue.imports.map((imp) => {
+  if (!needCreateImportAlias({
+    name,
+    imp,
+    existingImports
+  })) {
+    return imp;
+  }
+  const specName = pascal(
+    getSpecName(imp.specKey ?? "", context.specKey)
+  );
+  const normalizedSpecName = /^\d/.test(specName) ? `__${specName}` : specName;
+  return {
+    ...imp,
+    alias: `${normalizedSpecName}__${imp.name}`
+  };
+}) : resolvedValue.imports;
+var needCreateImportAlias = ({
+  existingImports,
+  imp,
+  name
+}) => !imp.alias && // !!imp.specKey &&
+(imp.name === name || existingImports.some(
+  (existingImport) => imp.name === existingImport.name && imp.specKey !== existingImport.specKey
+));
+var getImportAliasForRefOrValue = ({
+  context,
+  imports,
+  resolvedValue
+}) => {
+  if (!context.output.schemas || !resolvedValue.isRef) {
+    return resolvedValue.value;
+  }
+  const importWithSameName = imports.find(
+    (imp) => imp.name === resolvedValue.value
+  );
+  return importWithSameName?.alias ?? resolvedValue.value;
+};
+
 // src/getters/object.ts
 var getObject = ({
   item,
@@ -50421,7 +50483,7 @@ var getObject = ({
       nullable
     });
   }
-  if (item.type instanceof Array) {
+  if (Array.isArray(item.type)) {
     return combineSchemas({
       schema: {
         anyOf: item.type.map((type) => ({
@@ -50470,9 +50532,20 @@ var getObject = ({
         }
         const doc = jsDoc(schema, true, context);
         acc.hasReadonlyProps ||= isReadOnly || false;
-        acc.imports.push(...resolvedValue.imports);
+        const aliasedImports = getAliasedImports({
+          name,
+          context,
+          resolvedValue,
+          existingImports: acc.imports
+        });
+        acc.imports.push(...aliasedImports);
+        const propValue = getImportAliasForRefOrValue({
+          context,
+          resolvedValue,
+          imports: aliasedImports
+        });
         acc.value += `
-  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${resolvedValue.value};`;
+  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${propValue};`;
         acc.schemas.push(...resolvedValue.schemas);
         if (arr.length - 1 === index3) {
           if (item.additionalProperties) {
@@ -50567,8 +50640,7 @@ var getScalar = ({
   name,
   context
 }) => {
-  const isAngularClient = context.output.client === OutputClient.ANGULAR;
-  const nullable = item.nullable && !isAngularClient ? " | null" : "";
+  const nullable = item.nullable ? " | null" : "";
   const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
   if (!item.type && item.items) {
     item.type = "array";
@@ -50793,8 +50865,19 @@ var combineSchemas = ({
         combined: true,
         context
       });
-      acc.values.push(resolvedValue2.value);
-      acc.imports.push(...resolvedValue2.imports);
+      const aliasedImports = getAliasedImports({
+        context,
+        name,
+        resolvedValue: resolvedValue2,
+        existingImports: acc.imports
+      });
+      const value2 = getImportAliasForRefOrValue({
+        context,
+        resolvedValue: resolvedValue2,
+        imports: aliasedImports
+      });
+      acc.values.push(value2);
+      acc.imports.push(...aliasedImports);
       acc.schemas.push(...resolvedValue2.schemas);
       acc.isEnum.push(resolvedValue2.isEnum);
       acc.types.push(resolvedValue2.type);
@@ -51090,8 +51173,8 @@ var getProps = ({
   };
   const queryParamsProp = {
     name: "params",
-    definition: `params${queryParams?.isOptional || context.output.allParamsOptional ? "?" : ""}: ${queryParams?.schema.name}`,
-    implementation: `params${queryParams?.isOptional || context.output.allParamsOptional ? "?" : ""}: ${queryParams?.schema.name}`,
+    definition: getQueryParamDefinition(queryParams, context),
+    implementation: getQueryParamDefinition(queryParams, context),
     default: false,
     required: !isUndefined(queryParams?.isOptional) ? !queryParams?.isOptional && !context.output.allParamsOptional : !context.output.allParamsOptional,
     type: GetterPropType.QUERY_PARAM
@@ -51147,6 +51230,13 @@ var getProps = ({
   const sortedProps = sortByPriority(props);
   return sortedProps;
 };
+function getQueryParamDefinition(queryParams, context) {
+  let paramType = queryParams?.schema.name;
+  if (OutputClient.ANGULAR === context.output.client) {
+    paramType = `DeepNonNullable<${paramType}>`;
+  }
+  return `params${queryParams?.isOptional || context.output.allParamsOptional ? "?" : ""}: ${paramType}`;
+}
 
 // src/getters/query-params.ts
 var getQueryParamsTypes = (queryParams, operationName, context) => {
@@ -51194,7 +51284,8 @@ var getQueryParamsTypes = (queryParams, operationName, context) => {
         enumName,
         getEnumNames(resolvedValue.originalSchema),
         context.output.override.enumGenerationType,
-        getEnumDescriptions(resolvedValue.originalSchema)
+        getEnumDescriptions(resolvedValue.originalSchema),
+        context.output.override.namingConvention?.enum
       );
       return {
         definition: `${doc}${key}${!required || schema.default ? "?" : ""}: ${enumName};`,
@@ -51269,8 +51360,8 @@ var getResponse = ({
     Object.entries(responses),
     operationName,
     context,
-    "void",
-    (type) => type.key.startsWith("2") + type.value
+    "null",
+    (type) => `${type.key}-${type.value}`
   );
   const filteredTypes = contentType ? types.filter((type) => {
     let include = true;
@@ -51893,7 +51984,7 @@ var generateAxiosOptions = ({
   paramsSerializerOptions
 }) => {
   const isRequestOptions = requestOptions !== false;
-  if (!queryParams && !headers && !response.isBlob) {
+  if (!queryParams && !headers && !response.isBlob && response.definition.success !== "string") {
     if (isRequestOptions) {
       return "options";
     }
@@ -51914,9 +52005,14 @@ var generateAxiosOptions = ({
       value += !isExactOptionalPropertyTypes ? "\n        signal," : "\n        ...(signal ? { signal } : {}),";
     }
   }
-  if (response.isBlob && (!isObject(requestOptions) || !requestOptions.hasOwnProperty("responseType"))) {
-    value += `
+  if (!isObject(requestOptions) || !requestOptions.hasOwnProperty("responseType")) {
+    if (response.isBlob) {
+      value += `
         responseType: 'blob',`;
+    } else if (response.definition.success === "string") {
+      value += `
+        responseType: 'text',`;
+    }
   }
   if (isObject(requestOptions)) {
     value += `
@@ -52174,7 +52270,7 @@ export type ${name} = typeof ${name}Value;
 `;
   }
   const externalModulesImportsOnly = scalar.imports.filter(
-    (importName) => importName.name !== name
+    (importName) => importName.alias ? importName.alias !== name : importName.name !== name
   );
   return [
     ...scalar.schemas,
@@ -52236,7 +52332,8 @@ var generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
           schemaName,
           getEnumNames(resolvedValue.originalSchema),
           context.output.override.enumGenerationType,
-          getEnumDescriptions(resolvedValue.originalSchema)
+          getEnumDescriptions(resolvedValue.originalSchema),
+          context.output.override.namingConvention?.enum
         );
       } else if (schemaName === resolvedValue.value && resolvedValue.isRef) {
         const { schema: referredSchema } = resolveRef(schema, context);
@@ -52384,6 +52481,13 @@ var generateVerbOptions = async ({
     workspace: context.workspace,
     tsconfig: context.output.tsconfig
   }) : void 0;
+  const fetchReviver = isString2(override?.fetch.jsonReviver) || isObject(override?.fetch.jsonReviver) ? await generateMutator({
+    output: output.target,
+    name: "fetchReviver",
+    mutator: override.fetch.jsonReviver,
+    workspace: context.workspace,
+    tsconfig: context.output.tsconfig
+  }) : void 0;
   const doc = jsDoc({ description, deprecated, summary });
   const verbOption = {
     verb,
@@ -52403,6 +52507,7 @@ var generateVerbOptions = async ({
     formData,
     formUrlEncoded,
     paramsSerializer,
+    fetchReviver,
     override,
     doc,
     deprecated,
@@ -52614,6 +52719,11 @@ type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
     : T[P];
 } : DistributeReadOnlyOverUnions<T>;
 `;
+var getTypedResponse = () => `
+interface TypedResponse<T> extends Response {
+  json(): Promise<T>;
+}
+`;
 
 // src/writers/single-mode.ts
 var import_fs_extra3 = __toESM(require("fs-extra"));
@@ -52661,6 +52771,9 @@ var generateTarget = (builder, options) => {
       if (operation.clientMutators) {
         acc.clientMutators.push(...operation.clientMutators);
       }
+      if (operation.fetchReviver) {
+        acc.fetchReviver.push(operation.fetchReviver);
+      }
       if (index3 === arr.length - 1) {
         const isMutator = acc.mutators.some(
           (mutator) => isAngularClient ? mutator.hasThirdArg : mutator.hasSecondArg
@@ -52707,7 +52820,8 @@ var generateTarget = (builder, options) => {
       clientMutators: [],
       formData: [],
       formUrlEncoded: [],
-      paramsSerializer: []
+      paramsSerializer: [],
+      fetchReviver: []
     }
   );
   return {
@@ -52741,7 +52855,8 @@ var writeSingleMode = async ({
       clientMutators,
       formData,
       formUrlEncoded,
-      paramsSerializer
+      paramsSerializer,
+      fetchReviver
     } = generateTarget(builder, output);
     let data = header;
     const schemasPath = output.schemas ? path_exports.relativeSafe(
@@ -52799,10 +52914,17 @@ var writeSingleMode = async ({
     if (paramsSerializer) {
       data += generateMutatorImports({ mutators: paramsSerializer });
     }
+    if (fetchReviver) {
+      data += generateMutatorImports({ mutators: fetchReviver });
+    }
     if (implementation.includes("NonReadonly<")) {
       data += getOrvalGeneratedTypes();
       data += "\n";
     }
+    if (implementation.includes("TypedResponse<")) {
+      data += getTypedResponse();
+      data += "\n";
+    }
     if (!output.schemas && needSchema) {
       data += generateModelsInline(builder.schemas);
     }
@@ -52845,7 +52967,8 @@ var writeSplitMode = async ({
       clientMutators,
       formData,
       formUrlEncoded,
-      paramsSerializer
+      paramsSerializer,
+      fetchReviver
     } = generateTarget(builder, output);
     let implementationData = header;
     let mockData = header;
@@ -52921,8 +53044,18 @@ var writeSplitMode = async ({
         mutators: paramsSerializer
       });
     }
+    if (fetchReviver) {
+      implementationData += generateMutatorImports({
+        mutators: fetchReviver
+      });
+    }
     if (implementation.includes("NonReadonly<")) {
       implementationData += getOrvalGeneratedTypes();
+      implementationData += "\n";
+    }
+    if (implementation.includes("TypedResponse<")) {
+      implementationData += getTypedResponse();
+      implementationData += "\n";
     }
     implementationData += `
 ${implementation}`;
@@ -52971,6 +53104,7 @@ var generateTargetTags = (currentAcc, operation) => {
       formData: operation.formData ? [operation.formData] : [],
       formUrlEncoded: operation.formUrlEncoded ? [operation.formUrlEncoded] : [],
       paramsSerializer: operation.paramsSerializer ? [operation.paramsSerializer] : [],
+      fetchReviver: operation.fetchReviver ? [operation.fetchReviver] : [],
       implementation: operation.implementation,
       implementationMock: {
         function: operation.implementationMock.function,
@@ -52999,7 +53133,8 @@ var generateTargetTags = (currentAcc, operation) => {
     paramsSerializer: operation.paramsSerializer ? [
       ...currentOperation.paramsSerializer ?? [],
       operation.paramsSerializer
-    ] : currentOperation.paramsSerializer
+    ] : currentOperation.paramsSerializer,
+    fetchReviver: operation.fetchReviver ? [...currentOperation.fetchReviver ?? [], operation.fetchReviver] : currentOperation.fetchReviver
   };
   return currentAcc;
 };
@@ -53056,7 +53191,8 @@ var generateTargetForTags = (builder, options) => {
             clientMutators: target.clientMutators,
             formData: target.formData,
             formUrlEncoded: target.formUrlEncoded,
-            paramsSerializer: target.paramsSerializer
+            paramsSerializer: target.paramsSerializer,
+            fetchReviver: target.fetchReviver
           };
           return acc2;
         }, {});
@@ -53111,6 +53247,7 @@ var writeSplitTagsMode = async ({
           mutators,
           clientMutators,
           formData,
+          fetchReviver,
           formUrlEncoded,
           paramsSerializer
         } = target2;
@@ -53189,10 +53326,20 @@ var writeSplitTagsMode = async ({
             oneMore: true
           });
         }
+        if (fetchReviver) {
+          implementationData += generateMutatorImports({
+            mutators: fetchReviver,
+            oneMore: true
+          });
+        }
         if (implementation.includes("NonReadonly<")) {
           implementationData += getOrvalGeneratedTypes();
           implementationData += "\n";
         }
+        if (implementation.includes("TypedResponse<")) {
+          implementationData += getTypedResponse();
+          implementationData += "\n";
+        }
         implementationData += `
 ${implementation}`;
         mockData += `
@@ -53263,6 +53410,7 @@ var writeTagsMode = async ({
           clientMutators,
           formData,
           formUrlEncoded,
+          fetchReviver,
           paramsSerializer
         } = target2;
         let data = header;
@@ -53329,11 +53477,18 @@ var writeTagsMode = async ({
         if (paramsSerializer) {
           data += generateMutatorImports({ mutators: paramsSerializer });
         }
+        if (fetchReviver) {
+          data += generateMutatorImports({ mutators: fetchReviver });
+        }
         data += "\n\n";
         if (implementation.includes("NonReadonly<")) {
           data += getOrvalGeneratedTypes();
           data += "\n";
         }
+        if (implementation.includes("TypedResponse<")) {
+          data += getTypedResponse();
+          data += "\n";
+        }
         data += implementation;
         if (output.mock) {
           data += "\n\n";
@@ -53434,6 +53589,7 @@ var writeTagsMode = async ({
   getRoute,
   getRouteAsArray,
   getScalar,
+  getTypedResponse,
   ibmOpenapiValidator,
   ibmOpenapiValidatorErrors,
   ibmOpenapiValidatorWarnings,