hono-takibi 0.9.993 → 0.9.995

package/README.md

@@ -134,6 +134,38 @@ z.string({ error: 'Name is required' }).min(1, { error: 'Name cannot be empty' }
 | `x-propertyNames-message`     | `propertyNames`                                                   |
 | `x-dependentRequired-message` | `dependentRequired`                                               |
 
+## Branded Types
+
+Use the `x-brand` vendor extension to generate [Zod branded types](https://zod.dev/api?id=branded-types), creating nominal types that are structurally identical but semantically distinct:
+
+```yaml
+components:
+  schemas:
+    Cat:
+      type: object
+      properties:
+        name:
+          type: string
+      required:
+        - name
+      x-brand: Cat
+    Dog:
+      type: object
+      properties:
+        name:
+          type: string
+      required:
+        - name
+      x-brand: Dog
+```
+
+```ts
+// Generated output
+const CatSchema = z.object({ name: z.string() }).brand<'Cat'>().openapi('Cat')
+
+const DogSchema = z.object({ name: z.string() }).brand<'Dog'>().openapi('Dog')
+```
+
 ## Vite Plugin
 
 Watches your OpenAPI spec and `hono-takibi.config.ts` for changes, then auto-regenerates code on save.

package/dist/config/index.d.ts

@@ -15,6 +15,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
       pathAlias: z.ZodExactOptional<z.ZodString>;
       framework: z.ZodExactOptional<z.ZodDefault<z.ZodEnum<{
         vitest: "vitest";
+        "vite-plus": "vite-plus";
         bun: "bun";
       }>>>;
     }, z.core.$strip>>;
@@ -145,6 +146,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
     import: z.ZodString;
     framework: z.ZodExactOptional<z.ZodDefault<z.ZodEnum<{
       vitest: "vitest";
+      "vite-plus": "vite-plus";
       bun: "bun";
     }>>>;
   }, z.core.$strip>>;
@@ -165,7 +167,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
       test: boolean;
       routeHandler: boolean;
       pathAlias?: string;
-      framework?: "vitest" | "bun";
+      framework?: "vitest" | "vite-plus" | "bun";
     };
     exportSchemas?: boolean;
     exportSchemasTypes?: boolean;
@@ -295,7 +297,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
   test?: {
     output: string;
     import: string;
-    framework?: "vitest" | "bun";
+    framework?: "vitest" | "vite-plus" | "bun";
   };
   mock?: {
     output: string;
@@ -317,7 +319,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
       test: boolean;
       routeHandler: boolean;
       pathAlias?: string;
-      framework?: "vitest" | "bun";
+      framework?: "vitest" | "vite-plus" | "bun";
     };
     exportSchemas?: boolean;
     exportSchemasTypes?: boolean;
