@orval/hono 7.4.1 → 7.6.0

package/dist/index.js

@@ -2171,7 +2171,7 @@ var getRoutePath = (path) => {
   const matches = path.match(/([^{]*){?([\w*_-]*)}?(.*)/);
   if (!(matches == null ? void 0 : matches.length)) return path;
   const prev = matches[1];
-  const param = (0, import_core.sanitize)((0, import_core.camel)(matches[2]), {
+  const param = (0, import_core.sanitize)(matches[2], {
     es5keyword: true,
     underscore: true,
     dash: true,
@@ -2224,11 +2224,12 @@ var getHonoHeader = ({
 }) => {
   const targetInfo = (0, import_core2.getFileInfo)(output.target);
   let handlers = "";
+  const importHandlers = Object.values(verbOptions).filter(
+    (verbOption) => clientImplementation.includes(`${verbOption.operationName}Handlers`)
+  );
   if (output.override.hono.handlers) {
     const handlerFileInfo = (0, import_core2.getFileInfo)(output.override.hono.handlers);
-    handlers = Object.values(verbOptions).filter(
-      (verbOption) => clientImplementation.includes(`${verbOption.operationName}Handlers`)
-    ).map((verbOption) => {
+    handlers = importHandlers.map((verbOption) => {
       var _a, _b, _c;
       const isTagMode = output.mode === "tags" || output.mode === "tags-split";
       const tag2 = (0, import_core2.kebab)((_a = verbOption.tags[0]) != null ? _a : "default");
@@ -2242,9 +2243,10 @@ var getHonoHeader = ({
       return `import { ${verbOption.operationName}Handlers } from '${handlersPath}';`;
     }).join("\n");
   } else {
+    const importHandlerNames = importHandlers.map((verbOption) => ` ${verbOption.operationName}Handlers`).join(`, 
+`);
     handlers = `import {
-${Object.values(verbOptions).map((verbOption) => ` ${verbOption.operationName}Handlers`).join(`, 
-`)}
+${importHandlerNames}
 } from './${tag != null ? tag : targetInfo.filename}.handlers';`;
   }
   return `${handlers}
@@ -2255,13 +2257,19 @@ const app = new Hono()
 `;
 };
 var getHonoFooter = () => "export default app";
-var generateHonoRoute = ({ operationName, verb }, { pathRoute }) => {
+var generateHonoRoute = ({ operationName, verb }, pathRoute) => {
   const path = getRoute(pathRoute);
   return `
 app.${verb.toLowerCase()}('${path}',...${operationName}Handlers)`;
 };
 var generateHono = async (verbOptions, options) => {
-  const routeImplementation = generateHonoRoute(verbOptions, options);
+  if (options.override.hono.compositeRoute) {
+    return {
+      implementation: "",
+      imports: []
+    };
+  }
+  const routeImplementation = generateHonoRoute(verbOptions, options.pathRoute);
   return {
     implementation: routeImplementation ? `${routeImplementation}
 
@@ -2314,25 +2322,34 @@ ${currentValidator}async (c: ${contextTypeName}) => {
   },
 );`;
 };
-var getZvalidatorImports = (verbOption, isHonoValidator) => {
-  var _a, _b, _c;
-  const imports = [];
-  if (verbOption.headers) {
-    imports.push(`${verbOption.operationName}Header`);
-  }
-  if (verbOption.params.length) {
-    imports.push(`${verbOption.operationName}Params`);
-  }
-  if (verbOption.queryParams) {
-    imports.push(`${verbOption.operationName}QueryParams`);
-  }
-  if (verbOption.body.definition) {
-    imports.push(`${verbOption.operationName}Body`);
-  }
-  if (!isHonoValidator && !!((_c = (_b = (_a = verbOption.response.originalSchema) == null ? void 0 : _a["200"]) == null ? void 0 : _b.content) == null ? void 0 : _c["application/json"])) {
-    imports.push(`${verbOption.operationName}Response`);
-  }
-  return imports.join(",\n");
+var getValidatorOutputRelativePath = (validatorOutputPath, handlerPath) => {
+  const { pathWithoutExtension } = (0, import_core2.getFileInfo)(validatorOutputPath);
+  return import_core2.upath.relativeSafe(import_core2.upath.dirname(handlerPath), pathWithoutExtension);
+};
+var getZvalidatorImports = (verbOptions, importPath, isHonoValidator) => {
+  const importImplementation = verbOptions.flatMap((verbOption) => {
+    var _a, _b, _c;
+    const imports = [];
+    if (verbOption.headers) {
+      imports.push(`${verbOption.operationName}Header`);
+    }
+    if (verbOption.params.length) {
+      imports.push(`${verbOption.operationName}Params`);
+    }
+    if (verbOption.queryParams) {
+      imports.push(`${verbOption.operationName}QueryParams`);
+    }
+    if (verbOption.body.definition) {
+      imports.push(`${verbOption.operationName}Body`);
+    }
+    if (!isHonoValidator && !!((_c = (_b = (_a = verbOption.response.originalSchema) == null ? void 0 : _a["200"]) == null ? void 0 : _b.content) == null ? void 0 : _c["application/json"])) {
+      imports.push(`${verbOption.operationName}Response`);
+    }
+    return imports.join(",\n");
+  }).join(",\n");
+  return importImplementation ? `import {
+${importImplementation}
+} from '${importPath}'` : "";
 };
 var getVerbOptionGroupByTag = (verbOptions) => {
   return Object.values(verbOptions).reduce(
@@ -2365,7 +2382,7 @@ var generateHandlers = async (verbOptions, output) => {
           (_c = output.override.hono.handlers) != null ? _c : "",
           `./${verbOption.operationName}` + extension
         );
-        const hasZValidator2 = !!verbOption.headers || !!verbOption.params.length || !!verbOption.queryParams || !!verbOption.body;
+        const hasZValidator2 = !!verbOption.headers || !!verbOption.params.length || !!verbOption.queryParams || !!verbOption.body.definition;
         const isExist2 = import_fs_extra.default.existsSync(handlerPath2);
         const handlerName = `${verbOption.operationName}Handlers`;
         const contextTypeName = `${(0, import_core2.pascal)(verbOption.operationName)}Context`;
@@ -2388,17 +2405,22 @@ var generateHandlers = async (verbOptions, output) => {
         let validatorImport2 = "";
         if (hasZValidator2) {
           if (output.override.hono.validator === true) {
+            const validatorPath = output.override.hono.validatorOutputPath ? getValidatorOutputRelativePath(
+              output.override.hono.validatorOutputPath,
+              handlerPath2
+            ) : `${outputPath}.validator`;
             validatorImport2 = `
-import { zValidator } from '${outputPath}.validator';`;
+import { zValidator } from '${validatorPath}';`;
           } else if (output.override.hono.validator === "hono") {
             validatorImport2 = `
 import { zValidator } from '@hono/zod-validator';`;
           }
         }
-        const zodImports2 = output.override.hono.validator ? `import { ${getZvalidatorImports(
-          verbOption,
+        const zodImports2 = output.override.hono.validator ? getZvalidatorImports(
+          [verbOption],
+          `${outputPath}.zod`,
           output.override.hono.validator === "hono"
-        )} } from '${outputPath}.zod';` : "";
+        ) : "";
         const content2 = `import { createFactory } from 'hono/factory';${validatorImport2}
 import { ${contextTypeName} } from '${outputPath}.context';
 ${zodImports2}
@@ -2425,7 +2447,7 @@ ${getHonoHandlers({
       Object.entries(groupByTags).map(async ([tag, verbs]) => {
         const handlerPath2 = output.mode === "tags" ? import_core2.upath.join(dirname, `${(0, import_core2.kebab)(tag)}.handlers${extension}`) : import_core2.upath.join(dirname, tag, tag + ".handlers" + extension);
         const hasZValidator2 = verbs.some(
-          (verb) => !!verb.headers || !!verb.params.length || !!verb.queryParams || !!verb.body
+          (verb) => !!verb.headers || !!verb.params.length || !!verb.queryParams || !!verb.body.definition
         );
         const isExist2 = import_fs_extra.default.existsSync(handlerPath2);
         if (isExist2) {
@@ -2451,26 +2473,30 @@ ${getHonoHandlers({
             path: handlerPath2
           };
         }
-        const outputRelativePath2 = `./${(0, import_core2.kebab)(tag)}`;
         let validatorImport2 = "";
         if (hasZValidator2) {
           if (output.override.hono.validator === true) {
+            const validatorOutputPath = output.override.hono.validatorOutputPath || `${dirname}/${filename}.validator${extension}`;
+            const validatorPath = getValidatorOutputRelativePath(
+              validatorOutputPath,
+              handlerPath2
+            );
             validatorImport2 = `
-import { zValidator } from '${outputRelativePath2}.validator';`;
+import { zValidator } from '${validatorPath}';`;
           } else if (output.override.hono.validator === "hono") {
             validatorImport2 = `
 import { zValidator } from '@hono/zod-validator';`;
           }
         }
-        const zodImports2 = output.override.hono.validator ? `import { ${Object.values(verbs).map(
-          (verb) => getZvalidatorImports(
-            verb,
-            output.override.hono.validator === "hono"
-          )
-        ).join(",\n")} } from '${outputRelativePath2}.zod'` : "";
+        const outputRelativePath2 = `./${(0, import_core2.kebab)(tag)}`;
+        const zodImports2 = output.override.hono.validator ? getZvalidatorImports(
+          Object.values(verbs),
+          `${outputRelativePath2}.zod`,
+          output.override.hono.validator === "hono"
+        ) : "";
         let content2 = `import { createFactory } from 'hono/factory';${validatorImport2}
 import { ${Object.values(verbs).map((verb) => `${(0, import_core2.pascal)(verb.operationName)}Context`).join(",\n")} } from '${outputRelativePath2}.context';
-${zodImports2};
+${zodImports2}
 
 const factory = createFactory();`;
         content2 += Object.values(verbs).reduce((acc, verbOption) => {
@@ -2492,7 +2518,7 @@ const factory = createFactory();`;
     );
   }
   const hasZValidator = Object.values(verbOptions).some(
-    (verb) => !!verb.headers || !!verb.params.length || !!verb.queryParams || !!verb.body || verb.response.contentTypes.length === 1 && verb.response.contentTypes[0] === "application/json"
+    (verb) => !!verb.headers || !!verb.params.length || !!verb.queryParams || !!verb.body.definition || verb.response.contentTypes.length === 1 && verb.response.contentTypes[0] === "application/json"
   );
   const handlerPath = import_core2.upath.join(dirname, `${filename}.handlers${extension}`);
   const isExist = import_fs_extra.default.existsSync(handlerPath);
@@ -2523,16 +2549,22 @@ const factory = createFactory();`;
   let validatorImport = "";
   if (hasZValidator) {
     if (output.override.hono.validator === true) {
+      const validatorPath = output.override.hono.validatorOutputPath ? getValidatorOutputRelativePath(
+        output.override.hono.validatorOutputPath,
+        handlerPath
+      ) : `${outputRelativePath}.validator`;
       validatorImport = `
-import { zValidator } from '${outputRelativePath}.validator';`;
+import { zValidator } from '${validatorPath}';`;
     } else if (output.override.hono.validator === "hono") {
       validatorImport = `
 import { zValidator } from '@hono/zod-validator';`;
     }
   }
-  const zodImports = output.override.hono.validator ? `import { ${Object.values(verbOptions).map(
-    (verb) => getZvalidatorImports(verb, output.override.hono.validator === "hono")
-  ).join(",\n")} } from '${outputRelativePath}.zod';` : "";
+  const zodImports = output.override.hono.validator ? getZvalidatorImports(
+    Object.values(verbOptions),
+    `${outputRelativePath}.zod`,
+    output.override.hono.validator === "hono"
+  ) : "";
   let content = `import { createFactory } from 'hono/factory';${validatorImport}
 import { ${Object.values(verbOptions).map((verb) => `${(0, import_core2.pascal)(verb.operationName)}Context`).join(",\n")} } from '${outputRelativePath}.context';
 ${zodImports}
@@ -2558,9 +2590,23 @@ const factory = createFactory();`;
 };
 var getContext = (verbOption) => {
   var _a;
-  const paramType = verbOption.params.length ? `param: {
- ${verbOption.params.map((property) => property.definition).join(",\n    ")},
- },` : "";
+  let paramType = "";
+  if (verbOption.params.length) {
+    const params = (0, import_core2.getParamsInPath)(verbOption.pathRoute).map((name) => {
+      var _a2;
+      const param = verbOption.params.find(
+        (p) => p.name === (0, import_core2.sanitize)((0, import_core2.camel)(name), { es5keyword: true })
+      );
+      const definition = param == null ? void 0 : param.definition.split(":")[1];
+      const required = (_a2 = param == null ? void 0 : param.required) != null ? _a2 : false;
+      return {
+        definition: `${name}${!required ? "?" : ""}:${definition}`
+      };
+    });
+    paramType = `param: {
+ ${params.map((property) => property.definition).join(",\n    ")},
+ },`;
+  }
   const queryType = verbOption.queryParams ? `query: ${(_a = verbOption.queryParams) == null ? void 0 : _a.schema.name},` : "";
   const bodyType = verbOption.body.definition ? `json: ${verbOption.body.definition},` : "";
   const hasIn = !!paramType || !!queryType || !!bodyType;
@@ -2607,14 +2653,21 @@ var generateContext = async (verbOptions, output, context) => {
             imports.push(...verb.body.imports);
           }
           return imports;
-        }).filter((imp) => contexts2.includes(imp.name));
+        }).filter((imp) => contexts2.includes(imp.name)).filter(
+          (imp, i, arr) => arr.findIndex((v) => v.name === imp.name) === i
+        );
         if (contexts2.includes("NonReadonly<")) {
           content2 += (0, import_core2.getOrvalGeneratedTypes)();
           content2 += "\n";
         }
-        content2 += `import { ${imps2.map((imp) => imp.name).join(",\n")} } from '${relativeSchemasPath2}';
+        if (imps2.length > 0) {
+          const importSchemas = imps2.map((imp) => imp.name).join(",\n  ");
+          content2 += `import {
+  ${importSchemas}
+} from '${relativeSchemasPath2}';
 
 `;
+        }
         content2 += contexts2;
         const contextPath2 = output.mode === "tags" ? import_core2.upath.join(dirname, `${(0, import_core2.kebab)(tag)}.context${extension}`) : import_core2.upath.join(dirname, tag, tag + ".context" + extension);
         return {
@@ -2643,7 +2696,7 @@ var generateContext = async (verbOptions, output, context) => {
       imports.push(...verb.body.imports);
     }
     return imports;
-  }).filter((imp) => contexts.includes(imp.name));
+  }).filter((imp) => contexts.includes(imp.name)).filter((imp, i, arr) => arr.findIndex((v) => v.name === imp.name) === i);
   if (contexts.includes("NonReadonly<")) {
     content += (0, import_core2.getOrvalGeneratedTypes)();
     content += "\n";
@@ -2668,7 +2721,7 @@ var generateZodFiles = async (verbOptions, output, context) => {
   );
   if (output.mode === "tags" || output.mode === "tags-split") {
     const groupByTags = getVerbOptionGroupByTag(verbOptions);
-    return Promise.all(
+    const builderContexts = await Promise.all(
       Object.entries(groupByTags).map(async ([tag, verbs]) => {
         const zods2 = await Promise.all(
           verbs.map(
@@ -2686,6 +2739,12 @@ var generateZodFiles = async (verbOptions, output, context) => {
             )
           )
         );
+        if (zods2.every((z) => z.implementation === "")) {
+          return {
+            content: "",
+            path: ""
+          };
+        }
         const allMutators2 = zods2.reduce(
           (acc, z) => {
             var _a;
@@ -2710,6 +2769,9 @@ ${mutatorsImports2}
         };
       })
     );
+    return Promise.all(
+      builderContexts.filter((context2) => context2.content !== "")
+    );
   }
   const zods = await Promise.all(
     Object.values(verbOptions).map(
@@ -2757,7 +2819,6 @@ var generateZvalidator = (output, context) => {
     output.override.header,
     context.specs[context.specKey].info
   );
-  const { extension, dirname, filename } = (0, import_core2.getFileInfo)(output.target);
   const content = `
 // based on https://github.com/honojs/middleware/blob/main/packages/zod-validator/src/index.ts
 import type { z, ZodSchema, ZodError } from 'zod';
@@ -2895,29 +2956,99 @@ export const zValidator =
         c.res = new Response(JSON.stringify(result.data), c.res);
       }
     }
+    
+    return;
   };
 `;
-  const validatorPath = import_core2.upath.join(
-    dirname,
-    `${filename}.validator${extension}`
-  );
+  let validatorPath = output.override.hono.validatorOutputPath;
+  if (!output.override.hono.validatorOutputPath) {
+    const { extension, dirname, filename } = (0, import_core2.getFileInfo)(output.target);
+    validatorPath = import_core2.upath.join(dirname, `${filename}.validator${extension}`);
+  }
   return {
     content: `${header}${content}`,
     path: validatorPath
   };
 };
+var generateCompositeRoutes = async (verbOptions, output, context) => {
+  const targetInfo = (0, import_core2.getFileInfo)(output.target);
+  const compositeRouteInfo = (0, import_core2.getFileInfo)(output.override.hono.compositeRoute);
+  const header = getHeader(
+    output.override.header,
+    context.specs[context.specKey].info
+  );
+  const routes = Object.values(verbOptions).map((verbOption) => {
+    return generateHonoRoute(verbOption, verbOption.pathRoute);
+  }).join(";");
+  const importHandlers = Object.values(verbOptions);
+  let ImportHandlersImplementation = "";
+  if (output.override.hono.handlers) {
+    const handlerFileInfo = (0, import_core2.getFileInfo)(output.override.hono.handlers);
+    const operationNames = importHandlers.map(
+      (verbOption) => verbOption.operationName
+    );
+    ImportHandlersImplementation = operationNames.map((operationName) => {
+      var _a;
+      const importHandlerName = `${operationName}Handlers`;
+      const handlersPath = import_core2.upath.relativeSafe(
+        compositeRouteInfo.dirname,
+        import_core2.upath.join((_a = handlerFileInfo.dirname) != null ? _a : "", `./${operationName}`)
+      );
+      return `import { ${importHandlerName} } from '${handlersPath}';`;
+    }).join("\n");
+  } else {
+    const tags = importHandlers.map(
+      (verbOption) => {
+        var _a;
+        return (0, import_core2.kebab)((_a = verbOption.tags[0]) != null ? _a : "default");
+      }
+    );
+    const uniqueTags = tags.filter((t, i) => tags.indexOf(t) === i);
+    ImportHandlersImplementation = uniqueTags.map((tag) => {
+      var _a;
+      const importHandlerNames = importHandlers.filter((verbOption) => verbOption.tags[0] === tag).map((verbOption) => ` ${verbOption.operationName}Handlers`).join(`, 
+`);
+      const handlersPath = import_core2.upath.relativeSafe(
+        compositeRouteInfo.dirname,
+        import_core2.upath.join((_a = targetInfo.dirname) != null ? _a : "", tag)
+      );
+      return `import {
+${importHandlerNames}
+} from '${handlersPath}/${tag}.handlers';`;
+    }).join("\n");
+  }
+  const honoImport = `import { Hono } from 'hono';`;
+  const honoInitialization = `
+const app = new Hono()`;
+  const honoAppExport = `
+export default app`;
+  const content = `${header}${honoImport}
+${ImportHandlersImplementation}
+${honoInitialization}
+${routes}
+${honoAppExport}
+`;
+  return [
+    {
+      content,
+      path: output.override.hono.compositeRoute || ""
+    }
+  ];
+};
 var generateExtraFiles = async (verbOptions, output, context) => {
-  const [handlers, contexts, zods, validator] = await Promise.all([
+  const [handlers, contexts, zods, validator, compositeRoutes] = await Promise.all([
     generateHandlers(verbOptions, output),
     generateContext(verbOptions, output, context),
     generateZodFiles(verbOptions, output, context),
-    generateZvalidator(output, context)
+    generateZvalidator(output, context),
+    output.override.hono.compositeRoute ? generateCompositeRoutes(verbOptions, output, context) : []
   ]);
   return [
     ...handlers,
     ...contexts,
     ...zods,
-    ...output.override.hono.validator && output.override.hono.validator !== "hono" ? [validator] : []
+    ...output.override.hono.validator && output.override.hono.validator !== "hono" ? [validator] : [],
+    ...compositeRoutes
   ];
 };
 var honoClientBuilder = {