@orval/core 7.4.0 → 7.5.0

package/dist/index.d.ts

@@ -112,6 +112,7 @@ type NormalizedMutator = {
     name?: string;
     default: boolean;
     alias?: Record<string, string>;
+    extension?: string;
 };
 type NormalizedOperationOptions = {
     transformer?: OutputTransformer;
@@ -242,6 +243,7 @@ type GlobalMockOptions = {
     delayFunctionLazyExecute?: boolean;
     baseUrl?: string;
     locale?: keyof typeof allLocales;
+    indexMockFiles?: boolean;
 };
 type OverrideMockOptions = Partial<GlobalMockOptions> & {
     arrayMin?: number;
@@ -278,6 +280,7 @@ type MutatorObject = {
     name?: string;
     default?: boolean;
     alias?: Record<string, string>;
+    extension?: string;
 };
 type Mutator = string | MutatorObject;
 type ParamsSerializerOptions = {
@@ -337,7 +340,9 @@ type OverrideOutputContentType = {
 };
 type NormalizedHonoOptions = {
     handlers?: string;
+    compositeRoute: string;
     validator: boolean | 'hono';
+    validatorOutputPath: string;
 };
 type ZodOptions = {
     strict?: {
@@ -404,7 +409,9 @@ type NormalizedZodOptions = {
 };
 type HonoOptions = {
     handlers?: string;
+    compositeRoute?: string;
     validator?: boolean | 'hono';
+    validatorOutputPath?: string;
 };
 type NormalizedQueryOptions = {
     useQuery?: boolean;
@@ -498,7 +505,7 @@ declare const Verbs: {
 };
 type ImportOpenApi = {
     data: Record<string, unknown | OpenAPIObject>;
-    input: InputOptions;
+    input: NormalizedInputOptions;
     output: NormalizedOutputOptions;
     target: string;
     workspace: string;

package/dist/index.js

@@ -49474,19 +49474,25 @@ var resolveUrl = (from, to) => {
 };
 var getRefInfo = ($ref, context) => {
   const [pathname, ref] = $ref.split("#");
-  const refPaths = ref?.slice(1).split("/").map((part) => part.replace(regex2, "/"));
+  const refPaths = ref?.slice(1).split("/").map((part) => decodeURIComponent(part.replace(regex2, "/")));
   const suffix = refPaths ? (0, import_lodash3.default)(context.output.override, [...refPaths.slice(0, 2), "suffix"], "") : "";
   const originalName = ref ? refPaths[refPaths.length - 1] : path_exports.getSchemaFileName(pathname);
   if (!pathname) {
     return {
-      name: pascal(originalName) + suffix,
+      name: sanitize(pascal(originalName) + suffix, {
+        es5keyword: true,
+        es5IdentifierName: true
+      }),
       originalName,
       refPaths
     };
   }
   const path2 = isUrl(context.specKey) ? resolveUrl(context.specKey, pathname) : path_exports.resolve(getFileInfo(context.specKey).dirname, pathname);
   return {
-    name: pascal(originalName) + suffix,
+    name: sanitize(pascal(originalName) + suffix, {
+      es5keyword: true,
+      es5IdentifierName: true
+    }),
     originalName,
     specKey: path2,
     refPaths
@@ -49671,7 +49677,7 @@ var resolveObjectOriginal = ({
       context.output.override.useNativeEnums
     );
     return {
-      value: context.output.override.useNativeEnums ? `keyof typeof ${propName}` : propName,
+      value: context.output.override.useNativeEnums ? `(keyof typeof ${propName})` : propName,
       imports: [{ name: propName }],
       schemas: [
         ...resolvedValue.schemas,
@@ -50293,7 +50299,7 @@ var getObject = ({
         acc.hasReadonlyProps ||= isReadOnly || false;
         acc.imports.push(...resolvedValue.imports);
         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 ? "" : "?"}: ${resolvedValue.isEnum && context.output.override.useNativeEnums ? `(keyof typeof ${resolvedValue.value})` : resolvedValue.value};`;
         acc.schemas.push(...resolvedValue.schemas);
         if (arr.length - 1 === index3) {
           if (item.additionalProperties) {
@@ -50389,8 +50395,7 @@ var getScalar = ({
   context
 }) => {
   const isAngularClient = context.output.client === OutputClient.ANGULAR;
-  const typeIncludesNull = Array.isArray(item.type) && item.type.includes("null");
-  const nullable = (typeIncludesNull || item.nullable) && !isAngularClient ? " | null" : "";
+  const nullable = item.nullable && !isAngularClient ? " | null" : "";
   const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
   if (!item.type && item.items) {
     item.type = "array";
@@ -50493,6 +50498,20 @@ var getScalar = ({
       };
     case "object":
     default: {
+      if (Array.isArray(item.type)) {
+        return combineSchemas({
+          schema: {
+            anyOf: item.type.map((type) => ({
+              ...item,
+              type
+            }))
+          },
+          name,
+          separator: "anyOf",
+          context,
+          nullable
+        });
+      }
       if (enumItems) {
         const value3 = `${enumItems.map(
           (enumItem) => isString2(enumItem) ? `'${escape2(enumItem)}'` : `${enumItem}`
@@ -50533,7 +50552,11 @@ var combineValues = ({
     return `${resolvedData.values.join(` | `)}${resolvedValue ? ` | ${resolvedValue.value}` : ""}`;
   }
   if (separator2 === "allOf") {
-    return `${resolvedData.values.join(` & `)}${resolvedValue ? ` & ${resolvedValue.value}` : ""}`;
+    const joined = `${resolvedData.values.join(` & `)}${resolvedValue ? ` & ${resolvedValue.value}` : ""}`;
+    if (resolvedData.requiredProperties.length) {
+      return `${joined} & Required<Pick<${joined}, '${resolvedData.requiredProperties.join("' | '")}'>>`;
+    }
+    return joined;
   }
   let values = resolvedData.values;
   const hasObjectSubschemas = resolvedData.allProperties.length;
@@ -50574,15 +50597,8 @@ var combineSchemas = ({
       if (propName && acc.schemas.length) {
         propName = propName + pascal(getNumberWord(acc.schemas.length + 1));
       }
-      if (separator2 === "allOf" && schema.required) {
-        if (isSchema(subSchema) && subSchema.required) {
-          subSchema = {
-            ...subSchema,
-            required: [...schema.required, ...subSchema.required]
-          };
-        } else {
-          subSchema = { ...subSchema, required: schema.required };
-        }
+      if (separator2 === "allOf" && isSchema(subSchema) && subSchema.required) {
+        acc.requiredProperties.push(...subSchema.required);
       }
       const resolvedValue2 = resolveObject({
         schema: subSchema,
@@ -50617,7 +50633,8 @@ var combineSchemas = ({
       allProperties: [],
       hasReadonlyProps: false,
       example: schema.example,
-      examples: resolveExampleRefs(schema.examples, context)
+      examples: resolveExampleRefs(schema.examples, context),
+      requiredProperties: separator2 === "allOf" ? schema.required ?? [] : []
     }
   );
   const isAllEnums = resolvedData.isEnum.every((v2) => v2);
@@ -50708,7 +50725,7 @@ var resolveDiscriminators = (schemas, context) => {
         try {
           const { originalName } = getRefInfo(mappingValue, context);
           const name = pascal(originalName);
-          subTypeSchema = transformedSchemas[name];
+          subTypeSchema = transformedSchemas[name] ?? transformedSchemas[originalName];
         } catch (e3) {
           subTypeSchema = transformedSchemas[mappingValue];
         }
@@ -51352,11 +51369,15 @@ var addDependency = ({
       });
     }
     if (types) {
+      let uniqueTypes = types;
       if (values) {
+        uniqueTypes = types.filter(
+          (t3) => !values.some((v2) => v2.name === t3.name)
+        );
         dep += "\n";
       }
       dep += generateDependency({
-        deps: types,
+        deps: uniqueTypes,
         isAllowSyntheticDefaultImports,
         dependency,
         specsName,
@@ -51415,7 +51436,7 @@ var generateVerbImports = ({
 var generateModelInline = (acc, model) => acc + `${model}
 `;
 var generateModelsInline = (obj) => {
-  const schemas = Object.values(obj).flatMap((it) => it).sort((a3, b3) => a3.imports.some((i3) => i3.name === b3.name) ? 1 : -1);
+  const schemas = Object.values(obj).flatMap((it) => it);
   return schemas.reduce(
     (acc, { model }) => generateModelInline(acc, model),
     ""
@@ -51433,7 +51454,7 @@ var getImport = (output, mutator) => {
   const { pathWithoutExtension } = getFileInfo(
     path_exports.relativeSafe(outputFileInfo.dirname, mutatorFileInfo.path)
   );
-  return pathWithoutExtension;
+  return `${pathWithoutExtension}${mutator.extension || ""}`;
 };
 var generateMutator = async ({
   output,
@@ -51599,6 +51620,12 @@ var parseFunction = (ast, name) => {
         numberOfParams: node.params.length,
         returnNumberOfParams: returnStatement2.argument.params.length
       };
+    } else if (returnStatement2?.argument?.type === "CallExpression" && returnStatement2.argument.arguments?.[0]?.type === "ArrowFunctionExpression") {
+      const arrowFn = returnStatement2.argument.arguments[0];
+      return {
+        numberOfParams: node.params.length,
+        returnNumberOfParams: arrowFn.params.length
+      };
     }
     return {
       numberOfParams: node.params.length
@@ -51622,6 +51649,12 @@ var parseFunction = (ast, name) => {
       numberOfParams: declaration.init.params.length,
       returnNumberOfParams: returnStatement.argument.params.length
     };
+  } else if (returnStatement?.argument?.type === "CallExpression" && returnStatement.argument.arguments?.[0]?.type === "ArrowFunctionExpression") {
+    const arrowFn = returnStatement.argument.arguments[0];
+    return {
+      numberOfParams: declaration.init.params.length,
+      returnNumberOfParams: arrowFn.params.length
+    };
   }
   return {
     numberOfParams: declaration.init.params.length
@@ -52697,56 +52730,55 @@ var addDefaultTagIfEmpty = (operation) => ({
   ...operation,
   tags: operation.tags.length ? operation.tags : ["default"]
 });
-var generateTargetTags = (currentAcc, operation) => {
-  return operation.tags.map(kebab).reduce((acc, tag) => {
-    const currentOperation = acc[tag];
-    if (!currentOperation) {
-      acc[tag] = {
-        imports: operation.imports,
-        importsMock: operation.importsMock,
-        mutators: operation.mutator ? [operation.mutator] : [],
-        clientMutators: operation.clientMutators ?? [],
-        formData: operation.formData ? [operation.formData] : [],
-        formUrlEncoded: operation.formUrlEncoded ? [operation.formUrlEncoded] : [],
-        paramsSerializer: operation.paramsSerializer ? [operation.paramsSerializer] : [],
-        implementation: operation.implementation,
-        implementationMock: {
-          function: operation.implementationMock.function,
-          handler: operation.implementationMock.handler,
-          handlerName: "  " + operation.implementationMock.handlerName + "()"
-        }
-      };
-      return acc;
-    }
-    acc[tag] = {
-      implementation: currentOperation.implementation + operation.implementation,
-      imports: [...currentOperation.imports, ...operation.imports],
-      importsMock: [...currentOperation.importsMock, ...operation.importsMock],
+var generateTargetTags = (currentAcc, operation, options) => {
+  const tag = kebab(operation.tags[0]);
+  const currentOperation = currentAcc[tag];
+  if (!currentOperation) {
+    currentAcc[tag] = {
+      imports: operation.imports,
+      importsMock: operation.importsMock,
+      mutators: operation.mutator ? [operation.mutator] : [],
+      clientMutators: operation.clientMutators ?? [],
+      formData: operation.formData ? [operation.formData] : [],
+      formUrlEncoded: operation.formUrlEncoded ? [operation.formUrlEncoded] : [],
+      paramsSerializer: operation.paramsSerializer ? [operation.paramsSerializer] : [],
+      implementation: operation.implementation,
       implementationMock: {
-        function: currentOperation.implementationMock.function + operation.implementationMock.function,
-        handler: currentOperation.implementationMock.handler + operation.implementationMock.handler,
-        handlerName: currentOperation.implementationMock.handlerName + ",\n  " + operation.implementationMock.handlerName + "()"
-      },
-      mutators: operation.mutator ? [...currentOperation.mutators ?? [], operation.mutator] : currentOperation.mutators,
-      clientMutators: operation.clientMutators ? [
-        ...currentOperation.clientMutators ?? [],
-        ...operation.clientMutators
-      ] : currentOperation.clientMutators,
-      formData: operation.formData ? [...currentOperation.formData ?? [], operation.formData] : currentOperation.formData,
-      formUrlEncoded: operation.formUrlEncoded ? [...currentOperation.formUrlEncoded ?? [], operation.formUrlEncoded] : currentOperation.formUrlEncoded,
-      paramsSerializer: operation.paramsSerializer ? [
-        ...currentOperation.paramsSerializer ?? [],
-        operation.paramsSerializer
-      ] : currentOperation.paramsSerializer
+        function: operation.implementationMock.function,
+        handler: operation.implementationMock.handler,
+        handlerName: "  " + operation.implementationMock.handlerName + "()"
+      }
     };
-    return acc;
-  }, currentAcc);
+    return currentAcc;
+  }
+  currentAcc[tag] = {
+    implementation: currentOperation.implementation + operation.implementation,
+    imports: [...currentOperation.imports, ...operation.imports],
+    importsMock: [...currentOperation.importsMock, ...operation.importsMock],
+    implementationMock: {
+      function: currentOperation.implementationMock.function + operation.implementationMock.function,
+      handler: currentOperation.implementationMock.handler + operation.implementationMock.handler,
+      handlerName: currentOperation.implementationMock.handlerName + ",\n  " + operation.implementationMock.handlerName + "()"
+    },
+    mutators: operation.mutator ? [...currentOperation.mutators ?? [], operation.mutator] : currentOperation.mutators,
+    clientMutators: operation.clientMutators ? [
+      ...currentOperation.clientMutators ?? [],
+      ...operation.clientMutators
+    ] : currentOperation.clientMutators,
+    formData: operation.formData ? [...currentOperation.formData ?? [], operation.formData] : currentOperation.formData,
+    formUrlEncoded: operation.formUrlEncoded ? [...currentOperation.formUrlEncoded ?? [], operation.formUrlEncoded] : currentOperation.formUrlEncoded,
+    paramsSerializer: operation.paramsSerializer ? [
+      ...currentOperation.paramsSerializer ?? [],
+      operation.paramsSerializer
+    ] : currentOperation.paramsSerializer
+  };
+  return currentAcc;
 };
 var generateTargetForTags = (builder, options) => {
   const isAngularClient = options.client === OutputClient.ANGULAR;
   const allTargetTags = Object.values(builder.operations).map(addDefaultTagIfEmpty).reduce(
     (acc, operation, index3, arr) => {
-      const targetTags = generateTargetTags(acc, operation);
+      const targetTags = generateTargetTags(acc, operation, options);
       if (index3 === arr.length - 1) {
         return Object.entries(targetTags).reduce((acc2, [tag, target]) => {
           const isMutator = !!target.mutators?.some(
@@ -52832,6 +52864,13 @@ var writeSplitTagsMode = async ({
   const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(
     output.tsconfig
   );
+  const indexFilePath = output.mock && !isFunction2(output.mock) && output.mock.indexMockFiles ? path_exports.join(
+    dirname3,
+    "index." + getMockFileExtensionByTypeName(output.mock) + extension
+  ) : void 0;
+  if (indexFilePath) {
+    await import_fs_extra5.default.outputFile(indexFilePath, "");
+  }
   const generatedFilePathsArray = await Promise.all(
     Object.entries(target).map(async ([tag, target2]) => {
       try {
@@ -52943,6 +52982,15 @@ ${implementationMock}`;
         ) : void 0;
         if (mockPath) {
           await import_fs_extra5.default.outputFile(mockPath, mockData);
+          if (indexFilePath) {
+            const localMockPath = path_exports.joinSafe(
+              "./",
+              tag,
+              tag + "." + getMockFileExtensionByTypeName(output.mock)
+            );
+            import_fs_extra5.default.appendFile(indexFilePath, `export * from '${localMockPath}'
+`);
+          }
         }
         return [
           implementationPath,