@@ -444,7 +446,7 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodPipe<z.ZodObject<{
   test?: {
     output: string;
     import: string;
-    framework?: "vitest" | "bun";
+    framework?: "vitest" | "vite-plus" | "bun";
   };
   mock?: {
     output: string;
@@ -492,7 +494,7 @@ declare function defineConfig(config: ConfigInput): Readonly<{
       test?: boolean | undefined;
       routeHandler?: boolean | undefined;
       pathAlias?: string;
-      framework?: "vitest" | "bun" | undefined;
+      framework?: "vitest" | "vite-plus" | "bun" | undefined;
     };
     exportSchemas?: boolean;
     exportSchemasTypes?: boolean;
@@ -619,7 +621,7 @@ declare function defineConfig(config: ConfigInput): Readonly<{
   test?: {
     output: string;
     import: string;
-    framework?: "vitest" | "bun" | undefined;
+    framework?: "vitest" | "vite-plus" | "bun" | undefined;
   };
   mock?: {
     output: string;

package/dist/config/index.js

@@ -16,7 +16,11 @@ const ConfigSchema = z.object({
 			test: z.boolean().default(false),
 			routeHandler: z.boolean().default(false),
 			pathAlias: z.string().exactOptional(),
-			framework: z.enum(["vitest", "bun"]).default("vitest").exactOptional()
+			framework: z.enum([
+				"vitest",
+				"vite-plus",
+				"bun"
+			]).default("vitest").exactOptional()
 		}).exactOptional(),
 		exportSchemas: z.boolean().exactOptional(),
 		exportSchemasTypes: z.boolean().exactOptional(),
@@ -143,7 +147,11 @@ const ConfigSchema = z.object({
 	test: z.object({
 		output: z.string(),
 		import: z.string(),
-		framework: z.enum(["vitest", "bun"]).default("vitest").exactOptional()
+		framework: z.enum([
+			"vitest",
+			"vite-plus",
+			"bun"
+		]).default("vitest").exactOptional()
 	}).exactOptional(),
 	mock: z.object({ output: z.string() }).exactOptional(),
 	docs: z.object({

package/dist/core/docs/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/generator/docs/index.d.ts
 /**

package/dist/core/rpc/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/rpc/index.d.ts
 /**

package/dist/core/svelte-query/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/svelte-query/index.d.ts
 /**

package/dist/core/swr/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/swr/index.d.ts
 /**

package/dist/core/tanstack-query/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/tanstack-query/index.d.ts
 /**

package/dist/core/type/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/type/index.d.ts
 /**

package/dist/core/vue-query/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../index-CMf0VrGm.js";
 
 //#region src/core/vue-query/index.d.ts
 /**

package/dist/generator/zod-openapi-hono/openapi/index.d.ts

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../../index-C0mJiFsw.js";
+import { t as OpenAPI } from "../../../index-CMf0VrGm.js";
 
 //#region src/generator/zod-openapi-hono/openapi/index.d.ts
 /**

package/dist/generator/zod-openapi-hono/openapi/index.js

@@ -1,2 +1,2 @@
-import { t as zodOpenAPIHono } from "../../../openapi-BnsvjoY7.js";
+import { t as zodOpenAPIHono } from "../../../openapi-BZ9b1y3X.js";
 export { zodOpenAPIHono };

package/dist/{index-C0mJiFsw.d.ts → index-CMf0VrGm.d.ts}

@@ -356,6 +356,7 @@ type Schema = {
   readonly 'x-enum-error-messages'?: {
     readonly [k: string]: string;
   };
+  readonly 'x-brand'?: string;
 };
 type Parameter = {
   readonly $ref?: Ref;

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { readConfig } from "./config/index.js";
 import { r as setFormatOptions } from "./core-BlUaJE2n.js";
-import { _ as examples, a as takibi, c as securitySchemes, d as requestBodies, f as pathItems, g as headers, h as links, i as template, l as schemas, m as mediaTypes, n as webhooks, o as route, p as parameters, r as test, s as mock, t as parseOpenAPI, u as responses, v as callbacks } from "./openapi-D-0FWhCs.js";
+import { _ as examples, a as takibi, c as securitySchemes, d as requestBodies, f as pathItems, g as headers, h as links, i as template, l as schemas, m as mediaTypes, n as webhooks, o as route, p as parameters, r as test, s as mock, t as parseOpenAPI, u as responses, v as callbacks } from "./openapi-D2QO8Njt.js";
 import { t as docs } from "./docs-Da_MOdAe.js";
 import { rpc } from "./core/rpc/index.js";
 import { svelteQuery } from "./core/svelte-query/index.js";

package/dist/{openapi-BnsvjoY7.js → openapi-BZ9b1y3X.js}

@@ -494,7 +494,8 @@ function wrap(zod, schema, meta) {
 		return JSON.stringify(v);
 	};
 	const n = schema.nullable === true || (Array.isArray(schema.type) ? schema.type.includes("null") : schema.type === "null") ? `${zod}.nullable()` : zod;
-	const z = schema.default !== void 0 ? `${n}.default(${formatLiteral(schema.default)})` : n;
+	const d = schema.default !== void 0 ? `${n}.default(${formatLiteral(schema.default)})` : n;
+	const z = schema["x-brand"] ? `${d}.brand<"${schema["x-brand"]}">()` : d;
 	const zodExpressedProps = new Set([
 		"type",
 		"format",
@@ -538,7 +539,8 @@ function wrap(zod, schema, meta) {
 		"x-anyOf-message",
 		"x-oneOf-message",
 		"x-not-message",
-		"x-enum-error-messages"
+		"x-enum-error-messages",
+		"x-brand"
 	]);
 	const args = filterUnsupportedProps(Object.fromEntries(Object.entries(schema).filter(([k, v]) => !(zodExpressedProps.has(k) || k === "required" && typeof v === "boolean"))));
 	const headerMetaProps = meta?.headers ? [

package/dist/{openapi-D-0FWhCs.js → openapi-D2QO8Njt.js}

@@ -1,6 +1,6 @@
 import { i as isMediaWithSchema, n as isHttpMethod, p as isRefObject, s as isOperation, t as isContentBody, v as isSecurityArray, y as isSecurityScheme } from "./guard-BabA4f3q.js";
 import { d as toIdentifierPascalCase, f as uncapitalize, i as makeBarrel, l as renderNamedImport, n as ensureSuffix, p as zodToOpenAPISchema, s as methodPath } from "./utils-B9bUHU9P.js";
-import { _ as zodToOpenAPI, a as schemasCode, c as pathItemsCode, d as makeSplitSchemaFile, f as makeConst, g as ast, h as analyzeCircularSchemas, i as componentsCode, l as parametersCode, m as makeImports, n as webhookCode, o as responsesCode, p as makeExportConst, r as routeCode, s as requestBodiesCode, t as zodOpenAPIHono, u as headersCode, v as makeCallback, y as makeRef } from "./openapi-BnsvjoY7.js";
+import { _ as zodToOpenAPI, a as schemasCode, c as pathItemsCode, d as makeSplitSchemaFile, f as makeConst, g as ast, h as analyzeCircularSchemas, i as componentsCode, l as parametersCode, m as makeImports, n as webhookCode, o as responsesCode, p as makeExportConst, r as routeCode, s as requestBodiesCode, t as zodOpenAPIHono, u as headersCode, v as makeCallback, y as makeRef } from "./openapi-BZ9b1y3X.js";
 import { n as fmt, t as core } from "./core-BlUaJE2n.js";
 import { a as writeFile, i as unlink, n as readFile, r as readdir, t as mkdir } from "./fsp-Bv1yR6UV.js";
 import path from "node:path";
@@ -799,6 +799,13 @@ async function securitySchemes(securitySchemes, output, split, readonly) {
 //#endregion
 //#region src/generator/test/faker-mapping.ts
 /**
+* Sanitize a schema name for use as a JavaScript identifier in mock function names.
+* Removes dots from namespace-qualified names (e.g., "Auth.SignupRequest" → "AuthSignupRequest")
+*/
+function sanitizeMockName(name) {
+	return name.replace(/\./g, "");
+}
+/**
 * OpenAPI format to faker method mapping
 */
 const FORMAT_TO_FAKER = {
@@ -888,7 +895,7 @@ function schemaToFaker(schema, propertyName, options = {}) {
 	if (options.useExamples && schema.example !== void 0) return JSON.stringify(schema.example);
 	if (schema.const !== void 0) return `${JSON.stringify(schema.const)} as const`;
 	if (schema.enum && schema.enum.length > 0) return `faker.helpers.arrayElement([${schema.enum.map((v) => JSON.stringify(v)).join(", ")}] as const)`;
-	if (schema.$ref) return `mock${schema.$ref.split("/").pop() || "unknown"}()`;
+	if (schema.$ref) return `mock${sanitizeMockName(schema.$ref.split("/").pop() || "unknown")}()`;
 	if (schema.type === "array" && schema.items) {
 		const itemSchema = Array.isArray(schema.items) ? schema.items[0] : schema.items;
 		if (!itemSchema) return "[]";
@@ -1018,7 +1025,8 @@ function detectCircularSchemas$1(schemas) {
 */
 function generateMockFunction(name, schema, schemas, isCircular) {
 	const mockBody = schemaToFaker(schema, void 0, { schemas });
-	return `function mock${name}()${isCircular ? ": any" : ""} {\n  return ${mockBody}\n}`;
+	const returnType = isCircular ? ": any" : "";
+	return `function mock${sanitizeMockName(name)}()${returnType} {\n  return ${mockBody}\n}`;
 }
 function extractSecurityInfo(opSecurity, globalSecurity, securitySchemes) {
 	return (opSecurity ?? globalSecurity ?? []).flatMap((secDef) => Object.keys(secDef).flatMap((schemeName) => {
@@ -1410,10 +1418,16 @@ function extractTestCases(spec) {
 			};
 		})();
 		const usedSchemaRefs = (() => {
-			if (!(op.requestBody && isContentBody(op.requestBody))) return [];
-			const jsonContent = op.requestBody.content?.["application/json"];
-			if (!jsonContent?.schema) return [];
-			return collectSchemaRefs(jsonContent.schema, spec.components?.schemas);
+			const refs = [];
+			if (op.requestBody && isContentBody(op.requestBody)) {
+				const jsonContent = op.requestBody.content?.["application/json"];
+				if (jsonContent?.schema) refs.push(...collectSchemaRefs(jsonContent.schema, spec.components?.schemas));
+			}
+			for (const rawParam of op.parameters || []) {
+				const param = rawParam.$ref ? spec.components?.parameters?.[rawParam.$ref.replace("#/components/parameters/", "")] ?? rawParam : rawParam;
+				if (param?.schema) refs.push(...collectSchemaRefs(param.schema, spec.components?.schemas));
+			}
+			return [...new Set(refs)];
 		})();
 		const responseKeys = Object.keys(op.responses || {});
 		const successStatus = responseKeys.filter((s) => s.startsWith("2")).map((s) => Number.parseInt(s, 10)).sort((a, b) => a - b)[0] ?? 200;
@@ -1510,17 +1524,19 @@ function makeMockFunctions(spec, usedSchemaNames) {
 	};
 	for (const name of usedSchemaNames) visit(name);
 	return sorted.map((name) => {
-		return `function mock${name}()${circular.has(name) ? ": any" : ""} {\n  return ${schemaToFaker(schemas[name])}\n}`;
+		const returnType = circular.has(name) ? ": any" : "";
+		return `function mock${sanitizeMockName(name)}()${returnType} {\n  return ${schemaToFaker(schemas[name])}\n}`;
 	}).join("\n\n");
 }
 /**
 * Generate a non-existent value for 404 testing based on the schema type
 * Returns raw value without quotes (for URL path insertion)
 */
-function getNonExistentValue(schema) {
+function getNonExistentValue(schema, schemas) {
 	if (!schema) return "__non_existent__";
-	if (schema.type === "integer" || schema.type === "number") return "-1";
-	if (schema.format === "uuid") return "00000000-0000-0000-0000-000000000000";
+	const resolved = schema.$ref && schemas ? schemas[schema.$ref.replace("#/components/schemas/", "")] ?? schema : schema;
+	if (resolved.type === "integer" || resolved.type === "number") return "-1";
+	if (resolved.format === "uuid") return "00000000-0000-0000-0000-000000000000";
 	return "__non_existent__";
 }
 function makeAuthHeader(sec) {
@@ -1534,7 +1550,7 @@ function makeAuthHeader(sec) {
 		default: return "";
 	}
 }
-function makeTestCase(tc, basePath = "/") {
+function makeTestCase(tc, basePath = "/", schemas) {
 	const basePathPrefix = basePath !== "/" ? basePath : "";
 	const fullPath = tc.path === "/" && basePathPrefix ? basePathPrefix : `${basePathPrefix}${tc.path}`;
 	const testPath = tc.pathParams.reduce((path, param) => path.replace(`{${param.name}}`, `\${${param.name}}`), fullPath);
@@ -1568,7 +1584,7 @@ function makeTestCase(tc, basePath = "/") {
 		bodySetup
 	].filter(Boolean).join("\n");
 	return `${`describe('${tc.method} ${fullPath}',()=>{it('${itDescription}',async()=>{${setupCode}\nconst res=await app.request(\`${testPath}${queryString}\`,{method:'${tc.method}'${headersOption}${bodyOption}})\nexpect(res.status).toBe(${tc.successStatus})})`}${tc.security.length > 0 ? `\nit('should return 401 without auth',async()=>{${setupCode}\nconst res=await app.request(\`${testPath}${queryString}\`,{method:'${tc.method}'${headersWithoutAuth}${bodyOption}})\nexpect(res.status).toBe(401)})` : ""}${tc.pathParams.length > 0 && tc.errorStatuses.includes(404) ? (() => {
-		const notFoundPath = tc.pathParams.reduce((path, param) => path.replace(`{${param.name}}`, getNonExistentValue(param.schema)), fullPath);
+		const notFoundPath = tc.pathParams.reduce((path, param) => path.replace(`{${param.name}}`, getNonExistentValue(param.schema, schemas)), fullPath);
 		return `\nit('should return 404 for non-existent resource',async()=>{${[
 			...tc.queryParams.map((param) => `const ${param.name}=${param.fakerCode}`),
 			...headerSetup,
@@ -1579,6 +1595,11 @@ function makeTestCase(tc, basePath = "/") {
 function escapeString(s) {
 	return s.replace(/'/g, "\\'").replace(/\n/g, " ");
 }
+const TEST_IMPORT_SOURCE = {
+	vitest: "vitest",
+	"vite-plus": "vite-plus/test",
+	bun: "bun:test"
+};
 function makeTestFile(spec, appImportPath = "./app", basePath = "/", framework = "vitest") {
 	const testCases = extractTestCases(spec);
 	const apiTitle = spec.info?.title || "API";
@@ -1590,12 +1611,12 @@ function makeTestFile(spec, appImportPath = "./app", basePath = "/", framework =
 	const mockFunctions = makeMockFunctions(spec, usedSchemaNames);
 	const tagDescribes = Array.from(byTag.entries()).map(([tag, cases]) => {
 		const tagDescription = (spec.tags?.find((t) => t.name === tag))?.description || tag;
-		const testCasesCode = cases.map((tc) => makeTestCase(tc, basePath)).join("");
+		const testCasesCode = cases.map((tc) => makeTestCase(tc, basePath, spec.components?.schemas)).join("");
 		return `describe('${escapeString(tagDescription)}',()=>{${testCasesCode}})\n`;
 	}).join("");
 	const body = `${mockFunctions ? `${mockFunctions}\n\n` : ""}describe('${escapeString(apiTitle)}',()=>{${tagDescribes}})\n`;
 	const fakerImport = body.includes("faker.") ? `\nimport{faker}from'@faker-js/faker'` : "";
-	return `${`import{describe,it,expect}from'${framework === "bun" ? "bun:test" : "vitest"}'${fakerImport}\nimport app from'${appImportPath}'\n`}\n${body}`;
+	return `${`import{describe,it,expect}from'${TEST_IMPORT_SOURCE[framework]}'${fakerImport}\nimport app from'${appImportPath}'\n`}\n${body}`;
 }
 /**
 * Extract the first path segment from an API path.
@@ -1612,10 +1633,10 @@ function makeHandlerTestCode(spec, handlerPath, _routeNames, importFrom, basePat
 	});
 	if (relevantCases.length === 0) return "";
 	const mockFunctions = makeMockFunctions(spec, new Set(relevantCases.flatMap((tc) => tc.usedSchemaRefs)));
-	const testCasesCode = relevantCases.map((tc) => makeTestCase(tc, basePath)).join("");
+	const testCasesCode = relevantCases.map((tc) => makeTestCase(tc, basePath, spec.components?.schemas)).join("");
 	const body = `${mockFunctions ? `${mockFunctions}\n\n` : ""}describe('${handlerFileName.charAt(0).toUpperCase() + handlerFileName.slice(1)}',()=>{${testCasesCode}})\n`;
 	const fakerImport = body.includes("faker.") ? `\nimport{faker}from'@faker-js/faker'` : "";
-	return `${`import{describe,it,expect}from'${framework === "bun" ? "bun:test" : "vitest"}'${fakerImport}\nimport app from'${importFrom}'\n`}\n${body}`;
+	return `${`import{describe,it,expect}from'${TEST_IMPORT_SOURCE[framework]}'${fakerImport}\nimport app from'${importFrom}'\n`}\n${body}`;
 }
 //#endregion
 //#region src/merge/index.ts

package/dist/vite-plugin/index.js

@@ -1,7 +1,7 @@
 import { parseConfig } from "../config/index.js";
 import { f as isRecord } from "../guard-BabA4f3q.js";
 import { r as setFormatOptions } from "../core-BlUaJE2n.js";
-import { _ as examples, a as takibi, c as securitySchemes, d as requestBodies, f as pathItems, g as headers, h as links, i as template, l as schemas, m as mediaTypes, n as webhooks, o as route, p as parameters, r as test, s as mock, t as parseOpenAPI, u as responses, v as callbacks } from "../openapi-D-0FWhCs.js";
+import { _ as examples, a as takibi, c as securitySchemes, d as requestBodies, f as pathItems, g as headers, h as links, i as template, l as schemas, m as mediaTypes, n as webhooks, o as route, p as parameters, r as test, s as mock, t as parseOpenAPI, u as responses, v as callbacks } from "../openapi-D2QO8Njt.js";
 import { t as docs } from "../docs-Da_MOdAe.js";
 import { rpc } from "../core/rpc/index.js";
 import { svelteQuery } from "../core/svelte-query/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono-takibi",
-  "version": "0.9.993",
+  "version": "0.9.995",
   "description": "Hono Takibi is a code generator from OpenAPI to @hono/zod-openapi",
   "keywords": [
     "hono",
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^12.1.0",
     "@typespec/compiler": "^1.10.0",
     "@typespec/openapi3": "^1.10.0",
-    "oxfmt": "^0.41.0",
+    "oxfmt": "^0.42.0",
     "ts-morph": "^27.0.2",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2",
@@ -83,7 +83,7 @@
     "@typespec/http": "^1.10.0",
     "@typespec/rest": "^0.80.0",
     "@typespec/versioning": "^0.80.0",
-    "tsdown": "0.21.4"
+    "tsdown": "0.21.5"
   },
   "scripts": {
     "dev": "vite --host",