@orval/core 7.9.0 → 7.11.0

package/dist/index.js

@@ -6594,6 +6594,7 @@ function createScanner(text, ignoreTrivia) {
       return token = 14;
     }
     switch (code) {
+      // tokens: []{}:,
       case 123:
         pos++;
         return token = 1;
@@ -6612,10 +6613,12 @@ function createScanner(text, ignoreTrivia) {
       case 44:
         pos++;
         return token = 5;
+      // strings
       case 34:
         pos++;
         value = scanString();
         return token = 10;
+      // comments
       case 47:
         var start = pos - 1;
         if (text.charCodeAt(pos + 1) === 47) {
@@ -6659,12 +6662,16 @@ function createScanner(text, ignoreTrivia) {
         value += String.fromCharCode(code);
         pos++;
         return token = 16;
+      // numbers
       case 45:
         value += String.fromCharCode(code);
         pos++;
         if (pos === len || !isDigit(text.charCodeAt(pos))) {
           return token = 16;
         }
+      // found a minus, followed by a number so
+      // we fall through to proceed with scanning
+      // numbers
       case 48:
       case 49:
       case 50:
@@ -6677,6 +6684,7 @@ function createScanner(text, ignoreTrivia) {
       case 57:
         value += scanNumber();
         return token = 11;
+      // literals and unknown symbols
       default:
         while (pos < len && isUnknownContentCharacter(code)) {
           pos++;
@@ -24963,6 +24971,7 @@ var require_immer_cjs_development = __commonJS({
               switch (type) {
                 case 2:
                   return base2.set(key, value);
+                /* istanbul ignore next */
                 case 3:
                   die(16);
                 default:
@@ -27628,6 +27637,7 @@ var require_URI = __commonJS({
         switch (getType(value)) {
           case "Undefined":
             return name in data;
+          // data[name] !== undefined;
           case "Boolean":
             var _booly = Boolean(isArray(data[name]) ? data[name].length : data[name]);
             return value === _booly;
@@ -27649,6 +27659,7 @@ var require_URI = __commonJS({
             return arrayContains(data[name], value);
           case "Number":
             value = String(value);
+          /* falls through */
           case "String":
             if (!isArray(data[name])) {
               return data[name] === value;
@@ -27942,6 +27953,7 @@ var require_URI = __commonJS({
             return relative;
           case "absolute":
             return !relative;
+          // hostname identification
           case "domain":
           case "name":
             return name;
@@ -32546,6 +32558,7 @@ var require_index_node_cjs = __commonJS({
               addType = true;
             }
             break;
+          /* c8 ignore next 2 */
           default:
             throw new TypeError("Unknown value type " + valueType);
         }
@@ -41722,6 +41735,7 @@ var require_minimatch = __commonJS({
           continue;
         }
         switch (c2) {
+          /* istanbul ignore next */
           case "/": {
             return false;
           }
@@ -41729,6 +41743,8 @@ var require_minimatch = __commonJS({
             clearStateChar();
             escaping = true;
             continue;
+          // the various stateChar values
+          // for the "extglob" stuff.
           case "?":
           case "*":
           case "+":
@@ -41789,6 +41805,7 @@ var require_minimatch = __commonJS({
             clearStateChar();
             re2 += "|";
             continue;
+          // these are mostly the same in regexp and glob
           case "[":
             clearStateChar();
             if (inClass) {
@@ -44302,7 +44319,7 @@ var require_get_intrinsic = __commonJS({
             if (!allowMissing) {
               throw new $TypeError("base intrinsic for " + name + " exists, but the property is not available.");
             }
-            return void 0;
+            return void undefined2;
           }
           if ($gOPD && i3 + 1 >= parts.length) {
             var desc = $gOPD(value, part);
@@ -48109,8 +48126,8 @@ var require_dist10 = __commonJS({
 });
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   BODY_TYPE_NAME: () => BODY_TYPE_NAME,
   EnumGeneration: () => EnumGeneration,
   FormDataArrayHandling: () => FormDataArrayHandling,
@@ -48167,6 +48184,7 @@ __export(src_exports, {
   getArray: () => getArray,
   getBody: () => getBody,
   getEnum: () => getEnum,
+  getEnumDescriptions: () => getEnumDescriptions,
   getEnumImplementation: () => getEnumImplementation,
   getEnumNames: () => getEnumNames,
   getExtension: () => getExtension,
@@ -48190,6 +48208,7 @@ __export(src_exports, {
   getRoute: () => getRoute,
   getRouteAsArray: () => getRouteAsArray,
   getScalar: () => getScalar,
+  getTypedResponse: () => getTypedResponse,
   ibmOpenapiValidator: () => ibmOpenapiValidator,
   ibmOpenapiValidatorErrors: () => ibmOpenapiValidatorErrors,
   ibmOpenapiValidatorWarnings: () => ibmOpenapiValidatorWarnings,
@@ -48212,6 +48231,7 @@ __export(src_exports, {
   jsDoc: () => jsDoc,
   jsStringEscape: () => jsStringEscape,
   kebab: () => kebab,
+  keyValuePairsToJsDoc: () => keyValuePairsToJsDoc,
   loadFile: () => loadFile,
   log: () => log,
   logError: () => logError,
@@ -48242,7 +48262,7 @@ __export(src_exports, {
   writeSplitTagsMode: () => writeSplitTagsMode,
   writeTagsMode: () => writeTagsMode
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/types.ts
 var PropertySortOrder = {
@@ -49071,21 +49091,28 @@ var compareVersions = (firstVersion, secondVersions, operator = ">=") => {
 var search = "\\*/";
 var replacement = "*\\/";
 var regex = new RegExp(search, "g");
-function jsDoc({
-  description,
-  deprecated,
-  summary,
-  minLength,
-  maxLength,
-  minimum,
-  maximum,
-  exclusiveMinimum,
-  exclusiveMaximum,
-  minItems,
-  maxItems,
-  nullable,
-  pattern
-}, tryOneLine = false) {
+function jsDoc(schema, tryOneLine = false, context) {
+  if (context?.output?.override?.jsDoc) {
+    const { filter: filter2 } = context.output.override.jsDoc;
+    if (filter2) {
+      return keyValuePairsToJsDoc(filter2(schema));
+    }
+  }
+  const {
+    description,
+    deprecated,
+    summary,
+    minLength,
+    maxLength,
+    minimum,
+    maximum,
+    exclusiveMinimum,
+    exclusiveMaximum,
+    minItems,
+    maxItems,
+    nullable,
+    pattern
+  } = schema;
   const lines = (Array.isArray(description) ? description.filter((d2) => !d2.includes("eslint-disable")) : [description || ""]).map((line) => line.replace(regex, replacement));
   const count2 = [
     description,
@@ -49157,6 +49184,16 @@ ${tryOneLine ? "  " : ""} *`;
   doc += "*/\n";
   return doc;
 }
+function keyValuePairsToJsDoc(keyValues) {
+  if (!keyValues.length) return "";
+  let doc = "/**\n";
+  keyValues.forEach(({ key, value }) => {
+    doc += ` * @${key} ${value}
+`;
+  });
+  doc += " */\n";
+  return doc;
+}
 
 // src/utils/dynamic-import.ts
 var import_url = require("url");
@@ -49373,6 +49410,7 @@ var jsStringEscape = (input) => input.replace(/["'\\\n\r\u2028\u2029]/g, (charac
     case "'":
     case "\\":
       return "\\" + character;
+    // Four possible LineTerminator characters need to be escaped:
     case "\n":
       return "\\n";
     case "\r":
@@ -49431,38 +49469,53 @@ var getIsBodyVerb = (verb) => VERBS_WITH_BODY.includes(verb);
 var getEnumNames = (schemaObject) => {
   return schemaObject?.["x-enumNames"] || schemaObject?.["x-enumnames"] || schemaObject?.["x-enum-varnames"];
 };
-var getEnum = (value, enumName, names, enumGenerationType) => {
+var getEnumDescriptions = (schemaObject) => {
+  return schemaObject?.["x-enumDescriptions"] || schemaObject?.["x-enumdescriptions"] || schemaObject?.["x-enum-descriptions"];
+};
+var getEnum = (value, enumName, names, enumGenerationType, descriptions, enumNamingConvention) => {
   if (enumGenerationType === EnumGeneration.CONST)
-    return getTypeConstEnum(value, enumName, names);
+    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) => {
+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);
-  enumValue += `
-
-`;
+  const implementation = getEnumImplementation(
+    value,
+    names,
+    descriptions,
+    enumNamingConvention
+  );
+  enumValue += "\n\n";
   enumValue += "// eslint-disable-next-line @typescript-eslint/no-redeclare\n";
   enumValue += `export const ${enumName} = {
 ${implementation}} as const;
 `;
   return enumValue;
 };
-var getEnumImplementation = (value, names) => {
+var getEnumImplementation = (value, names, descriptions, enumNamingConvention) => {
   if (value === "") return "";
   return [...new Set(value.split(" | "))].reduce((acc, val, index3) => {
     const name = names?.[index3];
+    const description = descriptions?.[index3];
+    const comment = description ? `  /** ${description} */
+` : "";
     if (name) {
-      return acc + `  ${import_esutils2.keyword.isIdentifierNameES5(name) ? name : `'${name}'`}: ${val},
+      return acc + comment + `  ${import_esutils2.keyword.isIdentifierNameES5(name) ? name : `'${name}'`}: ${val},
 `;
     }
     let key = val.startsWith("'") ? val.slice(1, -1) : val;
@@ -49478,18 +49531,21 @@ var getEnumImplementation = (value, names) => {
         special: true
       });
     }
-    return acc + `  ${import_esutils2.keyword.isIdentifierNameES5(key) ? key : `'${key}'`}: ${val},
+    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];
@@ -49510,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},
 `;
   }, "");
@@ -49767,7 +49826,9 @@ var resolveObjectOriginal = ({
       resolvedValue.value,
       propName,
       getEnumNames(resolvedValue.originalSchema),
-      context.output.override.enumGenerationType
+      context.output.override.enumGenerationType,
+      getEnumDescriptions(resolvedValue.originalSchema),
+      context.output.override.namingConvention?.enum
     );
     return {
       value: propName,
@@ -50065,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,
@@ -50163,6 +50222,9 @@ var resolveSchemaPropertiesToFormData = ({
   const formDataValues = Object.entries(schema.properties ?? {}).reduce(
     (acc, [key, value]) => {
       const { schema: property } = resolveRef(value, context);
+      if (property.readOnly) {
+        return acc;
+      }
       let formDataValue = "";
       const formattedKeyPrefix = !isRequestBodyOptional ? "" : !import_esutils3.keyword.isIdentifierNameES5(key) ? "?." : "?";
       const formattedKey = !import_esutils3.keyword.isIdentifierNameES5(key) ? `['${key}']` : `.${key}`;
@@ -50345,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,
@@ -50376,7 +50483,7 @@ var getObject = ({
       nullable
     });
   }
-  if (item.type instanceof Array) {
+  if (Array.isArray(item.type)) {
     return combineSchemas({
       schema: {
         anyOf: item.type.map((type) => ({
@@ -50423,11 +50530,22 @@ var getObject = ({
         if (!index3) {
           acc.value += "{";
         }
-        const doc = jsDoc(schema, true);
+        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) {
@@ -50522,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";
@@ -50748,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);
@@ -50857,7 +50985,8 @@ var getCombineEnumValue = ({
       return `...${e3},`;
     }
     const names = getEnumNames(originalSchema[i3]);
-    return getEnumImplementation(e3, names);
+    const descriptions = getEnumDescriptions(originalSchema[i3]);
+    return getEnumImplementation(e3, names, descriptions);
   }).join("");
   return `{${enums}} as const`;
 };
@@ -51044,10 +51173,10 @@ var getProps = ({
   };
   const queryParamsProp = {
     name: "params",
-    definition: `params${queryParams?.isOptional ? "?" : ""}: ${queryParams?.schema.name}`,
-    implementation: `params${queryParams?.isOptional ? "?" : ""}: ${queryParams?.schema.name}`,
+    definition: getQueryParamDefinition(queryParams, context),
+    implementation: getQueryParamDefinition(queryParams, context),
     default: false,
-    required: !isUndefined(queryParams?.isOptional) ? !queryParams?.isOptional : false,
+    required: !isUndefined(queryParams?.isOptional) ? !queryParams?.isOptional && !context.output.allParamsOptional : !context.output.allParamsOptional,
     type: GetterPropType.QUERY_PARAM
   };
   const headersProp = {
@@ -51101,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) => {
@@ -51125,7 +51261,14 @@ var getQueryParamsTypes = (queryParams, operationName, context) => {
       name: queryName
     });
     const key = getKey(name);
-    const doc = jsDoc(parameter);
+    const doc = jsDoc(
+      {
+        description: parameter.description,
+        ...schema
+      },
+      void 0,
+      context
+    );
     if (parameterImports.length) {
       return {
         definition: `${doc}${key}${!required || schema.default ? "?" : ""}: ${parameterImports[0].name};`,
@@ -51140,7 +51283,9 @@ var getQueryParamsTypes = (queryParams, operationName, context) => {
         resolvedValue.value,
         enumName,
         getEnumNames(resolvedValue.originalSchema),
-        context.output.override.enumGenerationType
+        context.output.override.enumGenerationType,
+        getEnumDescriptions(resolvedValue.originalSchema),
+        context.output.override.namingConvention?.enum
       );
       return {
         definition: `${doc}${key}${!required || schema.default ? "?" : ""}: ${enumName};`,
@@ -51215,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;
@@ -51839,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";
     }
@@ -51860,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 += `
@@ -52106,7 +52256,7 @@ var generateInterface = ({
   }
   if (scalar.type === "object" && !context?.output.override?.useTypeOverInterfaces) {
     if (scalar.type === "object" && schema.properties && Object.values(schema.properties).length > 0 && Object.values(schema.properties).every((item) => "const" in item)) {
-      const mappedScalarValue = scalar.value.replaceAll(";", ",");
+      const mappedScalarValue = scalar.value.replaceAll(";", ",").replaceAll("?:", ":");
       model += `export const ${name}Value = ${mappedScalarValue} as const;
 export type ${name} = typeof ${name}Value;
 `;
@@ -52120,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,
@@ -52181,7 +52331,9 @@ var generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
           resolvedValue.value,
           schemaName,
           getEnumNames(resolvedValue.originalSchema),
-          context.output.override.enumGenerationType
+          context.output.override.enumGenerationType,
+          getEnumDescriptions(resolvedValue.originalSchema),
+          context.output.override.namingConvention?.enum
         );
       } else if (schemaName === resolvedValue.value && resolvedValue.isRef) {
         const { schema: referredSchema } = resolveRef(schema, context);
@@ -52329,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,
@@ -52348,6 +52507,7 @@ var generateVerbOptions = async ({
     formData,
     formUrlEncoded,
     paramsSerializer,
+    fetchReviver,
     override,
     doc,
     deprecated,
@@ -52559,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"));
@@ -52606,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
@@ -52652,7 +52820,8 @@ var generateTarget = (builder, options) => {
       clientMutators: [],
       formData: [],
       formUrlEncoded: [],
-      paramsSerializer: []
+      paramsSerializer: [],
+      fetchReviver: []
     }
   );
   return {
@@ -52686,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(
@@ -52744,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);
     }
@@ -52790,7 +52967,8 @@ var writeSplitMode = async ({
       clientMutators,
       formData,
       formUrlEncoded,
-      paramsSerializer
+      paramsSerializer,
+      fetchReviver
     } = generateTarget(builder, output);
     let implementationData = header;
     let mockData = header;
@@ -52866,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}`;
@@ -52916,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,
@@ -52944,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;
 };
@@ -53001,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;
         }, {});
@@ -53056,6 +53247,7 @@ var writeSplitTagsMode = async ({
           mutators,
           clientMutators,
           formData,
+          fetchReviver,
           formUrlEncoded,
           paramsSerializer
         } = target2;
@@ -53134,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 += `
@@ -53208,6 +53410,7 @@ var writeTagsMode = async ({
           clientMutators,
           formData,
           formUrlEncoded,
+          fetchReviver,
           paramsSerializer
         } = target2;
         let data = header;
@@ -53274,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";
@@ -53355,6 +53565,7 @@ var writeTagsMode = async ({
   getArray,
   getBody,
   getEnum,
+  getEnumDescriptions,
   getEnumImplementation,
   getEnumNames,
   getExtension,
@@ -53378,6 +53589,7 @@ var writeTagsMode = async ({
   getRoute,
   getRouteAsArray,
   getScalar,
+  getTypedResponse,
   ibmOpenapiValidator,
   ibmOpenapiValidatorErrors,
   ibmOpenapiValidatorWarnings,
@@ -53400,6 +53612,7 @@ var writeTagsMode = async ({
   jsDoc,
   jsStringEscape,
   kebab,
+  keyValuePairsToJsDoc,
   loadFile,
   log,
   logError,