@orval/core 6.24.0 → 6.26.0

package/README.md

@@ -26,3 +26,4 @@ You can find below some samples
 - [react app with swr](https://github.com/anymaniax/orval/tree/master/samples/react-app-with-swr)
 - [nx fastify react](https://github.com/anymaniax/orval/tree/master/samples/nx-fastify-react)
 - [angular app](https://github.com/anymaniax/orval/tree/master/samples/angular-app)
+- [hono](https://github.com/anymaniax/orval/tree/master/samples/hono)

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import * as openapi3_ts_oas30 from 'openapi3-ts/oas30';
 import { InfoObject, OperationObject, OpenAPIObject, ResponsesObject, ReferenceObject, RequestBodyObject, ParameterObject, SchemaObject, ComponentsObject, SchemasObject, PathItemObject, ResponseObject, ExampleObject } from 'openapi3-ts/oas30';
 import swagger2openapi from 'swagger2openapi';
 import { allLocales } from '@faker-js/faker';
+import { ValueIteratee } from 'lodash';
 import { CompareOperator } from 'compare-versions';
 import debug from 'debug';
 
@@ -81,6 +82,7 @@ type NormalizedOverrideOutput = {
             suffix: string;
         };
     };
+    hono: NormalizedHonoOptions;
     query: NormalizedQueryOptions;
     angular: Required<AngularOptions>;
     swr: SwrOptions;
@@ -104,15 +106,13 @@ type NormalizedOperationOptions = {
     transformer?: OutputTransformer;
     mutator?: NormalizedMutator;
     mock?: {
-        data?: MockProperties;
+        data?: MockData;
         properties?: MockProperties;
     };
     contentType?: OverrideOutputContentType;
     query?: NormalizedQueryOptions;
     angular?: Required<AngularOptions>;
-    swr?: {
-        options?: any;
-    };
+    swr?: SwrOptions;
     operationName?: (operation: OperationObject, route: string, verb: Verbs) => string;
     formData?: boolean | NormalizedMutator;
     formUrlEncoded?: boolean | NormalizedMutator;
@@ -172,6 +172,7 @@ declare const OutputClient: {
     readonly VUE_QUERY: "vue-query";
     readonly SWR: "swr";
     readonly ZOD: "zod";
+    readonly HONO: "hono";
 };
 type OutputClient = (typeof OutputClient)[keyof typeof OutputClient];
 declare const OutputMode: {
@@ -208,11 +209,18 @@ type MockOptions = Omit<OverrideMockOptions, 'properties'> & {
         properties: Record<string, unknown>;
     }>;
 };
-type MockProperties = {
+type MockPropertiesObject = {
     [key: string]: unknown;
-} | ((specs: OpenAPIObject) => {
+};
+type MockPropertiesObjectFn = (specs: OpenAPIObject) => MockPropertiesObject;
+type MockProperties = MockPropertiesObject | MockPropertiesObjectFn;
+type MockDataObject = {
     [key: string]: unknown;
-});
+};
+type MockDataObjectFn = (specs: OpenAPIObject) => MockDataObject;
+type MockDataArray = unknown[];
+type MockDataArrayFn = (specs: OpenAPIObject) => MockDataArray;
+type MockData = MockDataObject | MockDataObjectFn | MockDataArray | MockDataArrayFn;
 type OutputTransformerFn = (verb: GeneratorVerbOptions) => GeneratorVerbOptions;
 type OutputTransformer = string | OutputTransformerFn;
 type MutatorObject = {
@@ -257,6 +265,7 @@ type OverrideOutput = {
             suffix?: string;
         };
     };
+    hono?: HonoOptions;
     query?: QueryOptions;
     swr?: SwrOptions;
     angular?: AngularOptions;
@@ -273,6 +282,12 @@ type OverrideOutputContentType = {
     include?: string[];
     exclude?: string[];
 };
+type NormalizedHonoOptions = {
+    handlers?: string;
+};
+type HonoOptions = {
+    handlers?: string;
+};
 type NormalizedQueryOptions = {
     useQuery?: boolean;
     useSuspenseQuery?: boolean;
@@ -309,8 +324,10 @@ type AngularOptions = {
     provideIn?: 'root' | 'any' | boolean;
 };
 type SwrOptions = {
-    options?: any;
     useInfinite?: boolean;
+    swrOptions?: any;
+    swrMutationOptions?: any;
+    swrInfiniteOptions?: any;
 };
 type InputTransformerFn = (spec: OpenAPIObject) => OpenAPIObject;
 type InputTransformer = string | InputTransformerFn;
@@ -321,7 +338,7 @@ type OperationOptions = {
     transformer?: OutputTransformer;
     mutator?: Mutator;
     mock?: {
-        data?: MockProperties;
+        data?: MockData;
         properties?: MockProperties;
     };
     query?: QueryOptions;
@@ -469,6 +486,8 @@ type GeneratorOperation = {
 };
 type GeneratorVerbOptions = {
     verb: Verbs;
+    route: string;
+    pathRoute: string;
     summary?: string;
     doc: string;
     tags: string[];
@@ -518,6 +537,11 @@ type GeneratorMutator = {
     bodyTypeName?: string;
 };
 type ClientBuilder = (verbOptions: GeneratorVerbOptions, options: GeneratorOptions, outputClient: OutputClient | OutputClientFunc, output?: NormalizedOutputOptions) => GeneratorClient | Promise<GeneratorClient>;
+type ClientFileBuilder = {
+    path: string;
+    content: string;
+};
+type ClientExtraFilesBuilder = (verbOptions: Record<string, GeneratorVerbOptions>, output: NormalizedOutputOptions, context: ContextSpecs) => Promise<ClientFileBuilder[]>;
 type ClientHeaderBuilder = (params: {
     title: string;
     isRequestOptions: boolean;
@@ -526,6 +550,10 @@ type ClientHeaderBuilder = (params: {
     isGlobalMutator: boolean;
     provideIn: boolean | 'root' | 'any';
     hasAwaitedType: boolean;
+    output: NormalizedOutputOptions;
+    verbOptions: Record<string, GeneratorVerbOptions>;
+    tag?: string;
+    clientImplementation: string;
 }) => string;
 type ClientFooterBuilder = (params: {
     noFunction?: boolean | undefined;
@@ -546,6 +574,7 @@ interface ClientGeneratorsBuilder {
     dependencies?: ClientDependenciesBuilder;
     footer?: ClientFooterBuilder;
     title?: ClientTitleBuilder;
+    extraFiles?: ClientExtraFilesBuilder;
 }
 type GeneratorClients = Record<OutputClient, ClientGeneratorsBuilder>;
 type GetterResponse = {
@@ -572,6 +601,7 @@ type GetterBody = {
     formData?: string;
     formUrlEncoded?: string;
     contentType: string;
+    isOptional: boolean;
 };
 type GetterParameters = {
     query: {
@@ -663,11 +693,13 @@ type ResReqTypesValue = ScalarValue & {
 type WriteSpecsBuilder = {
     operations: GeneratorOperations;
     schemas: Record<string, GeneratorSchema[]>;
+    verbOptions: Record<string, GeneratorVerbOptions>;
     title: GeneratorClientTitle;
     header: GeneratorClientHeader;
     footer: GeneratorClientFooter;
     imports: GeneratorClientImports;
     importsMock: GenerateMockImports;
+    extraFiles: ClientFileBuilder[];
     info: InfoObject;
     target: string;
 };
@@ -680,6 +712,7 @@ type WriteModeProps = {
     needSchema: boolean;
 };
 type GeneratorApiOperations = {
+    verbOptions: Record<string, GeneratorVerbOptions>;
     operations: GeneratorOperations;
     schemas: GeneratorSchema[];
 };
@@ -702,6 +735,9 @@ type GeneratorClientHeader = (data: {
     hasAwaitedType: boolean;
     titles: GeneratorClientExtra;
     output: NormalizedOutputOptions;
+    verbOptions: Record<string, GeneratorVerbOptions>;
+    tag?: string;
+    clientImplementation: string;
 }) => GeneratorClientExtra;
 type GeneratorClientFooter = (data: {
     outputClient: OutputClient | OutputClientFunc;
@@ -743,6 +779,7 @@ type GeneratorApiBuilder = GeneratorApiOperations & {
     footer: GeneratorClientFooter;
     imports: GeneratorClientImports;
     importsMock: GenerateMockImports;
+    extraFiles: ClientFileBuilder[];
 };
 
 declare const generalJSTypes: string[];
@@ -853,11 +890,12 @@ declare const generateParameterDefinition: (parameters: ComponentsObject['parame
  */
 declare const generateSchemasDefinition: (schemas: SchemasObject | undefined, context: ContextSpecs, suffix: string) => GeneratorSchema[];
 
-declare const generateVerbsOptions: ({ verbs, input, output, route, context, }: {
+declare const generateVerbsOptions: ({ verbs, input, output, route, pathRoute, context, }: {
     verbs: PathItemObject;
     input: NormalizedInputOptions;
     output: NormalizedOutputOptions;
     route: string;
+    pathRoute: string;
     context: ContextSpecs;
 }) => Promise<GeneratorVerbsOptions>;
 declare const _filteredVerbs: (verbs: PathItemObject, filters: NormalizedInputOptions['filters']) => [string, any][];
@@ -977,7 +1015,7 @@ declare const getRefInfo: ($ref: ReferenceObject['$ref'], context: ContextSpecs)
 declare const getResReqTypes: (responsesOrRequests: Array<[
     string,
     ResponseObject | ReferenceObject | RequestBodyObject
-]>, name: string, context: ContextSpecs, defaultType?: string) => ResReqTypesValue[];
+]>, name: string, context: ContextSpecs, defaultType?: string, uniqueKey?: ValueIteratee<ResReqTypesValue>) => ResReqTypesValue[];
 
 declare const getResponse: ({ responses, operationName, context, contentType, }: {
     responses: ResponsesObject;
@@ -1059,10 +1097,20 @@ interface DebuggerOptions {
 }
 declare function createDebugger(ns: string, options?: DebuggerOptions): debug.Debugger['log'];
 
-declare function jsDoc({ description, deprecated, summary, }: {
+declare function jsDoc({ description, deprecated, summary, minLength, maxLength, minimum, maximum, exclusiveMinimum, exclusiveMaximum, minItems, maxItems, nullable, pattern, }: {
     description?: string[] | string;
     deprecated?: boolean;
     summary?: string;
+    minLength?: number;
+    maxLength?: number;
+    minimum?: number;
+    maximum?: number;
+    exclusiveMinimum?: boolean;
+    exclusiveMaximum?: boolean;
+    minItems?: number;
+    maxItems?: number;
+    nullable?: boolean;
+    pattern?: string;
 }, tryOneLine?: boolean): string;
 
 declare const dynamicImport: <T>(toImport: string | T, from?: string, takeDefault?: boolean) => Promise<T>;
@@ -1257,4 +1305,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 ClientBuilder, type ClientDependenciesBuilder, type ClientFooterBuilder, type ClientGeneratorsBuilder, type ClientHeaderBuilder, type ClientMockBuilder, type ClientTitleBuilder, type Config, type ConfigExternal, type ConfigFn, type ContextSpecs, 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 Hook, type HookCommand, type HookFunction, type HookOption, type HooksOptions, type ImportOpenApi, type InputOptions, type InputTransformerFn, type LogLevel, LogLevels, type LogOptions, type LogType, type Logger, type LoggerOptions, type MockOptions, type MockProperties, type Mutator, type MutatorObject, type NormalizedConfig, type NormalizedHookCommand, type NormalizedHookOptions, type NormalizedInputOptions, type NormalizedMutator, type NormalizedOperationOptions, type NormalizedOptions, type NormalizedOutputOptions, type NormalizedOverrideOutput, type NormalizedParamsSerializerOptions, type NormalizedQueryOptions, type OperationOptions, type Options, type OptionsExport, type OptionsFn, OutputClient, type OutputClientFunc, OutputMockType, OutputMode, type OutputOptions, type OverrideInput, type OverrideMockOptions, type OverrideOutput, type OverrideOutputContentType, type PackageJson, type ParamsSerializerOptions, type QueryOptions, RefComponentSuffix, type RefInfo, type ResReqTypesValue, type ResolverValue, type ScalarValue, SchemaType, type SwaggerParserOptions, type SwrOptions, type TsConfigTarget, type Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, type WriteModeProps, type WriteSpecsBuilder, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, 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, getEnumImplementation, getExtension, getFileInfo, 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, 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 ClientBuilder, type ClientDependenciesBuilder, type ClientExtraFilesBuilder, type ClientFileBuilder, type ClientFooterBuilder, type ClientGeneratorsBuilder, type ClientHeaderBuilder, type ClientMockBuilder, type ClientTitleBuilder, type Config, type ConfigExternal, type ConfigFn, type ContextSpecs, 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 InputOptions, type InputTransformerFn, 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, type NormalizedConfig, type NormalizedHonoOptions, type NormalizedHookCommand, type NormalizedHookOptions, type NormalizedInputOptions, type NormalizedMutator, type NormalizedOperationOptions, type NormalizedOptions, type NormalizedOutputOptions, type NormalizedOverrideOutput, type NormalizedParamsSerializerOptions, type NormalizedQueryOptions, type OperationOptions, type Options, type OptionsExport, type OptionsFn, OutputClient, type OutputClientFunc, OutputMockType, OutputMode, type OutputOptions, type OverrideInput, type OverrideMockOptions, type OverrideOutput, type OverrideOutputContentType, type PackageJson, type ParamsSerializerOptions, type QueryOptions, RefComponentSuffix, type RefInfo, type ResReqTypesValue, type ResolverValue, type ScalarValue, SchemaType, type SwaggerParserOptions, type SwrOptions, type TsConfigTarget, type Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, type WriteModeProps, type WriteSpecsBuilder, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, 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, getEnumImplementation, getExtension, getFileInfo, 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, 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

@@ -39866,7 +39866,8 @@ var OutputClient = {
   SVELTE_QUERY: "svelte-query",
   VUE_QUERY: "vue-query",
   SWR: "swr",
-  ZOD: "zod"
+  ZOD: "zod",
+  HONO: "hono"
 };
 var OutputMode = {
   SINGLE: "single",
@@ -40649,13 +40650,34 @@ var regex = new RegExp(search, "g");
 function jsDoc({
   description,
   deprecated,
-  summary
+  summary,
+  minLength,
+  maxLength,
+  minimum,
+  maximum,
+  exclusiveMinimum,
+  exclusiveMaximum,
+  minItems,
+  maxItems,
+  nullable,
+  pattern
 }, tryOneLine = false) {
   const lines = (Array.isArray(description) ? description.filter((d2) => !d2.includes("eslint-disable")) : [description || ""]).map((line) => line.replace(regex, replacement));
-  const count2 = [description, deprecated, summary].reduce(
-    (acc, it) => it ? acc + 1 : acc,
-    0
-  );
+  const count2 = [
+    description,
+    deprecated,
+    summary,
+    minLength?.toString(),
+    maxLength?.toString(),
+    minimum?.toString(),
+    maximum?.toString(),
+    exclusiveMinimum?.toString(),
+    exclusiveMaximum?.toString(),
+    minItems?.toString(),
+    maxItems?.toString(),
+    nullable?.toString(),
+    pattern
+  ].reduce((acc, it) => it ? acc + 1 : acc, 0);
   if (!count2) {
     return "";
   }
@@ -40670,20 +40692,42 @@ ${tryOneLine ? "  " : ""} *`;
     }
     doc += ` ${lines.join("\n * ")}`;
   }
-  if (deprecated) {
+  function appendPrefix() {
     if (!oneLine) {
       doc += `
 ${tryOneLine ? "  " : ""} *`;
     }
-    doc += " @deprecated";
   }
-  if (summary) {
-    if (!oneLine) {
-      doc += `
-${tryOneLine ? "  " : ""} *`;
+  function tryAppendStringDocLine(key, value) {
+    if (value) {
+      appendPrefix();
+      doc += ` @${key} ${value}`;
+    }
+  }
+  function tryAppendBooleanDocLine(key, value) {
+    if (value === true) {
+      appendPrefix();
+      doc += ` @${key}`;
+    }
+  }
+  function tryAppendNumberDocLine(key, value) {
+    if (value !== void 0) {
+      appendPrefix();
+      doc += ` @${key} ${value}`;
     }
-    doc += ` @summary ${summary.replace(regex, replacement)}`;
   }
+  tryAppendBooleanDocLine("deprecated", deprecated);
+  tryAppendStringDocLine("summary", summary?.replace(regex, replacement));
+  tryAppendNumberDocLine("minLength", minLength);
+  tryAppendNumberDocLine("maxLength", maxLength);
+  tryAppendNumberDocLine("minimum", minimum);
+  tryAppendNumberDocLine("maximum", maximum);
+  tryAppendBooleanDocLine("exclusiveMinimum", exclusiveMinimum);
+  tryAppendBooleanDocLine("exclusiveMaximum", exclusiveMaximum);
+  tryAppendNumberDocLine("minItems", minItems);
+  tryAppendNumberDocLine("maxItems", maxItems);
+  tryAppendBooleanDocLine("nullable", nullable);
+  tryAppendStringDocLine("pattern", pattern);
   doc += !oneLine ? `
  ${tryOneLine ? "  " : ""}` : " ";
   doc += "*/\n";
@@ -40927,10 +40971,10 @@ var ibmOpenapiValidator = async (specs) => {
   const spectral = new Spectral();
   spectral.setRuleset(ibmOpenapiRuleset);
   const { errors, warnings } = await spectral.run(specs);
-  if (warnings.length) {
+  if (warnings && warnings.length) {
     ibmOpenapiValidatorWarnings(warnings);
   }
-  if (errors.length) {
+  if (errors && errors.length) {
     ibmOpenapiValidatorErrors(errors);
   }
 };
@@ -41372,7 +41416,7 @@ var getResReqContentTypes = ({
   });
   return resolvedObject;
 };
-var getResReqTypes = (responsesOrRequests, name, context, defaultType = "unknown") => {
+var getResReqTypes = (responsesOrRequests, name, context, defaultType = "unknown", uniqueKey = "value") => {
   const typesArray = responsesOrRequests.filter(([_2, res]) => Boolean(res)).map(([key, res]) => {
     if (isReference(res)) {
       const {
@@ -41504,7 +41548,7 @@ var getResReqTypes = (responsesOrRequests, name, context, defaultType = "unknown
   });
   return (0, import_lodash5.default)(
     typesArray.flatMap((it) => it),
-    "value"
+    uniqueKey
   );
 };
 var getSchemaFormDataAndUrlEncoded = ({
@@ -41639,6 +41683,7 @@ var getBody = ({
   const hasReadonlyProps = filteredBodyTypes.some((x3) => x3.hasReadonlyProps);
   const nonReadonlyDefinition = hasReadonlyProps && definition ? `NonReadonly<${definition}>` : definition;
   let implementation = generalJSTypesWithArray.includes(definition.toLowerCase()) || filteredBodyTypes.length > 1 ? camel(operationName) + context.output.override.components.requestBodies.suffix : camel(definition);
+  let isOptional = false;
   if (implementation) {
     implementation = sanitize(implementation, {
       underscore: "_",
@@ -41647,6 +41692,17 @@ var getBody = ({
       es5keyword: true,
       es5IdentifierName: true
     });
+    if (isReference(requestBody)) {
+      const { schema: bodySchema } = resolveRef(
+        requestBody,
+        context
+      );
+      if (bodySchema.required !== void 0) {
+        isOptional = !bodySchema.required;
+      }
+    } else if (requestBody.required !== void 0) {
+      isOptional = !requestBody.required;
+    }
   }
   return {
     originalSchema: requestBody,
@@ -41654,6 +41710,7 @@ var getBody = ({
     implementation,
     imports,
     schemas,
+    isOptional,
     ...filteredBodyTypes.length === 1 ? {
       formData: filteredBodyTypes[0].formData,
       formUrlEncoded: filteredBodyTypes[0].formUrlEncoded,
@@ -41848,7 +41905,8 @@ var getScalar = ({
   name,
   context
 }) => {
-  const nullable = item.nullable ? " | null" : "";
+  const isAngularClient = context.output.client === OutputClient.ANGULAR;
+  const nullable = item.nullable && !isAngularClient ? " | null" : "";
   const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
   if (!item.type && item.items) {
     item.type = "array";
@@ -42291,10 +42349,10 @@ var getProps = ({
 }) => {
   const bodyProp = {
     name: body.implementation,
-    definition: `${body.implementation}: ${body.definition}`,
-    implementation: `${body.implementation}: ${body.definition}`,
+    definition: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
+    implementation: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
     default: false,
-    required: true,
+    required: !body.isOptional,
     type: GetterPropType.BODY
   };
   const queryParamsProp = {
@@ -42470,7 +42528,8 @@ var getResponse = ({
     Object.entries(responses),
     operationName,
     context,
-    "void"
+    "void",
+    (type) => type.key.startsWith("2") + type.value
   );
   const filteredTypes = contentType ? types.filter((type) => {
     let include = true;
@@ -43299,7 +43358,8 @@ var generateInterface = ({
     }
   }
   if (scalar.type === "object" && !context?.output.override?.useTypeOverInterfaces) {
-    model += `export interface ${name} ${scalar.value}
+    const blankInterfaceValue = scalar.value === "unknown" ? "{}" : scalar.value;
+    model += `export interface ${name} ${blankInterfaceValue}
 `;
   } else {
     model += `export type ${name} = ${scalar.value};
@@ -43403,6 +43463,7 @@ var generateVerbOptions = async ({
   output,
   operation,
   route,
+  pathRoute,
   verbParameters = [],
   context
 }) => {
@@ -43503,6 +43564,8 @@ var generateVerbOptions = async ({
   const verbOption = {
     verb,
     tags,
+    route,
+    pathRoute,
     summary: operation.summary,
     operationId,
     operationName,
@@ -43532,6 +43595,7 @@ var generateVerbsOptions = ({
   input,
   output,
   route,
+  pathRoute,
   context
 }) => asyncReduce(
   _filteredVerbs(verbs, input.filters),
@@ -43542,6 +43606,7 @@ var generateVerbsOptions = ({
         output,
         verbParameters: verbs.parameters,
         route,
+        pathRoute,
         operation,
         context
       });
@@ -43677,31 +43742,32 @@ ${exports2}`;
 
 // src/writers/types.ts
 var getOrvalGeneratedTypes = () => `
-// https://stackoverflow.com/questions/49579094/typescript-conditional-types-filter-out-readonly-properties-pick-only-requir/49579497#49579497
-type IfEquals<X, Y, A = X, B = never> = (<T>() => T extends X ? 1 : 2) extends <
-T,
->() => T extends Y ? 1 : 2
-? A
-: B;
-
-type WritableKeys<T> = {
-[P in keyof T]-?: IfEquals<
-  { [Q in P]: T[P] },
-  { -readonly [Q in P]: T[P] },
-  P
->;
-}[keyof T];
-
-type UnionToIntersection<U> =
-  (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never;
-type DistributeReadOnlyOverUnions<T> = T extends any ? NonReadonly<T> : never;
-
-type Writable<T> = Pick<T, WritableKeys<T>>;
-type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
-  [P in keyof Writable<T>]: T[P] extends object
-    ? NonReadonly<NonNullable<T[P]>>
-    : T[P];
-} : DistributeReadOnlyOverUnions<T>;
+type IsAny<T> = 0 extends 1 & T ? true : false;
+type IsUnknown<T> = IsAny<T> extends true ? false : unknown extends T ? true : false;
+type Primitive = string | number | boolean | bigint | symbol | undefined | null;
+type isBuiltin = Primitive | Function | Date | Error | RegExp;
+type NonReadonly<T> =
+  T extends Exclude<isBuiltin, Error>
+  ? T
+  : T extends Map<infer Key, infer Value>
+  ? Map<NonReadonly<Key>, NonReadonly<Value>>
+  : T extends ReadonlyMap<infer Key, infer Value>
+  ? Map<NonReadonly<Key>, NonReadonly<Value>>
+  : T extends WeakMap<infer Key, infer Value>
+  ? WeakMap<NonReadonly<Key>, NonReadonly<Value>>
+  : T extends Set<infer Values>
+  ? Set<NonReadonly<Values>>
+  : T extends ReadonlySet<infer Values>
+  ? Set<NonReadonly<Values>>
+  : T extends WeakSet<infer Values>
+  ? WeakSet<NonReadonly<Values>>
+  : T extends Promise<infer Value>
+  ? Promise<NonReadonly<Value>>
+  : T extends {}
+  ? { -readonly [Key in keyof T]: NonReadonly<T[Key]> }
+  : IsUnknown<T> extends true
+  ? unknown
+  : T;
 `;
 
 // src/writers/single-mode.ts
@@ -43757,7 +43823,9 @@ var generateTarget = (builder, options) => {
           provideIn: options.override.angular.provideIn,
           hasAwaitedType,
           titles,
-          output: options
+          output: options,
+          verbOptions: builder.verbOptions,
+          clientImplementation: acc.implementation
         });
         acc.implementation = header.implementation + acc.implementation;
         acc.implementationMock.handler = acc.implementationMock.handler + header.implementationMock + acc.implementationMock.handlerName;
@@ -43933,7 +44001,7 @@ var writeSplitMode = async ({
     });
     mockData += builder.importsMock({
       implementation: implementationMock,
-      imports: [{ exports: imports, dependency: relativeSchemasPath }],
+      imports: [{ exports: importsMock, dependency: relativeSchemasPath }],
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -44089,7 +44157,10 @@ var generateTargetForTags = (builder, options) => {
             provideIn: options.override.angular.provideIn,
             hasAwaitedType,
             titles,
-            output: options
+            output: options,
+            verbOptions: builder.verbOptions,
+            tag,
+            clientImplementation: target.implementation
           });
           acc2[tag] = {
             implementation: header.implementation + target.implementation + footer.implementation,
@@ -44176,7 +44247,7 @@ var writeSplitTagsMode = async ({
         });
         mockData += builder.importsMock({
           implementation: implementationMock,
-          imports: importsForBuilder,
+          imports: [{ exports: importsMock, dependency: relativeSchemasPath }],
           specsName,
           hasSchemaDir: !!output.schemas,
           isAllowSyntheticDefaultImports,
@@ -44309,7 +44380,9 @@ var writeTagsMode = async ({
         if (output.mock) {
           data += builder.importsMock({
             implementation: implementationMock,
-            imports: importsForBuilder,
+            imports: [
+              { exports: importsMock, dependency: schemasPathRelative }
+            ],
             specsName,
             hasSchemaDir: !!output.schemas,
             isAllowSyntheticDefaultImports,