hono-takibi 0.9.9995 → 0.9.9996

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/angular-query/index.d.ts
 declare function angularQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function angularQuery(openAPI: OpenAPI, output: string, importPath: stri
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { angularQuery };

package/dist/core/angular-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/angular-query/index.ts
 async function angularQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/docs/index.d.ts
 declare function docs(openAPI: OpenAPI, output: string, entry?: string, basePath?: string, curl?: boolean, baseUrl?: string): Promise<{

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/preact-query/index.d.ts
 declare function preactQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function preactQuery(openAPI: OpenAPI, output: string, importPath: strin
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { preactQuery };

package/dist/core/preact-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/preact-query/index.ts
 async function preactQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

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

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/solid-query/index.d.ts
 declare function solidQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function solidQuery(openAPI: OpenAPI, output: string, importPath: string
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { solidQuery };

package/dist/core/solid-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/solid-query/index.ts
 async function solidQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/svelte-query/index.d.ts
 declare function svelteQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function svelteQuery(openAPI: OpenAPI, output: string, importPath: strin
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { svelteQuery };

package/dist/core/svelte-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/svelte-query/index.ts
 async function svelteQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/swr/index.d.ts
 declare function swr(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function swr(openAPI: OpenAPI, output: string, importPath: string, split
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { swr };

package/dist/core/swr/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/swr/index.ts
 async function swr(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/tanstack-query/index.d.ts
 declare function tanstackQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function tanstackQuery(openAPI: OpenAPI, output: string, importPath: str
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { tanstackQuery };

package/dist/core/tanstack-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/tanstack-query/index.ts
 async function tanstackQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.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-ftN0v_bF.js";
+import { t as OpenAPI } from "../../index-D8guYWoV.js";
 
 //#region src/core/vue-query/index.d.ts
 declare function vueQuery(openAPI: OpenAPI, output: string, importPath: string, split?: boolean, clientName?: string): Promise<{
@@ -8,7 +8,6 @@ declare function vueQuery(openAPI: OpenAPI, output: string, importPath: string,
 } | {
   readonly ok: true;
   readonly value: `Generated ${string} hooks written to ${string}`;
-  readonly error?: never;
 }>;
 //#endregion
 export { vueQuery };

package/dist/core/vue-query/index.js

@@ -1,4 +1,4 @@
-import { t as makeQueryHooks } from "../../query-l4vdT3u2.js";
+import { t as makeQueryHooks } from "../../query-nt-tOucg.js";
 //#region src/core/vue-query/index.ts
 async function vueQuery(openAPI, output, importPath, split, clientName = "client") {
 	return makeQueryHooks(openAPI, output, importPath, {

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

@@ -1,4 +1,4 @@
-import { t as OpenAPI } from "../../../index-ftN0v_bF.js";
+import { t as OpenAPI } from "../../../index-D8guYWoV.js";
 
 //#region src/generator/zod-openapi-hono/openapi/index.d.ts
 declare function zodOpenAPIHono(openapi: OpenAPI, options: {

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

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

package/dist/{index-ftN0v_bF.d.ts → index-D8guYWoV.d.ts}

@@ -30,7 +30,7 @@ type OpenAPI = BaseOpenAPI & {
   };
   readonly components?: Components;
   readonly security?: readonly {
-    readonly [name: string]: readonly string[];
+    readonly [k: string]: readonly string[];
   }[];
   readonly tags?: {
     readonly name: string;

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { readConfig } from "./config/index.js";
 import { r as setFormatOptions } from "./emit-CFR63U4L.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-BVizkubp.js";
 import { angularQuery } from "./core/angular-query/index.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-DwwK7GTc.js";
 import { t as docs } from "./docs-BAt1_N22.js";
 import { preactQuery } from "./core/preact-query/index.js";
 import { rpc } from "./core/rpc/index.js";
@@ -147,10 +147,7 @@ async function honoTakibi() {
 		})()
 	]);
 	const e = results.find((result) => result && !result.ok);
-	if (e && !e.ok) return {
-		ok: false,
-		error: e.error
-	};
+	if (e) return e;
 	return {
 		ok: true,
 		value: results.map((result) => result?.ok ? result.value : void 0).filter((v) => v !== void 0).join("\n")

package/dist/{openapi-BsDi2AmJ.js → openapi-DNST00z0.js}

@@ -220,7 +220,7 @@ function makeParameters(parameters, readonly) {
 			...isPrimitiveNumeric ? { coerce: true } : {},
 			...readonly === true ? { readonly: true } : {}
 		});
-		const z = isPrimitiveNumeric ? baseSchema : isStringWire && schema.type === "boolean" ? baseSchema.replace(/\bz\.boolean\(/g, "z.stringbool(").replace(/\.default\("true"\)/g, ".default(true)").replace(/\.default\("false"\)/g, ".default(false)") : isStringWire && schema.type === "date" ? `z.coerce.${baseSchema.replace("z.", "")}` : isStringWire && (schema.type === "object" || schema.type === "array") ? baseSchema.replace(/z\.(int\d*)\(\)((?:\.(?:min|max|gt|lt|positive|negative|nonnegative|nonpositive|multipleOf)\([^)]*\))*)/g, (_, type, constraints) => `z.coerce.number().pipe(z.${type}()${constraints})`).replace(/z\.bigint\(\)/g, "z.coerce.bigint()").replace(/z\.number\(\)/g, "z.coerce.number()").replace(/z\.boolean\(\)/g, "z.stringbool()").replace(/z\.date\(\)/g, "z.coerce.date()") : baseSchema;
+		const z = isPrimitiveNumeric ? baseSchema : isStringWire && schema.type === "boolean" ? baseSchema.replace(/\bz\.boolean\(/g, "z.stringbool(").replace(/\.default\("true"\)/g, ".default(true)").replace(/\.default\("false"\)/g, ".default(false)") : isStringWire && schema.type === "date" ? `z.coerce.${baseSchema.replace("z.", "")}` : isStringWire && (schema.type === "object" || schema.type === "array") ? baseSchema.replace(/z\.(int\d*)\(\)((?:\.(?:min|max|gt|lt|positive|negative|nonnegative|nonpositive|multipleOf)\([^)]*\))*)/g, (_, type, constraints) => type === "int" ? `z.coerce.number().int()${constraints}` : `z.coerce.number().pipe(z.${type}()${constraints})`).replace(/z\.bigint\(\)/g, "z.coerce.bigint()").replace(/z\.number\(\)/g, "z.coerce.number()").replace(/z\.boolean\(\)/g, "z.stringbool()").replace(/z\.date\(\)/g, "z.coerce.date()") : baseSchema;
 		acc[param.in][makeSafeKey(param.name)] = z;
 		return acc;
 	}, {});
@@ -912,15 +912,16 @@ function integer(schema, options) {
 	const coerce = options?.coerce;
 	const errorMessage = schema["x-error-message"];
 	const requiredMessage = schema["x-required-message"];
-	const baseErrorArg = baseError(errorMessage, requiredMessage);
 	const xCoerce = schema["x-coerce"] === true;
+	const wantsCoerce = coerce === true || xCoerce;
+	const baseErrorArg = baseError(errorMessage, wantsCoerce ? void 0 : requiredMessage);
 	const isBigint = schema.format === "bigint";
 	const isInt32 = schema.format === "int32";
 	const isInt64 = schema.format === "int64";
-	const wantsCoerce = coerce === true || xCoerce;
 	const bigintBase = wantsCoerce && isBigint;
 	const bigintPipe = wantsCoerce && isInt64;
-	const numberPipe = wantsCoerce && !isBigint && !isInt64;
+	const numberPipe = wantsCoerce && isInt32;
+	const numberChain = wantsCoerce && !isBigint && !isInt64 && !isInt32;
 	const base = bigintBase ? `z.coerce.bigint(${baseErrorArg})` : isInt32 ? `z.int32(${baseErrorArg})` : isInt64 ? `z.int64(${baseErrorArg})` : isBigint ? `z.bigint(${baseErrorArg})` : `z.int(${baseErrorArg})`;
 	const lit = (n) => {
 		if (schema.format === "bigint") return `BigInt(${n})`;
@@ -957,14 +958,23 @@ function integer(schema, options) {
 	})();
 	const multipleOfMessage = schema["x-multipleOf-message"] ?? errorMessage;
 	const multipleOfErrorArg = multipleOfMessage ? `,${error(multipleOfMessage)}` : "";
+	const multipleOf = schema.multipleOf !== void 0 && typeof schema.multipleOf === "number" ? `.multipleOf(${lit(schema.multipleOf)}${multipleOfErrorArg})` : void 0;
 	const innerChain = [
 		base,
 		minimum,
 		maximum,
-		schema.multipleOf !== void 0 && typeof schema.multipleOf === "number" ? `.multipleOf(${lit(schema.multipleOf)}${multipleOfErrorArg})` : void 0
+		multipleOf
 	].filter((v) => v !== void 0).join("");
-	if (numberPipe) return `z.coerce.number().pipe(${innerChain})`;
-	if (bigintPipe) return `z.coerce.bigint().pipe(${innerChain})`;
+	if (numberChain) {
+		const constraints = [
+			minimum,
+			maximum,
+			multipleOf
+		].filter((v) => v !== void 0).join("");
+		return `z.coerce.number(${baseErrorArg}).int(${errorMessage ? error(errorMessage) : ""})${constraints}`;
+	}
+	if (numberPipe) return `z.coerce.number(${baseErrorArg}).pipe(${innerChain})`;
+	if (bigintPipe) return `z.coerce.bigint(${baseErrorArg}).pipe(${innerChain})`;
 	return innerChain;
 }
 //#endregion
@@ -978,11 +988,11 @@ function number(schema, options) {
 	const coerce = options?.coerce;
 	const errorMessage = schema["x-error-message"];
 	const requiredMessage = schema["x-required-message"];
-	const baseErrorArg = baseError(errorMessage, requiredMessage);
 	const xCoerce = schema["x-coerce"] === true;
+	const wantsCoerce = coerce === true || xCoerce;
+	const baseErrorArg = baseError(errorMessage, wantsCoerce ? void 0 : requiredMessage);
 	const isFloat32 = schema.format === "float" || schema.format === "float32";
 	const isFloat64 = schema.format === "float64" || schema.format === "double";
-	const wantsCoerce = coerce === true || xCoerce;
 	const wirePipe = wantsCoerce && (isFloat32 || isFloat64);
 	const base = wantsCoerce && !isFloat32 && !isFloat64 ? `z.coerce.number(${baseErrorArg})` : isFloat32 ? `z.float32(${baseErrorArg})` : isFloat64 ? `z.float64(${baseErrorArg})` : `z.number(${baseErrorArg})`;
 	const minimumMessage = schema["x-minimum-message"] ?? errorMessage;
@@ -1023,7 +1033,7 @@ function number(schema, options) {
 		maximum,
 		schema.multipleOf !== void 0 ? `.multipleOf(${schema.multipleOf}${multipleOfErrorArg})` : void 0
 	].filter((v) => v !== void 0).join("");
-	return wirePipe ? `z.coerce.number().pipe(${innerChain})` : innerChain;
+	return wirePipe ? `z.coerce.number(${baseErrorArg}).pipe(${innerChain})` : innerChain;
 }
 //#endregion
 //#region src/generator/zod-to-openapi/z/object.ts
@@ -1186,8 +1196,8 @@ function makeFormatOptions(schema) {
 function string(schema, options) {
 	const errorMessage = schema["x-error-message"];
 	const requiredMessage = schema["x-required-message"];
-	const baseErrorArg = baseError(errorMessage, requiredMessage);
 	const coerce = schema["x-coerce"] === true;
+	const baseErrorArg = baseError(errorMessage, coerce ? void 0 : requiredMessage);
 	const hashBase = (() => {
 		if (schema.format !== "hash") return void 0;
 		const algo = schema["x-hashAlg"];
@@ -1425,12 +1435,7 @@ function zodToOpenAPI(schema, meta, options) {
 		const xCoerce = schema["x-coerce"] === true;
 		const xStringbool = schema["x-stringbool"];
 		if (xCoerce && xStringbool !== void 0) throw new Error("x-coerce and x-stringbool are mutually exclusive on a boolean schema. Remove one.");
-		const arg = (() => {
-			if (requiredMessage === void 0 && errorMessage === void 0) return "";
-			if (requiredMessage === void 0 && errorMessage !== void 0) return error(errorMessage);
-			if (requiredMessage !== void 0 && errorMessage === void 0) return `{error:(issue)=>issue.input===undefined?${JSON.stringify(requiredMessage)}:undefined}`;
-			return `{error:(issue)=>issue.input===undefined?${JSON.stringify(requiredMessage)}:${JSON.stringify(errorMessage)}}`;
-		})();
+		const arg = baseError(errorMessage, xCoerce ? void 0 : requiredMessage);
 		if (xStringbool !== void 0) {
 			const opts = xStringbool === true ? null : xStringbool;
 			const optsObj = opts ? {
@@ -2053,7 +2058,7 @@ function parametersCode(components, exportParameters, exportParametersTypes, rea
 		const isStringWire = parameter.in === "query" || parameter.in === "path";
 		const isPrimitiveNumeric = isStringWire && (schema?.type === "number" || schema?.type === "integer");
 		const baseSchema = schema ? zodToOpenAPI(schema, { parameters: { ...parameter } }, isPrimitiveNumeric ? { coerce: true } : void 0) : "z.any()";
-		const z = isPrimitiveNumeric ? baseSchema : isStringWire && schema?.type === "boolean" ? baseSchema.replace(/\bz\.boolean\(/g, "z.stringbool(") : isStringWire && schema?.type === "date" ? `z.coerce.${baseSchema.replace("z.", "")}` : isStringWire && (schema?.type === "object" || schema?.type === "array") ? baseSchema.replace(/z\.(int\d*)\(\)((?:\.(?:min|max|gt|lt|positive|negative|nonnegative|nonpositive|multipleOf)\([^)]*\))*)/g, (_, type, constraints) => `z.coerce.number().pipe(z.${type}()${constraints})`).replace(/z\.bigint\(\)/g, "z.coerce.bigint()").replace(/z\.number\(\)/g, "z.coerce.number()").replace(/z\.boolean\(\)/g, "z.stringbool()").replace(/z\.date\(\)/g, "z.coerce.date()") : baseSchema;
+		const z = isPrimitiveNumeric ? baseSchema : isStringWire && schema?.type === "boolean" ? baseSchema.replace(/\bz\.boolean\(/g, "z.stringbool(") : isStringWire && schema?.type === "date" ? `z.coerce.${baseSchema.replace("z.", "")}` : isStringWire && (schema?.type === "object" || schema?.type === "array") ? baseSchema.replace(/z\.(int\d*)\(\)((?:\.(?:min|max|gt|lt|positive|negative|nonnegative|nonpositive|multipleOf)\([^)]*\))*)/g, (_, type, constraints) => type === "int" ? `z.coerce.number().int()${constraints}` : `z.coerce.number().pipe(z.${type}()${constraints})`).replace(/z\.bigint\(\)/g, "z.coerce.bigint()").replace(/z\.number\(\)/g, "z.coerce.number()").replace(/z\.boolean\(\)/g, "z.stringbool()").replace(/z\.date\(\)/g, "z.coerce.date()") : baseSchema;
 		return zodToOpenAPISchema(toIdentifierPascalCase(ensureSuffix(k, "ParamsSchema")), z, exportParameters, exportParametersTypes, true, readonly);
 	}).join("\n\n");
 }

package/dist/{openapi-BVizkubp.js → openapi-DwwK7GTc.js}

@@ -2,31 +2,12 @@ import { n as fmt, t as emit } from "./emit-CFR63U4L.js";
 import { a as writeFile, i as unlink, n as readFile, r as readdir, t as mkdir } from "./fsp-BXry-Hx5.js";
 import { b as isSecurityScheme, i as isMediaWithSchema, n as isHttpMethod, p as isRefObject, s as isOperation, t as isContentBody, y as isSecurityArray } from "./guard-BSZ8ezEv.js";
 import { a as makeBarrel, c as methodPath, f as toIdentifierPascalCase, m as zodToOpenAPISchema, p as uncapitalize, r as ensureSuffix, u as renderNamedImport } from "./utils-Dhc0-ra6.js";
-import { _ as makeCallbacks, a as responsesCode, b as makeRef, c as headersCode, d as makeExportConst, f as makeImports, g as makeCallback, h as zodToOpenAPI, i as schemasCode, l as makeSplitSchemaFile, m as ast, n as routeCode, o as requestBodiesCode, p as analyzeCircularSchemas, r as componentsCode, s as parametersCode, t as zodOpenAPIHono, u as makeConst, v as makeOperationResponses, x as makeRequest, y as makePathItem } from "./openapi-BsDi2AmJ.js";
+import { _ as makeCallbacks, a as responsesCode, b as makeRef, c as headersCode, d as makeExportConst, f as makeImports, g as makeCallback, h as zodToOpenAPI, i as schemasCode, l as makeSplitSchemaFile, m as ast, n as routeCode, o as requestBodiesCode, p as analyzeCircularSchemas, r as componentsCode, s as parametersCode, t as zodOpenAPIHono, u as makeConst, v as makeOperationResponses, x as makeRequest, y as makePathItem } from "./openapi-DNST00z0.js";
 import path from "node:path";
 import { Node, Project, SyntaxKind } from "ts-morph";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import { NodeHost, compile } from "@typespec/compiler";
 import { getOpenAPI3 } from "@typespec/openapi3";
-//#region src/helper/exports.ts
-async function makeExports(value, suffix, output, readonly) {
-	const keys = Object.keys(value);
-	const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-	const indexCode = `${keys.sort().map((v) => `export * from './${uncapitalize(v)}'`).join("\n")}\n`;
-	const asConst = readonly ? " as const" : "";
-	const e = (await Promise.all([...keys.map((k) => {
-		const v = value[k];
-		const body = `export const ${toIdentifierPascalCase(ensureSuffix(k, suffix))} = ${JSON.stringify(v ?? {})}${asConst}\n`;
-		const filePath = path.join(outDir, `${uncapitalize(k)}.ts`);
-		return emit(body, path.dirname(filePath), filePath);
-	}), emit(indexCode, path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
-	if (e) return e;
-	return {
-		ok: true,
-		value: `Generated ${suffix} code written to ${outDir}/*.ts (index.ts included)`
-	};
-}
-//#endregion
 //#region src/core/components/callbacks.ts
 async function callbacks(callbacks, output, split, components, readonly) {
 	if (!callbacks) return {
@@ -89,17 +70,16 @@ async function examples(examples, output, split, readonly) {
 	const asConst = readonly ? " as const" : "";
 	if (split) {
 		const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-		const indexCode = `${keys.sort().map((v) => `export * from './${uncapitalize(v)}.ts'`).join("\n")}\n`;
 		const e = (await Promise.all([...keys.map((k) => {
 			const v = examples[k];
 			const name = toIdentifierPascalCase(ensureSuffix(k, "Example"));
 			const filePath = path.join(outDir, `${uncapitalize(k)}.ts`);
 			if (typeof v === "object" && v !== null && "$ref" in v && typeof v.$ref === "string") {
 				const refName = makeRef(v.$ref);
-				return emit(`import { ${refName} } from '${`./${uncapitalize(v.$ref.split("/").at(-1) ?? "")}.ts`}'\n\nexport const ${name} = ${refName}\n`, path.dirname(filePath), filePath);
+				return emit(`import { ${refName} } from '${`./${uncapitalize(v.$ref.split("/").at(-1) ?? "")}`}'\n\nexport const ${name} = ${refName}\n`, path.dirname(filePath), filePath);
 			}
 			return emit(`export const ${name} = ${JSON.stringify(v)}${asConst}\n`, path.dirname(filePath), filePath);
-		}), emit(indexCode, path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
+		}), emit(makeBarrel(examples), path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
 		if (e) return e;
 		return {
 			ok: true,
@@ -158,19 +138,24 @@ async function links(links, output, split, readonly) {
 		ok: false,
 		error: "No links found"
 	};
-	if (Object.keys(links).length === 0) return {
+	const keys = Object.keys(links);
+	if (keys.length === 0) return {
 		ok: true,
 		value: "No links found"
 	};
 	if (split) {
-		const exportsResult = await makeExports(links, "Link", output, readonly);
-		if (!exportsResult.ok) return {
-			ok: false,
-			error: exportsResult.error
-		};
+		const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
+		const asConst = readonly ? " as const" : "";
+		const e = (await Promise.all([...keys.map((k) => {
+			const v = links[k];
+			const body = `export const ${toIdentifierPascalCase(ensureSuffix(k, "Link"))} = ${JSON.stringify(v ?? {})}${asConst}\n`;
+			const filePath = path.join(outDir, `${uncapitalize(k)}.ts`);
+			return emit(body, path.dirname(filePath), filePath);
+		}), emit(makeBarrel(links), path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
+		if (e) return e;
 		return {
 			ok: true,
-			value: exportsResult.value
+			value: `Generated Link code written to ${outDir}/*.ts (index.ts included)`
 		};
 	}
 	const emitResult = await emit(makeExportConst(links, "Link", readonly), path.dirname(output), output);
@@ -198,7 +183,6 @@ async function mediaTypes(mediaTypes, output, split, readonly, components) {
 	const importCode = renderNamedImport(["z"], "@hono/zod-openapi");
 	if (split) {
 		const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-		const indexCode = `${keys.sort().map((v) => `export * from './${uncapitalize(v)}.ts'`).join("\n")}\n`;
 		const e = (await Promise.all([...keys.map((k) => {
 			const v = mediaTypes[k];
 			const name = toIdentifierPascalCase(ensureSuffix(k, "MediaTypeSchema"));
@@ -206,7 +190,7 @@ async function mediaTypes(mediaTypes, output, split, readonly, components) {
 			if (typeof v === "object" && v !== null && "$ref" in v && v.$ref) return emit(makeImports(`export const ${name} = ${toIdentifierPascalCase(ensureSuffix(v.$ref.split("/").at(-1) ?? "", "MediaTypeSchema"))}\n`, filePath, components, split), path.dirname(filePath), filePath);
 			if (typeof v === "object" && v !== null && "schema" in v) return emit(makeImports(zodToOpenAPISchema(name, zodToOpenAPI(v.schema), true, false, true, readonly), filePath, components, split), path.dirname(filePath), filePath);
 			return emit(makeImports(`export const ${name} = z.unknown()\n`, filePath, components, split), path.dirname(filePath), filePath);
-		}), emit(indexCode, path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
+		}), emit(makeBarrel(mediaTypes), path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
 		if (e) return e;
 		return {
 			ok: true,
@@ -248,10 +232,7 @@ async function parameters(parameters, output, split, exportType, components, rea
 			const filePath = path.join(outDir, `${uncapitalize(parameterName)}.ts`);
 			return emit(makeImports(code, filePath, components, split), path.dirname(filePath), filePath);
 		}), emit(makeBarrel(parameters), outDir, path.join(outDir, "index.ts"))])).find((result) => !result.ok);
-		if (e && !e.ok) return {
-			ok: false,
-			error: e.error
-		};
+		if (e) return e;
 		return {
 			ok: true,
 			value: `Generated parameters code written to ${outDir}/*.ts (index.ts included)`
@@ -289,6 +270,7 @@ async function pathItems(components, pathItemsConfig, componentsConfig, readonly
 		const asConst = readonly ? " as const" : "";
 		const isPathItem = (v) => typeof v === "object" && v !== null && !("$ref" in v);
 		return Object.entries(pathItems).flatMap(([k, pathItemOrRef]) => isPathItem(pathItemOrRef) ? [{
+			key: k,
 			name: toIdentifierPascalCase(ensureSuffix(k, "PathItem")),
 			code: `${makeConst(exportPathItems, k, "PathItem")}${makePathItem(pathItemOrRef)}${asConst}`
 		}] : []);
@@ -307,15 +289,15 @@ async function pathItems(components, pathItemsConfig, componentsConfig, readonly
 		};
 	}
 	const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-	const failed = (await Promise.all([...entries.map(async ({ name, code }) => {
-		const filePath = `${outDir}/${uncapitalize(name)}.ts`;
+	const e = (await Promise.all([...entries.map(async ({ key, code }) => {
+		const filePath = `${outDir}/${uncapitalize(key)}.ts`;
 		const result = await emit(makeImports(code, filePath, componentsConfig), path.dirname(filePath), filePath);
 		return result.ok ? {
 			ok: true,
 			value: filePath
 		} : result;
-	}), emit(makeBarrel(Object.fromEntries(entries.map((e) => [e.name, null]))), outDir, `${outDir}/index.ts`)])).find((result) => !result.ok);
-	if (failed) return failed;
+	}), emit(makeBarrel(Object.fromEntries(entries.map((e) => [e.key, null]))), outDir, `${outDir}/index.ts`)])).find((result) => !result.ok);
+	if (e) return e;
 	return {
 		ok: true,
 		value: `Generated PathItem code written to ${outDir}/*.ts (index.ts included)`
@@ -375,10 +357,7 @@ async function responses(responses, output, split, components, readonly) {
 			const filePath = path.join(outDir, `${uncapitalize(responseName)}.ts`);
 			return emit(makeImports(code, filePath, components, split), path.dirname(filePath), filePath);
 		}), emit(makeBarrel(responses), outDir, path.join(outDir, "index.ts"))])).find((result) => !result.ok);
-		if (e && !e.ok) return {
-			ok: false,
-			error: e.error
-		};
+		if (e) return e;
 		return {
 			ok: true,
 			value: `Generated responses code written to ${outDir}/*.ts (index.ts included)`
@@ -437,19 +416,24 @@ async function securitySchemes(securitySchemes, output, split, readonly) {
 		ok: false,
 		error: "No securitySchemes found"
 	};
-	if (Object.keys(securitySchemes).length === 0) return {
+	const keys = Object.keys(securitySchemes);
+	if (keys.length === 0) return {
 		ok: true,
 		value: "No securitySchemes found"
 	};
 	if (split) {
-		const exportsResult = await makeExports(securitySchemes, "SecurityScheme", output, readonly);
-		if (!exportsResult.ok) return {
-			ok: false,
-			error: exportsResult.error
-		};
+		const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
+		const asConst = readonly ? " as const" : "";
+		const e = (await Promise.all([...keys.map((k) => {
+			const v = securitySchemes[k];
+			const body = `export const ${toIdentifierPascalCase(ensureSuffix(k, "SecurityScheme"))} = ${JSON.stringify(v ?? {})}${asConst}\n`;
+			const filePath = path.join(outDir, `${uncapitalize(k)}.ts`);
+			return emit(body, path.dirname(filePath), filePath);
+		}), emit(makeBarrel(securitySchemes), path.dirname(path.join(outDir, "index.ts")), path.join(outDir, "index.ts"))])).find((result) => !result.ok);
+		if (e) return e;
 		return {
 			ok: true,
-			value: exportsResult.value
+			value: `Generated SecurityScheme code written to ${outDir}/*.ts (index.ts included)`
 		};
 	}
 	const emitResult = await emit(makeExportConst(securitySchemes, "SecurityScheme", readonly), path.dirname(output), output);
@@ -949,7 +933,7 @@ async function route(openAPI, routes, components, readonly) {
 		};
 	}
 	const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-	const failed = (await Promise.all([...entries.map(async ({ name, code }) => {
+	const e = (await Promise.all([...entries.map(async ({ name, code }) => {
 		const filePath = `${outDir}/${name}.ts`;
 		const result = await emit(makeImports(code, filePath, components), path.dirname(filePath), filePath);
 		return result.ok ? {
@@ -957,7 +941,7 @@ async function route(openAPI, routes, components, readonly) {
 			value: filePath
 		} : result;
 	}), emit(makeBarrel(Object.fromEntries(entries.map((e) => [e.name, null]))), outDir, `${outDir}/index.ts`)])).find((result) => !result.ok);
-	if (failed) return failed;
+	if (e) return e;
 	return {
 		ok: true,
 		value: `Generated route code written to ${outDir}/*.ts (index.ts included)`
@@ -1831,11 +1815,8 @@ async function removeStaleFiles(handlerPath, generatedFileNames) {
 		};
 	}
 	const staleFiles = readdirResult.value.filter((file) => file.endsWith(".ts") && !file.endsWith(".test.ts") && file !== "index.ts" && !generatedFileNames.has(file));
-	const firstError = (await Promise.all(staleFiles.flatMap((file) => [unlink(`${handlerPath}/${file}`), unlink(`${handlerPath}/${path.basename(file, ".ts")}.test.ts`)]))).find((r) => !r.ok);
-	if (firstError && !firstError.ok) return {
-		ok: false,
-		error: firstError.error
-	};
+	const e = (await Promise.all(staleFiles.flatMap((file) => [unlink(`${handlerPath}/${file}`), unlink(`${handlerPath}/${path.basename(file, ".ts")}.test.ts`)]))).find((result) => !result.ok);
+	if (e) return e;
 	return {
 		ok: true,
 		value: void 0
@@ -1858,7 +1839,7 @@ async function zodOpenAPIHonoHandler(openapi, output, test = false, pathAlias, r
 		ok: false,
 		error: mkdirResult.error
 	};
-	const firstError = (await Promise.all([...handlers.map(async (handler) => {
+	const e = (await Promise.all([...handlers.map(async (handler) => {
 		const fmtResult = await fmt(routeHandler ? makeStubFileContent(handler, importFrom) : makeInlineStubFileContent(handler, importFrom));
 		if (!fmtResult.ok) return {
 			ok: false,
@@ -1923,7 +1904,7 @@ async function zodOpenAPIHonoHandler(openapi, output, test = false, pathAlias, r
 			value: void 0
 		};
 	})()])).find((result) => !result.ok);
-	if (firstError) return firstError;
+	if (e) return e;
 	const cleanupResult = await removeStaleFiles(handlerPath, new Set(handlers.map((h) => h.fileName)));
 	if (!cleanupResult.ok) return {
 		ok: false,
@@ -2149,7 +2130,7 @@ async function webhooks(openAPI, webhooks, components, readonly) {
 		};
 	}
 	const outDir = path.join(path.dirname(output), path.basename(output, ".ts"));
-	const failed = (await Promise.all([...entries.map(async ({ name, code }) => {
+	const e = (await Promise.all([...entries.map(async ({ name, code }) => {
 		const filePath = `${outDir}/${name}.ts`;
 		const result = await emit(makeImports(code, filePath, components), path.dirname(filePath), filePath);
 		return result.ok ? {
@@ -2157,7 +2138,7 @@ async function webhooks(openAPI, webhooks, components, readonly) {
 			value: filePath
 		} : result;
 	}), emit(makeBarrel(Object.fromEntries(entries.map((e) => [e.name, null]))), outDir, `${outDir}/index.ts`)])).find((result) => !result.ok);
-	if (failed) return failed;
+	if (e) return e;
 	return {
 		ok: true,
 		value: `Generated webhooks code written to ${outDir}/*.ts (index.ts included)`

package/dist/{query-l4vdT3u2.js → query-nt-tOucg.js}

@@ -549,10 +549,7 @@ async function makeQueryHooks(openAPI, output, importPath, config, split, client
 		}),
 		emit(index, path.dirname(indexPath), indexPath)
 	])).find((result) => !result.ok);
-	if (e && !e.ok) return {
-		ok: false,
-		error: e.error
-	};
+	if (e) return e;
 	return {
 		ok: true,
 		value: `Generated ${config.frameworkName.toLowerCase().replace(/ /g, "-")} hooks written to ${outDir}/*.ts (index.ts included)`

package/dist/vite-plugin/index.js

@@ -1,8 +1,8 @@
 import { parseConfig } from "../config/index.js";
 import { r as setFormatOptions } from "../emit-CFR63U4L.js";
 import { f as isRecord } from "../guard-BSZ8ezEv.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-BVizkubp.js";
 import { angularQuery } from "../core/angular-query/index.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-DwwK7GTc.js";
 import { t as docs } from "../docs-BAt1_N22.js";
 import { preactQuery } from "../core/preact-query/index.js";
 import { rpc } from "../core/rpc/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono-takibi",
-  "version": "0.9.9995",
+  "version": "0.9.9996",
   "description": "Hono Takibi is a code generator from OpenAPI to @hono/zod-openapi",
   "keywords": [
     "hono",