hono-takibi 0.1.3 → 0.1.4

package/dist/core/validator/is-http-method.js

@@ -15,5 +15,6 @@ function isHttpMethod(method) {
         method === 'delete' ||
         method === 'patch' ||
         method === 'options' ||
-        method === 'head');
+        method === 'head' ||
+        method === 'trace');
 }

package/dist/core/validator/is-unique-content-schema.d.ts

@@ -0,0 +1,8 @@
+import type { Content } from '../../types';
+/**
+ * Get unique content schema
+ * @param contentTypes - Content types
+ * @param content - Content
+ * @returns Unique content schema
+ */
+export declare function isUniqueContentSchema(contentTypes: string[], content: Content): boolean;

package/dist/core/validator/is-unique-content-schema.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUniqueContentSchema = isUniqueContentSchema;
+/**
+ * Get unique content schema
+ * @param contentTypes - Content types
+ * @param content - Content
+ * @returns Unique content schema
+ */
+function isUniqueContentSchema(contentTypes, content) {
+    const schema = new Set(contentTypes.map((type) => JSON.stringify(content?.[type].schema)));
+    return schema.size === 1;
+}

package/dist/generators/openapi/paths/generate-route-code.js

@@ -67,9 +67,9 @@ function generateRouteCode(openAPIPaths) {
             // 3.1. skip parameters key and undefined operations
             if (method === 'parameters' || !pathItemValue)
                 continue;
-            // 3.2. check if the method is an actual HTTP method
+            // 3.2. check if the method is an HTTP method
             if (!(0, is_http_method_1.isHttpMethod)(method))
-                continue;
+                throw new Error('Invalid HTTP method');
             // 3.3 exclude the possibility of string or Parameter[]
             if (typeof pathItemValue === 'string' || Array.isArray(pathItemValue))
                 continue;

package/dist/generators/request/body/generate-request-body.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRequestBody = generateRequestBody;
+const is_unique_content_schema_1 = require("../../../core/validator/is-unique-content-schema");
 /**
  * Generates a request body configuration for OpenAPI schema
  *
@@ -23,9 +24,9 @@ function generateRequestBody(required, content, zodSchema) {
     if (contentTypes.length === 0)
         return '';
     // check duplication
-    const schemas = new Set(contentTypes.map((type) => JSON.stringify(content[type].schema)));
+    const isUniqueSchema = (0, is_unique_content_schema_1.isUniqueContentSchema)(contentTypes, content);
     // all duplication same schema
-    if (schemas.size === 1) {
+    if (isUniqueSchema) {
         const contentParts = [];
         for (const contentType of contentTypes) {
             contentParts.push(`'${contentType}':{schema:${zodSchema}}`);

package/dist/generators/request/params/generate-params-object.js

@@ -3,15 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateParamsObject = generateParamsObject;
 const generate_zod_coerce_1 = require("../../zod/generate-zod-coerce");
 const generate_zod_schema_1 = require("../../zod/generate-zod-schema");
-/**
- * Mapping of parameter locations to their corresponding object keys
- */
-const PARAM_LOCATION_TO_KEY = {
-    query: 'query',
-    path: 'params',
-    header: 'headers',
-    body: 'body',
-};
 /**
  * Generates a params object containing Zod schemas for different parameter locations
  *
@@ -72,22 +63,21 @@ const PARAM_LOCATION_TO_KEY = {
  * - Organizes parameters into appropriate objects based on their location
  * - Maintains empty objects for unused parameter locations
  */
-// want to refactor this
 function generateParamsObject(parameters) {
-    const initialParamsObj = {
-        query: {},
-        params: {},
-        headers: {},
-        body: {},
-    };
     return parameters.reduce((acc, param) => {
+        const paramLocation = param.in;
         const optionalSuffix = param.required ? '' : '.optional()';
-        const paramLocation = PARAM_LOCATION_TO_KEY[param.in];
         const baseSchema = (0, generate_zod_schema_1.generateZodSchema)(param.schema);
-        const isCoerceNeeded = paramLocation === 'query' &&
-            (param.schema.type === 'number' || param.schema.type === 'integer');
-        const zodSchema = isCoerceNeeded ? (0, generate_zod_coerce_1.generateZodCoerce)('z.string()', baseSchema) : baseSchema;
+        // Initialize section if it doesn't exist
+        if (!acc[paramLocation]) {
+            acc[paramLocation] = {};
+        }
+        // Handle coercion for query number/integer types
+        const zodSchema = param.in === 'query' && (param.schema.type === 'number' || param.schema.type === 'integer')
+            ? (0, generate_zod_coerce_1.generateZodCoerce)('z.string()', baseSchema)
+            : baseSchema;
+        // Add parameter to its section
         acc[paramLocation][param.name] = `${zodSchema}${optionalSuffix}`;
         return acc;
-    }, initialParamsObj);
+    }, {});
 }

