hono-takibi 0.9.51 → 0.9.52

package/dist/cli/index.js

@@ -72,9 +72,8 @@ export async function honoTakibi() {
             return { ok: false, error: cliResult.error };
         const cli = cliResult.value;
         const takibiResult = await takibi(cli.input, cli.output, cli.exportSchema ?? false, cli.exportType ?? false, cli.template ?? false, cli.test ?? false, cli.basePath);
-        if (!takibiResult.ok) {
+        if (!takibiResult.ok)
             return { ok: false, error: takibiResult.error };
-        }
         return {
             ok: true,
             value: takibiResult.value,
@@ -91,30 +90,26 @@ export async function honoTakibi() {
         ? await takibi(c.input, c['zod-openapi']?.output, c['zod-openapi']?.exportSchema ?? false, c['zod-openapi']?.exportType ?? false, false, // template
         false)
         : undefined;
-    if (takibiResult && !takibiResult.ok) {
+    if (takibiResult && !takibiResult.ok)
         return { ok: false, error: takibiResult.error };
-    }
     /** schema */
     const schemaResult = c['zod-openapi']?.schema
         ? await schema(c.input, c['zod-openapi'].schema.output, c['zod-openapi'].schema.exportType ?? false, c['zod-openapi']?.schema.split ?? false)
         : undefined;
-    if (schemaResult && !schemaResult.ok) {
+    if (schemaResult && !schemaResult.ok)
         return { ok: false, error: schemaResult.error };
-    }
     /** route */
     const routeResult = c['zod-openapi']?.route
         ? await route(c.input, c['zod-openapi'].route.output, c['zod-openapi'].route.import, c['zod-openapi'].route.split ?? false)
         : undefined;
-    if (routeResult && !routeResult.ok) {
+    if (routeResult && !routeResult.ok)
         return { ok: false, error: routeResult.error };
-    }
     /** rpc */
     const rpcResult = c.rpc
         ? await rpc(c.input, c.rpc.output, c.rpc.import, c.rpc.split ?? false)
         : undefined;
-    if (rpcResult && !rpcResult.ok) {
+    if (rpcResult && !rpcResult.ok)
         return { ok: false, error: rpcResult.error };
-    }
     const results = [takibiResult?.value, rpcResult?.value].filter((v) => Boolean(v));
     return {
         ok: true,

package/dist/config/index.js

@@ -11,9 +11,8 @@ export async function config() {
         register();
         const url = pathToFileURL(abs).href;
         const mod = await import(/* @vite-ignore */ url);
-        if (!('default' in mod) || mod.default === undefined) {
+        if (!('default' in mod) || mod.default === undefined)
             return { ok: false, error: 'Config must export default object' };
-        }
         const result = parseConfig(mod.default);
         if (!result.ok)
             return { ok: false, error: result.error };

package/dist/core/route.js

@@ -24,9 +24,8 @@ const extractRouteBlocks = (src) => {
 const lowerFirst = (s) => (s ? s.charAt(0).toLowerCase() + s.slice(1) : s);
 export async function route(input, output, importPath, split) {
     const openAPIResult = await parseOpenAPI(input);
-    if (!openAPIResult.ok) {
+    if (!openAPIResult.ok)
         return { ok: false, error: openAPIResult.error };
-    }
     const openAPI = openAPIResult.value;
     const routesSrc = routeCode(openAPI.paths);
     if (!split) {

package/dist/core/rpc.js

@@ -236,9 +236,15 @@ const generateOperationCode = (pathStr, method, item, deps) => {
         : `${deps.client}${clientAccess}.$${method}()`;
     const summary = typeof op.summary === 'string' ? op.summary : '';
     const description = typeof op.description === 'string' ? op.description : '';
-    const summaryBlock = summary ? ` * ${summary}\n *\n` : '';
-    const descriptionBlock = description ? ` * ${description}\n *\n` : '';
-    return `/**\n${summaryBlock}${descriptionBlock} * ${method.toUpperCase()} ${pathStr}\n */\nexport async function ${funcName}(${argSig}){return await ${call}}`;
+    const docs = [
+        '/**',
+        ` * ${method.toUpperCase()} ${pathStr}`,
+        ...(summary ? [' *', ` * ${summary.trimEnd()}`] : []),
+        ...(description ? [' *', ` * ${description.trimEnd()}`] : []),
+        ' */',
+    ].join('\n');
+    const func = `export async function ${funcName}(${argSig}){return await ${call}}`;
+    return `${docs}\n${func}`;
 };
 /* ─────────────────────────────── Split ─────────────────────────────── */
 const resolveSplitOutDir = (output) => {
@@ -256,9 +262,8 @@ const resolveSplitOutDir = (output) => {
  */
 export async function rpc(input, output, importPath, split) {
     const openAPIResult = await parseOpenAPI(input);
-    if (!openAPIResult.ok) {
+    if (!openAPIResult.ok)
         return { ok: false, error: openAPIResult.error };
-    }
     const openAPI = openAPIResult.value;
     const client = 'client';
     const s = `import { client } from '${importPath}'`;
@@ -309,12 +314,12 @@ export async function rpc(input, output, importPath, split) {
                     return { ok: false, error: fmtResult.error };
                 const { outDir } = resolveSplitOutDir(output);
                 const filePath = path.join(outDir, `${funcName}.ts`);
-                const mk = await mkdir(path.dirname(filePath));
-                if (!mk.ok)
-                    return { ok: false, error: mk.error };
-                const wr = await writeFile(filePath, fmtResult.value);
-                if (!wr.ok)
-                    return { ok: false, error: wr.error };
+                const mkdirResult = await mkdir(path.dirname(filePath));
+                if (!mkdirResult.ok)
+                    return { ok: false, error: mkdirResult.error };
+                const writeResult = await writeFile(filePath, fmtResult.value);
+                if (!writeResult.ok)
+                    return { ok: false, error: writeResult.error };
                 splitExports.add(`export * from './${funcName}'`);
             }
             else {
@@ -324,9 +329,9 @@ export async function rpc(input, output, importPath, split) {
     }
     // Non-split: write single file
     if (!split) {
-        const mk = await mkdir(path.dirname(output));
-        if (!mk.ok)
-            return { ok: false, error: mk.error };
+        const mkdirResult = await mkdir(path.dirname(output));
+        if (!mkdirResult.ok)
+            return { ok: false, error: mkdirResult.error };
         const code = `${header}${combinedOut.join('\n\n')}${combinedOut.length ? '\n' : ''}`;
         const fmtResult = await fmt(code);
         if (!fmtResult.ok)
@@ -338,8 +343,8 @@ export async function rpc(input, output, importPath, split) {
     }
     // Split: write index.ts (barrel)
     const { outDir, indexPath } = resolveSplitOutDir(output);
-    const indexBody = `${Array.from(splitExports).sort().join('\n')}\n`;
-    const fmtResult = await fmt(indexBody);
+    const index = `${Array.from(splitExports).sort().join('\n')}\n`;
+    const fmtResult = await fmt(index);
     if (!fmtResult.ok)
         return { ok: false, error: fmtResult.error };
     const mkdirResult = await mkdir(path.dirname(indexPath));

package/dist/core/schema.js

@@ -43,9 +43,8 @@ export async function schema(input, output, exportType, split) {
     }
     const openAPI = openAPIResult.value;
     const { schemas } = openAPI.components ? openAPI.components : {};
-    if (!schemas) {
+    if (!schemas)
         return { ok: false, error: 'No schemas found' };
-    }
     // split
     if (split) {
         const outDir = output.replace(/\.ts$/, '');
@@ -60,37 +59,31 @@ export async function schema(input, output, exportType, split) {
                 ? deps.map((d) => `import { ${d}Schema } from './${lowerFirst(d)}'`).join('\n')
                 : '';
             const fileCode = [importZ, depImports, '\n', zs].filter(Boolean).join('\n');
+            const filePath = `${outDir}/${lowerFirst(schemaName)}.ts`;
             const fmtResult = await fmt(fileCode);
-            if (!fmtResult.ok) {
+            if (!fmtResult.ok)
                 return { ok: false, error: fmtResult.error };
-            }
-            const filePath = `${outDir}/${lowerFirst(schemaName)}.ts`;
             const mkdirResult = await mkdir(path.dirname(filePath));
-            if (!mkdirResult.ok) {
+            if (!mkdirResult.ok)
                 return { ok: false, error: mkdirResult.error };
-            }
             const writeResult = await writeFile(filePath, fmtResult.value);
-            if (!writeResult.ok) {
+            if (!writeResult.ok)
                 return { ok: false, error: writeResult.error };
-            }
         }
         // index.ts
-        const indexBody = `${Object.keys(schemas)
+        const index = `${Object.keys(schemas)
             .sort()
             .map((n) => `export * from './${lowerFirst(n)}'`)
             .join('\n')}\n`;
-        const fmtResult = await fmt(indexBody);
-        if (!fmtResult.ok) {
+        const fmtResult = await fmt(index);
+        if (!fmtResult.ok)
             return { ok: false, error: fmtResult.error };
-        }
         const mkdirResult = await mkdir(path.dirname(`${outDir}/index.ts`));
-        if (!mkdirResult.ok) {
+        if (!mkdirResult.ok)
             return { ok: false, error: mkdirResult.error };
-        }
         const writeResult = await writeFile(`${outDir}/index.ts`, fmtResult.value);
-        if (!writeResult.ok) {
+        if (!writeResult.ok)
             return { ok: false, error: writeResult.error };
-        }
         return {
             ok: true,
             value: `Generated schema code written to ${outDir}/*.ts (index.ts included)`,
@@ -110,16 +103,13 @@ export async function schema(input, output, exportType, split) {
     const importCode = `import { z } from '@hono/zod-openapi'`;
     const schemaDefinitionsCode = `${importCode}\n\n${schemaDefinitions}`;
     const fmtResult = await fmt(schemaDefinitionsCode);
-    if (!fmtResult.ok) {
+    if (!fmtResult.ok)
         return { ok: false, error: fmtResult.error };
-    }
     const mkdirResult = await mkdir(path.dirname(output));
-    if (!mkdirResult.ok) {
+    if (!mkdirResult.ok)
         return { ok: false, error: mkdirResult.error };
-    }
     const writeResult = await writeFile(output, fmtResult.value);
-    if (!writeResult.ok) {
+    if (!writeResult.ok)
         return { ok: false, error: writeResult.error };
-    }
     return { ok: true, value: `Generated schema code written to ${output}` };
 }

package/dist/core/takibi.js

@@ -54,42 +54,34 @@ import { isHttpMethod, methodPath } from '../utils/index.js';
  */
 export async function takibi(input, output, exportSchema, exportType, template, test, basePath) {
     const openAPIResult = await parseOpenAPI(input);
-    if (!openAPIResult.ok) {
+    if (!openAPIResult.ok)
         return { ok: false, error: openAPIResult.error };
-    }
     const openAPI = openAPIResult.value;
     const honoResult = await fmt(zodOpenAPIHono(openAPI, exportSchema, exportType));
-    if (!honoResult.ok) {
+    if (!honoResult.ok)
         return { ok: false, error: honoResult.error };
-    }
     const mkdirResult = await mkdir(path.dirname(output));
-    if (!mkdirResult.ok) {
+    if (!mkdirResult.ok)
         return { ok: false, error: mkdirResult.error };
-    }
     const writeResult = await writeFile(output, honoResult.value);
-    if (!writeResult.ok) {
+    if (!writeResult.ok)
         return { ok: false, error: writeResult.error };
-    }
     /** template */
     if (template && output.includes('/')) {
         const appResult = await fmt(app(openAPI, output, basePath));
-        if (!appResult.ok) {
+        if (!appResult.ok)
             return { ok: false, error: appResult.error };
-        }
         const dir = path.dirname(output);
         const readdirResult = await readdir(dir);
-        if (!readdirResult.ok) {
+        if (!readdirResult.ok)
             return { ok: false, error: readdirResult.error };
-        }
         const target = path.join(dir, 'index.ts');
         const writeResult = await writeFile(target, appResult.value);
-        if (!writeResult.ok) {
+        if (!writeResult.ok)
             return { ok: false, error: writeResult.error };
-        }
         const zodOpenapiHonoHandlerResult = await zodOpenapiHonoHandler(openAPI, output, test);
-        if (!zodOpenapiHonoHandlerResult.ok) {
+        if (!zodOpenapiHonoHandlerResult.ok)
             return { ok: false, error: zodOpenapiHonoHandlerResult.error };
-        }
         return { ok: true, value: 'Generated code and template files written' };
     }
     return {
@@ -156,10 +148,7 @@ async function zodOpenapiHonoHandler(openapi, output, test) {
     const importFrom = `../${routeEntryBasename.replace(/\.ts$/, '')}`;
     const mkdirResult = await mkdir(handlerPath);
     if (!mkdirResult.ok)
-        return {
-            ok: false,
-            error: mkdirResult.error,
-        };
+        return { ok: false, error: mkdirResult.error };
     for (const handler of mergedHandlers) {
         const routeTypes = Array.from(new Set(handler.routeNames)).join(', ');
         const importRouteTypes = routeTypes ? `import type { ${routeTypes} } from '${importFrom}';` : '';
@@ -167,38 +156,23 @@ async function zodOpenapiHonoHandler(openapi, output, test) {
         const fileContent = `${importStatements}\n\n${handler.routeHandlerContents.join('\n\n')}`;
         const fmtResult = await fmt(fileContent);
         if (!fmtResult.ok)
-            return {
-                ok: false,
-                error: fmtResult.error,
-            };
+            return { ok: false, error: fmtResult.error };
         const writeResult = await writeFile(`${handlerPath}/${handler.fileName}`, fmtResult.value);
         if (!writeResult.ok)
-            return {
-                ok: false,
-                error: writeResult.error,
-            };
+            return { ok: false, error: writeResult.error };
         if (test) {
             const writeResult = await writeFile(`${handlerPath}/${handler.testFileName}`, '');
             if (!writeResult.ok)
-                return {
-                    ok: false,
-                    error: writeResult.error,
-                };
+                return { ok: false, error: writeResult.error };
         }
     }
     const sorted = mergedHandlers.map((h) => h.fileName).sort();
     const exports = sorted.map((h) => `export * from './${h}'`).join('\n');
     const fmtResult = await fmt(exports);
     if (!fmtResult.ok)
-        return {
-            ok: false,
-            error: fmtResult.error,
-        };
+        return { ok: false, error: fmtResult.error };
     const writeResult = await writeFile(`${handlerPath}/index.ts`, fmtResult.value);
     if (!writeResult.ok)
-        return {
-            ok: false,
-            error: writeResult.error,
-        };
+        return { ok: false, error: writeResult.error };
     return { ok: true, value: undefined };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hono-takibi",
   "description": "Hono Takibi is a CLI tool that generates Hono routes from OpenAPI specifications.",
-  "version": "0.9.51",
+  "version": "0.9.52",
   "type": "module",
   "license": "MIT",
   "keywords": [