@orval/core 7.3.0 → 7.4.0

package/dist/index.d.ts

@@ -3,7 +3,9 @@ import { allLocales } from '@faker-js/faker';
 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 { TypeDocOptions } from 'typedoc';
 import { ValueIteratee } from 'lodash';
+import { ServerObject } from 'openapi3-ts/oas31';
 import { CompareOperator } from 'compare-versions';
 import debug from 'debug';
 
@@ -38,6 +40,7 @@ type NormalizedOutputOptions = {
     client: OutputClient | OutputClientFunc;
     httpClient: OutputHttpClient;
     clean: boolean | string[];
+    docs: boolean | OutputDocsOptions;
     prettier: boolean;
     tslint: boolean;
     biome: boolean;
@@ -45,11 +48,12 @@ type NormalizedOutputOptions = {
     packageJson?: PackageJson;
     headers: boolean;
     indexFiles: boolean;
-    baseUrl?: string;
+    baseUrl?: string | BaseUrlFromSpec | BaseUrlFromConstant;
     allParamsOptional: boolean;
     urlEncodeParameters: boolean;
     unionAddMissingProperties: boolean;
     optionsParamRequired: boolean;
+    propertySortOrder: PropertySortOrder;
 };
 type NormalizedParamsSerializerOptions = {
     qs?: Record<string, any>;
@@ -137,6 +141,25 @@ type NormalizedInputOptions = {
     filters?: InputFiltersOption;
 };
 type OutputClientFunc = (clients: GeneratorClients) => ClientGeneratorsBuilder;
+type BaseUrlFromSpec = {
+    getBaseUrlFromSpecification: true;
+    variables?: {
+        [variable: string]: string;
+    };
+    index?: number;
+    baseUrl?: never;
+};
+type BaseUrlFromConstant = {
+    getBaseUrlFromSpecification: false;
+    variables?: never;
+    index?: never;
+    baseUrl: string;
+};
+declare const PropertySortOrder: {
+    readonly ALPHABETICAL: "Alphabetical";
+    readonly SPECIFICATION: "Specification";
+};
+type PropertySortOrder = (typeof PropertySortOrder)[keyof typeof PropertySortOrder];
 type OutputOptions = {
     workspace?: string;
     target?: string;
@@ -148,6 +171,7 @@ type OutputOptions = {
     client?: OutputClient | OutputClientFunc;
     httpClient?: OutputHttpClient;
     clean?: boolean | string[];
+    docs?: boolean | OutputDocsOptions;
     prettier?: boolean;
     tslint?: boolean;
     biome?: boolean;
@@ -155,11 +179,12 @@ type OutputOptions = {
     packageJson?: string;
     headers?: boolean;
     indexFiles?: boolean;
-    baseUrl?: string;
+    baseUrl?: string | BaseUrlFromSpec | BaseUrlFromConstant;
     allParamsOptional?: boolean;
     urlEncodeParameters?: boolean;
     unionAddMissingProperties?: boolean;
     optionsParamRequired?: boolean;
+    propertySortOrder?: PropertySortOrder;
 };
 type SwaggerParserOptions = Omit<SwaggerParser.Options, 'validate'> & {
     validate?: boolean;
@@ -202,6 +227,9 @@ declare const OutputMode: {
     readonly TAGS_SPLIT: "tags-split";
 };
 type OutputMode = (typeof OutputMode)[keyof typeof OutputMode];
+type OutputDocsOptions = {
+    configPath?: string;
+} & Partial<TypeDocOptions>;
 declare const OutputMockType: {
     readonly MSW: "msw";
 };
@@ -1137,6 +1165,7 @@ declare const getResponse: ({ responses, operationName, context, contentType, }:
 }) => GetterResponse;
 
 declare const getRoute: (route: string) => string;
+declare const getFullRoute: (route: string, servers: ServerObject[] | undefined, baseUrl: string | BaseUrlFromConstant | BaseUrlFromSpec | undefined) => string;
 declare const getRouteAsArray: (route: string) => string;
 
 /**
@@ -1305,12 +1334,12 @@ declare const count: (str: string | undefined, key: string) => number;
 
 declare const openApiConverter: (schema: any, options: swagger2openapi.Options | undefined, specKey: string) => Promise<OpenAPIObject>;
 
-declare let join: (...paths: string[]) => string;
-declare let resolve: (...paths: string[]) => string;
-declare let extname: (path: string) => string;
-declare let dirname: (path: string) => string;
-declare let basename: (path: string, suffix?: string | undefined) => string;
-declare let isAbsolute: (path: string) => boolean;
+declare const join: (...paths: string[]) => string;
+declare const resolve: (...paths: string[]) => string;
+declare const extname: (path: string) => string;
+declare const dirname: (path: string) => string;
+declare const basename: (path: string, suffix?: string | undefined) => string;
+declare const isAbsolute: (path: string) => boolean;
 
 /**
  * Behaves exactly like `path.relative(from, to)`, but keeps the first meaningful "./"
@@ -1421,4 +1450,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 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, type FetchOptions, 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 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 NormalizedZodOptions, type OperationOptions, type Options, type OptionsExport, type OptionsFn, OutputClient, type OutputClientFunc, OutputHttpClient, 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 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 ZodOptions, _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, 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, 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, type FetchOptions, 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 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 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 ZodOptions, _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, 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, 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

@@ -48092,6 +48092,7 @@ __export(src_exports, {
   OutputHttpClient: () => OutputHttpClient,
   OutputMockType: () => OutputMockType,
   OutputMode: () => OutputMode,
+  PropertySortOrder: () => PropertySortOrder,
   RefComponentSuffix: () => RefComponentSuffix,
   SchemaType: () => SchemaType,
   TEMPLATE_TAG_REGEX: () => TEMPLATE_TAG_REGEX,
@@ -48139,6 +48140,7 @@ __export(src_exports, {
   getEnumImplementation: () => getEnumImplementation,
   getExtension: () => getExtension,
   getFileInfo: () => getFileInfo,
+  getFullRoute: () => getFullRoute,
   getIsBodyVerb: () => getIsBodyVerb,
   getKey: () => getKey,
   getMockFileExtensionByTypeName: () => getMockFileExtensionByTypeName,
@@ -48212,6 +48214,10 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/types.ts
+var PropertySortOrder = {
+  ALPHABETICAL: "Alphabetical",
+  SPECIFICATION: "Specification"
+};
 var OutputClient = {
   ANGULAR: "angular",
   AXIOS: "axios",
@@ -48849,7 +48855,7 @@ function isUndefined(x3) {
   return typeof x3 === "undefined";
 }
 function isNull(x3) {
-  return typeof x3 === null;
+  return x3 === null;
 }
 function isSchema(x3) {
   if (!isObject(x3)) {
@@ -49665,7 +49671,7 @@ var resolveObjectOriginal = ({
       context.output.override.useNativeEnums
     );
     return {
-      value: propName,
+      value: context.output.override.useNativeEnums ? `keyof typeof ${propName}` : propName,
       imports: [{ name: propName }],
       schemas: [
         ...resolvedValue.schemas,
@@ -49765,6 +49771,16 @@ var getArray = ({
       example: schema.example,
       examples: resolveExampleRefs(schema.examples, context)
     };
+  } else if (compareVersions(context.specs[context.specKey].openapi, "3.1", ">=")) {
+    return {
+      value: "unknown[]",
+      imports: [],
+      schemas: [],
+      isEnum: false,
+      type: "array",
+      isRef: false,
+      hasReadonlyProps: false
+    };
   } else {
     throw new Error(
       `All arrays must have an \`items\` key defined (name=${name}, schema=${JSON.stringify(schema)})`
@@ -49978,9 +49994,9 @@ var getSchemaFormDataAndUrlEncoded = ({
   let form = isUrlEncoded ? `const ${variableName} = new URLSearchParams();
 ` : `const ${variableName} = new FormData();
 `;
-  if (schema.type === "object") {
-    if (schema.oneOf || schema.anyOf || schema.allOf) {
-      const combinedSchemas = schema.oneOf || schema.anyOf || schema.allOf;
+  const combinedSchemas = schema.oneOf || schema.anyOf || schema.allOf;
+  if (schema.type === "object" || schema.type === void 0 && combinedSchemas) {
+    if (combinedSchemas) {
       const shouldCast = !!schema.oneOf || !!schema.anyOf;
       const combinedSchemasFormData = combinedSchemas.map((schema2) => {
         const { schema: combinedSchema, imports: imports2 } = resolveRef(
@@ -50241,9 +50257,13 @@ var getObject = ({
     });
   }
   if (item.properties && Object.entries(item.properties).length > 0) {
-    return Object.entries(item.properties).sort((a3, b3) => {
-      return a3[0].localeCompare(b3[0]);
-    }).reduce(
+    const entries = Object.entries(item.properties);
+    if (context.output.propertySortOrder === PropertySortOrder.ALPHABETICAL) {
+      entries.sort((a3, b3) => {
+        return a3[0].localeCompare(b3[0]);
+      });
+    }
+    return entries.reduce(
       (acc, [key, schema], index3, arr) => {
         const isRequired = (Array.isArray(item.required) ? item.required : []).includes(key);
         let propName = "";
@@ -50369,7 +50389,8 @@ var getScalar = ({
   context
 }) => {
   const isAngularClient = context.output.client === OutputClient.ANGULAR;
-  const nullable = item.nullable && !isAngularClient ? " | null" : "";
+  const typeIncludesNull = Array.isArray(item.type) && item.type.includes("null");
+  const nullable = (typeIncludesNull || item.nullable) && !isAngularClient ? " | null" : "";
   const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
   if (!item.type && item.items) {
     item.type = "array";
@@ -50825,7 +50846,7 @@ var getParams = ({
     if (output.allParamsOptional) {
       paramType = `${paramType} | undefined | null`;
     }
-    const definition = `${name}${!required || resolvedValue.originalSchema.default ? "?" : ""}: ${resolvedValue.value}`;
+    const definition = `${name}${!required || resolvedValue.originalSchema.default ? "?" : ""}: ${paramType}`;
     const implementation = `${name}${!required && !resolvedValue.originalSchema.default ? "?" : ""}${!resolvedValue.originalSchema.default ? `: ${paramType}` : `: ${paramType} = ${stringify(resolvedValue.originalSchema.default)}`}`;
     return {
       name,
@@ -51108,6 +51129,50 @@ var getRoute = (route) => {
     return `${acc}/${getRoutePath(path2)}`;
   }, "");
 };
+var getFullRoute = (route, servers, baseUrl) => {
+  const getBaseUrl = () => {
+    if (!baseUrl) return "";
+    if (typeof baseUrl === "string") return baseUrl;
+    if (baseUrl.getBaseUrlFromSpecification) {
+      if (!servers) {
+        throw new Error(
+          "Orval is configured to use baseUrl from the specifications 'servers' field, but there exist no servers in the specification."
+        );
+      }
+      const server = servers.at(
+        Math.min(baseUrl.index ?? 0, servers.length - 1)
+      );
+      if (!server) return "";
+      if (!server.variables) return server.url;
+      let url = server.url;
+      const variables = baseUrl.variables;
+      for (const variableKey of Object.keys(server.variables)) {
+        const variable = server.variables[variableKey];
+        if (!variables?.[variableKey]) {
+          url = url.replaceAll(`{${variableKey}}`, String(variable.default));
+        } else {
+          if (variable.enum && !variable.enum.some((e3) => e3 == variables[variableKey])) {
+            throw new Error(
+              `Invalid variable value '${variables[variableKey]}' for variable '${variableKey}' when resolving ${server.url}. Valid values are: ${variable.enum.join(", ")}.`
+            );
+          }
+          url = url.replaceAll(`{${variableKey}}`, variables[variableKey]);
+        }
+      }
+      return url;
+    }
+    return baseUrl.baseUrl;
+  };
+  let fullRoute = route;
+  const base2 = getBaseUrl();
+  if (base2) {
+    if (base2.endsWith("/") && route.startsWith("/")) {
+      fullRoute = route.slice(1);
+    }
+    fullRoute = `${base2}${fullRoute}`;
+  }
+  return fullRoute;
+};
 var getRouteAsArray = (route) => route.replace(TEMPLATE_TAG_IN_PATH_REGEX, "/$1/${").split("/").filter((i3) => i3 !== "").map(
   (i3) => (
     // @note - array is mixed with string and var
@@ -51789,7 +51854,7 @@ var generateParameterDefinition = (parameters = {}, context, suffix) => {
         parameter,
         context
       );
-      if (schema.in !== "query") {
+      if (schema.in !== "query" && schema.in !== "header") {
         return acc;
       }
       if (!schema.schema || imports.length) {
@@ -51882,8 +51947,8 @@ var generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
   }
   const transformedSchemas = resolveDiscriminators(schemas, context);
   let generateSchemas = Object.entries(transformedSchemas);
-  if (filters) {
-    const schemasFilters = filters.schemas || [];
+  if (filters?.schemas) {
+    const schemasFilters = filters.schemas;
     const mode = filters.mode || "include";
     generateSchemas = generateSchemas.filter(([schemaName]) => {
       const isMatch = schemasFilters.some(
@@ -52296,6 +52361,13 @@ type NonReadonly<T> = [T] extends [UnionToIntersection<T>] ? {
 // src/writers/single-mode.ts
 var import_fs_extra3 = __toESM(require("fs-extra"));
 
+// src/writers/generate-imports-for-builder.ts
+var import_lodash12 = __toESM(require("lodash.uniqby"));
+var generateImportsForBuilder = (output, imports, relativeSchemasPath) => output.schemas && !output.indexFiles ? (0, import_lodash12.default)(imports, "name").map((i3) => ({
+  exports: [i3],
+  dependency: path_exports.joinSafe(relativeSchemasPath, camel(i3.name))
+})) : [{ exports: imports, dependency: relativeSchemasPath }];
+
 // src/writers/target.ts
 var generateTarget = (builder, options) => {
   const operationNames = Object.values(builder.operations).map(
@@ -52419,17 +52491,17 @@ var writeSingleMode = async ({
     const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(
       output.tsconfig
     );
+    const importsForBuilder = schemasPath ? generateImportsForBuilder(
+      output,
+      imports.filter(
+        (imp) => !importsMock.some((impMock) => imp.name === impMock.name)
+      ),
+      schemasPath
+    ) : [];
     data += builder.imports({
       client: output.client,
       implementation,
-      imports: schemasPath ? [
-        {
-          exports: imports.filter(
-            (imp) => !importsMock.some((impMock) => imp.name === impMock.name)
-          ),
-          dependency: schemasPath
-        }
-      ] : [],
+      imports: importsForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -52442,9 +52514,10 @@ var writeSingleMode = async ({
       output
     });
     if (output.mock) {
+      const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, importsMock, schemasPath) : [];
       data += builder.importsMock({
         implementation: implementationMock,
-        imports: schemasPath ? [{ exports: importsMock, dependency: schemasPath }] : [],
+        imports: importsMockForBuilder,
         specsName,
         hasSchemaDir: !!output.schemas,
         isAllowSyntheticDefaultImports,
@@ -52521,10 +52594,15 @@ var writeSplitMode = async ({
     const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(
       output.tsconfig
     );
+    const importsForBuilder = generateImportsForBuilder(
+      output,
+      imports,
+      relativeSchemasPath
+    );
     implementationData += builder.imports({
       client: output.client,
       implementation,
-      imports: [{ exports: imports, dependency: relativeSchemasPath }],
+      imports: importsForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -52536,9 +52614,14 @@ var writeSplitMode = async ({
       packageJson: output.packageJson,
       output
     });
+    const importsMockForBuilder = generateImportsForBuilder(
+      output,
+      importsMock,
+      relativeSchemasPath
+    );
     mockData += builder.importsMock({
       implementation: implementationMock,
-      imports: [{ exports: importsMock, dependency: relativeSchemasPath }],
+      imports: importsMockForBuilder,
       specsName,
       hasSchemaDir: !!output.schemas,
       isAllowSyntheticDefaultImports,
@@ -52734,7 +52817,6 @@ var generateTargetForTags = (builder, options) => {
 };
 
 // src/writers/split-tags-mode.ts
-var import_lodash12 = __toESM(require("lodash.uniqby"));
 var writeSplitTagsMode = async ({
   builder,
   output,
@@ -52770,10 +52852,11 @@ var writeSplitTagsMode = async ({
           dirname3,
           getFileInfo(output.schemas, { extension: output.fileExtension }).dirname
         ) : "../" + filename + ".schemas";
-        const importsForBuilder = output.schemas && !output.indexFiles ? (0, import_lodash12.default)(imports, "name").map((i3) => ({
-          exports: [i3],
-          dependency: path_exports.join(relativeSchemasPath, camel(i3.name))
-        })) : [{ exports: imports, dependency: relativeSchemasPath }];
+        const importsForBuilder = generateImportsForBuilder(
+          output,
+          imports,
+          relativeSchemasPath
+        );
         implementationData += builder.imports({
           client: output.client,
           implementation,
@@ -52789,9 +52872,14 @@ var writeSplitTagsMode = async ({
           packageJson: output.packageJson,
           output
         });
+        const importsMockForBuilder = generateImportsForBuilder(
+          output,
+          importsMock,
+          relativeSchemasPath
+        );
         mockData += builder.importsMock({
           implementation: implementationMock,
-          imports: [{ exports: importsMock, dependency: relativeSchemasPath }],
+          imports: importsMockForBuilder,
           specsName,
           hasSchemaDir: !!output.schemas,
           isAllowSyntheticDefaultImports,
@@ -52905,14 +52993,13 @@ var writeTagsMode = async ({
           dirname3,
           getFileInfo(output.schemas, { extension: output.fileExtension }).dirname
         ) : "./" + filename + ".schemas";
-        const importsForBuilder = [
-          {
-            exports: imports.filter(
-              (imp) => !importsMock.some((impMock) => imp.name === impMock.name)
-            ),
-            dependency: schemasPathRelative
-          }
-        ];
+        const importsForBuilder = generateImportsForBuilder(
+          output,
+          imports.filter(
+            (imp) => !importsMock.some((impMock) => imp.name === impMock.name)
+          ),
+          schemasPathRelative
+        );
         data += builder.imports({
           client: output.client,
           implementation,
@@ -52929,11 +53016,14 @@ var writeTagsMode = async ({
           output
         });
         if (output.mock) {
+          const importsMockForBuilder = generateImportsForBuilder(
+            output,
+            importsMock,
+            schemasPathRelative
+          );
           data += builder.importsMock({
             implementation: implementationMock,
-            imports: [
-              { exports: importsMock, dependency: schemasPathRelative }
-            ],
+            imports: importsMockForBuilder,
             specsName,
             hasSchemaDir: !!output.schemas,
             isAllowSyntheticDefaultImports,
@@ -52994,6 +53084,7 @@ var writeTagsMode = async ({
   OutputHttpClient,
   OutputMockType,
   OutputMode,
+  PropertySortOrder,
   RefComponentSuffix,
   SchemaType,
   TEMPLATE_TAG_REGEX,
@@ -53041,6 +53132,7 @@ var writeTagsMode = async ({
   getEnumImplementation,
   getExtension,
   getFileInfo,
+  getFullRoute,
   getIsBodyVerb,
   getKey,
   getMockFileExtensionByTypeName,