package/dist/generators/request/params/generate-request-params-array.js

@@ -39,7 +39,9 @@ const generate_zod_object_schema_1 = require("../../zod/generate-zod-object-sche
  */
 function generateRequestParamsArray(paramsObj) {
     // 1.  define sections to be processed
-    const sections = ['query', 'params', 'headers'];
+    const sections = Object.entries(paramsObj)
+        .filter(([_, obj]) => obj && Object.keys(obj).length > 0)
+        .map(([section]) => section);
     // 2. processing of each section
     return (sections
         .map((section) => {
@@ -47,6 +49,10 @@ function generateRequestParamsArray(paramsObj) {
         // 2.1 process only if object is not empty
         if (Object.keys(obj).length) {
             const schema = (0, generate_zod_object_schema_1.generateZodObjectSchema)(obj);
+            // path is params convention
+            if (section === 'path') {
+                return `params:${schema}`;
+            }
             return `${section}:${schema}`;
         }
         return null;

package/dist/generators/response/schemas/generate-response-schema.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateResponseSchema = generateResponseSchema;
 const escape_quote_1 = require("../../../core/text/escape-quote");
+const is_unique_content_schema_1 = require("../../../core/validator/is-unique-content-schema");
 const generate_zod_property_schema_1 = require("../../zod/generate-zod-property-schema");
 /**
  * Generates a response schema for different status codes
@@ -79,9 +80,9 @@ function generateResponseSchema(responses) {
         // 2.4 generating a response definition
         // check duplication
         const contentTypes = Object.keys(response.content);
-        const schemas = new Set(contentTypes.map((type) => JSON.stringify(response?.content?.[type].schema)));
+        const isUniqueSchema = (0, is_unique_content_schema_1.isUniqueContentSchema)(contentTypes, response.content);
         // all duplication same schema
-        if (schemas.size === 1) {
+        if (isUniqueSchema) {
             const contentParts = [];
             for (const contentType of contentTypes) {
                 contentParts.push(`'${contentType}':{schema:${zodSchema}}`);

package/dist/types/index.d.ts

@@ -20,11 +20,7 @@ export type OpenAPIPaths = {
 /**
  * HTTP methods supported in OpenAPI
  */
-export type HttpMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';
-/**
- * Parameter types in OpenAPI
- */
-export type Parameter = 'query' | 'path' | 'header' | 'body';
+export type HttpMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head' | 'trace';
 /**
  * Data types supported in OpenAPI schemas
  */
@@ -73,7 +69,7 @@ export type Content = {
 export type PathItem = {
     summary?: string;
     description?: string;
-    parameters?: Parameter[];
+    parameters?: string[];
 } & {
     [Method in HttpMethod]?: Operation;
 };
@@ -99,7 +95,7 @@ export type Operation = {
 /**
  * Response definition with description and content
  */
-type ResponseDefinition = {
+export type ResponseDefinition = {
     description: string;
     content?: Content;
 };
@@ -148,13 +144,14 @@ export type Components = {
     requestBodies?: Record<string, RequestBody>;
 };
 /**
- * Object containing different types of parameters
+ * Dynamic parameter section type
+ */
+export type ParamSection = Record<string, string>;
+/**
+ * Flexible parameters object type that can handle any section name
  */
 export type ParamsObject = {
-    query: Record<string, string>;
-    params: Record<string, string>;
-    headers: Record<string, string>;
-    body: Record<string, string>;
+    [section: string]: ParamSection;
 };
 /**
  * Parameter definition
@@ -164,7 +161,7 @@ export type Parameters = {
     description?: string;
     required?: boolean;
     name: string;
-    in: Parameter;
+    in: string;
     explode?: boolean;
 };
 /**

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.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "keywords": [
     "hono",
@@ -39,6 +39,7 @@
     "prettier": "^3.4.2"
   },
   "devDependencies": {
+    "@hono/zod-openapi": "^0.18.3",
     "@types/node": "^22.10.2",
     "@vitest/coverage-v8": "^2.1.8",
     "typescript": "^5.7.2",