hono-takibi 0.9.99993 → 0.9.99995

package/README.md

@@ -200,7 +200,6 @@ export default app
 ```ts
 export default defineConfig({
   input: 'openapi.yaml',
-  output: './src/index.ts',
   template: { define: true },
 })
 ```
@@ -221,7 +220,7 @@ export const getUsersIdRoute = defineOpenAPIRoute({
 })
 ```
 
-Component schemas go to `components/index.ts` (override with `components.output`). Set `template.output` to change the route directory (default `./src/routes`).
+The app entry defaults to `src/index.ts` (override with `output`, which must be an `index.ts` path such as `./server/index.ts`). Route files always go to `routes/` next to the app entry, and component schemas to `components/index.ts` (override with `components.output`). When `output` is omitted, `components.output` also anchors the layout: `components: { output: './server/components/index.ts' }` puts the app entry at `server/index.ts` and routes at `server/routes/`.
 
 ## Client Library Integrations
 
@@ -305,7 +304,7 @@ export default defineConfig({
 
 ## Full Config Reference
 
-Some options are mutually exclusive: `output` ↔ `routes`, `components.output` ↔ per-type components, `template.define` ↔ `routeHandler`.
+Some options are mutually exclusive: `output` ↔ `routes`, `template.define` ↔ `routes`, `components.output` ↔ per-type components, `template.define` ↔ `routeHandler`.
 
 ```ts
 import { defineConfig } from 'hono-takibi/config'
@@ -313,7 +312,7 @@ import { defineConfig } from 'hono-takibi/config'
 export default defineConfig({
   input: 'openapi.yaml',
 
-  output: './src/routes.ts', // single-file mode; with template.define, the app entry (required)
+  output: './src/routes.ts', // single-file mode; with template.define, the app entry (an index.ts path, default ./src/index.ts)
   basePath: '/api',
   readonly: true,
   // format: {}, // oxfmt FormatConfig
@@ -322,7 +321,6 @@ export default defineConfig({
     test: true,
     routeHandler: false, // true: RouteHandler exports
     define: false, // true: defineOpenAPIRoute output
-    // output: './src/routes', // define mode dir (default ./src/routes)
     pathAlias: '@/',
     testFramework: 'vitest', // "vitest" | "vite-plus" | "bun"
   },
@@ -486,6 +484,11 @@ export default defineConfig({
 
   mock: {
     output: './src/mock.ts',
+    useExamples: true,
+    locale: 'en',
+    delay: false,
+    arrayMin: 1,
+    arrayMax: 10,
   },
 
   docs: {

package/dist/config/index.d.ts

@@ -10,7 +10,6 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodObject<{
   format: z.ZodExactOptional<z.ZodCustom<FormatConfig, FormatConfig>>;
   template: z.ZodExactOptional<z.ZodDiscriminatedUnion<[z.ZodReadonly<z.ZodObject<{
     define: z.ZodLiteral<true>;
-    output: z.ZodDefault<z.ZodString>;
     test: z.ZodDefault<z.ZodBoolean>;
     pathAlias: z.ZodExactOptional<z.ZodString>;
     testFramework: z.ZodExactOptional<z.ZodDefault<z.ZodEnum<{
@@ -21,7 +20,6 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodObject<{
   }, z.core.$strip>>, z.ZodReadonly<z.ZodObject<{
     define: z.ZodDefault<z.ZodOptional<z.ZodLiteral<false>>>;
     routeHandler: z.ZodDefault<z.ZodBoolean>;
-    output: z.ZodExactOptional<z.ZodString>;
     test: z.ZodDefault<z.ZodBoolean>;
     pathAlias: z.ZodExactOptional<z.ZodString>;
     testFramework: z.ZodExactOptional<z.ZodDefault<z.ZodEnum<{
@@ -280,6 +278,14 @@ declare const ConfigSchema: z.ZodReadonly<z.ZodObject<{
   }, z.core.$strip>>>;
   mock: z.ZodExactOptional<z.ZodReadonly<z.ZodObject<{
     output: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+    useExamples: z.ZodExactOptional<z.ZodBoolean>;
+    locale: z.ZodExactOptional<z.ZodString>;
+    delay: z.ZodExactOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodLiteral<false>, z.ZodReadonly<z.ZodObject<{
+      min: z.ZodNumber;
+      max: z.ZodNumber;
+    }, z.core.$strip>>]>>;
+    arrayMin: z.ZodExactOptional<z.ZodNumber>;
+    arrayMax: z.ZodExactOptional<z.ZodNumber>;
   }, z.core.$strip>>>;
   docs: z.ZodExactOptional<z.ZodDiscriminatedUnion<[z.ZodReadonly<z.ZodObject<{
     output: z.ZodTemplateLiteral<`${string}.md`>;
@@ -322,7 +328,6 @@ declare function parseConfig(config: unknown): {
     format?: FormatConfig;
     template?: Readonly<{
       define: true;
-      output: string;
       test: boolean;
       pathAlias?: string;
       testFramework?: "vitest" | "vite-plus" | "bun";
@@ -330,7 +335,6 @@ declare function parseConfig(config: unknown): {
       define: false;
       routeHandler: boolean;
       test: boolean;
-      output?: string;
       pathAlias?: string;
       testFramework?: "vitest" | "vite-plus" | "bun";
     }>;
@@ -565,6 +569,14 @@ declare function parseConfig(config: unknown): {
     }>;
     mock?: Readonly<{
       output: string;
+      useExamples?: boolean;
+      locale?: string;
+      delay?: number | false | Readonly<{
+        min: number;
+        max: number;
+      }>;
+      arrayMin?: number;
+      arrayMax?: number;
     }>;
     docs?: Readonly<{
       output: `${string}.md`;
@@ -609,7 +621,6 @@ declare function readConfig(): Promise<{
     format?: FormatConfig;
     template?: Readonly<{
       define: true;
-      output: string;
       test: boolean;
       pathAlias?: string;
       testFramework?: "vitest" | "vite-plus" | "bun";
@@ -617,7 +628,6 @@ declare function readConfig(): Promise<{
       define: false;
       routeHandler: boolean;
       test: boolean;
-      output?: string;
       pathAlias?: string;
       testFramework?: "vitest" | "vite-plus" | "bun";
     }>;
@@ -852,6 +862,14 @@ declare function readConfig(): Promise<{
     }>;
     mock?: Readonly<{
       output: string;
+      useExamples?: boolean;
+      locale?: string;
+      delay?: number | false | Readonly<{
+        min: number;
+        max: number;
+      }>;
+      arrayMin?: number;
+      arrayMax?: number;
     }>;
     docs?: Readonly<{
       output: `${string}.md`;
@@ -878,14 +896,12 @@ declare function defineConfig(config: z.input<typeof ConfigSchema>): Readonly<{
   format?: FormatConfig;
   template?: Readonly<{
     define: true;
-    output?: string | undefined;
     test?: boolean | undefined;
     pathAlias?: string;
     testFramework?: "vitest" | "vite-plus" | "bun" | undefined;
   }> | Readonly<{
     define?: false | undefined;
     routeHandler?: boolean | undefined;
-    output?: string;
     test?: boolean | undefined;
     pathAlias?: string;
     testFramework?: "vitest" | "vite-plus" | "bun" | undefined;
@@ -1136,6 +1152,14 @@ declare function defineConfig(config: z.input<typeof ConfigSchema>): Readonly<{
   }>;
   mock?: Readonly<{
     output: string;
+    useExamples?: boolean;
+    locale?: string;
+    delay?: number | false | Readonly<{
+      min: number;
+      max: number;
+    }>;
+    arrayMin?: number;
+    arrayMax?: number;
   }>;
   docs?: Readonly<{
     output: `${string}.md`;

package/dist/config/index.js

@@ -1,3 +1,4 @@
+import { i as deriveAppEntry } from "../utils-B5PbMfWs.js";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -64,7 +65,6 @@ const ConfigSchema = z.object({
 	format: z.custom(() => true).exactOptional(),
 	template: z.discriminatedUnion("define", [z.object({
 		define: z.literal(true),
-		output: z.string().regex(/^(?!.*\.ts$).+/, { error: "template.output must be a directory, not a .ts file" }).default("src/routes"),
 		test: z.boolean().default(false),
 		pathAlias: z.string().exactOptional(),
 		testFramework: z.enum([
@@ -75,7 +75,6 @@ const ConfigSchema = z.object({
 	}).readonly(), z.object({
 		define: z.literal(false).optional().default(false),
 		routeHandler: z.boolean().default(false),
-		output: z.string().regex(/^(?!.*\.ts$).+/, { error: "template.output must be a directory, not a .ts file" }).exactOptional(),
 		test: z.boolean().default(false),
 		pathAlias: z.string().exactOptional(),
 		testFramework: z.enum([
@@ -148,7 +147,21 @@ const ConfigSchema = z.object({
 			"bun"
 		]).default("vitest").exactOptional()
 	}).readonly().exactOptional(),
-	mock: z.object({ output: FileOutputSchema }).readonly().exactOptional(),
+	mock: z.object({
+		output: FileOutputSchema,
+		useExamples: z.boolean().exactOptional(),
+		locale: z.string().regex(/^[A-Za-z_]{1,40}$/, { error: "Invalid faker locale. Use a code like 'ja', 'en', or 'zh_CN'." }).exactOptional(),
+		delay: z.union([
+			z.number().int().nonnegative().max(6e4),
+			z.literal(false),
+			z.object({
+				min: z.number().int().nonnegative().max(6e4),
+				max: z.number().int().nonnegative().max(6e4)
+			}).readonly().refine((v) => v.min <= v.max, { message: "delay.min must be <= delay.max. Swap the values or remove one." })
+		]).exactOptional(),
+		arrayMin: z.number().int().nonnegative().max(1e3).exactOptional(),
+		arrayMax: z.number().int().nonnegative().max(1e3).exactOptional()
+	}).readonly().refine((v) => v.arrayMin === void 0 || v.arrayMax === void 0 || v.arrayMin <= v.arrayMax, { message: "arrayMin must be <= arrayMax. Swap the values or remove one." }).exactOptional(),
 	docs: z.discriminatedUnion("curl", [z.object({
 		output: z.templateLiteral([z.string().min(1), z.enum([".md"])], { error: "must be .md file" }),
 		curl: z.literal(true),
@@ -160,7 +173,28 @@ const ConfigSchema = z.object({
 		entry: z.string().exactOptional(),
 		baseUrl: z.string().exactOptional()
 	}).readonly()]).exactOptional()
-}).readonly().refine((v) => !(v.output && v.routes), { message: "output and routes are mutually exclusive. Use output for single-file mode, or routes for separate route output." }).refine((v) => !(v.template?.define && !v.output), { message: "template.define requires output (the app entry file, e.g. ./src/index.ts)." });
+}).readonly().refine((v) => !(v.output && v.routes), { message: "output and routes are mutually exclusive. Use output for single-file mode, or routes for separate route output." }).refine((v) => !(v.template?.define === true && v.routes), { message: "template.define and routes are mutually exclusive. define derives routes/ next to the app entry (output, default src/index.ts)." }).refine((v) => !(v.template?.define === true && v.output !== void 0 && !(v.output === "index.ts" || v.output.endsWith("/index.ts"))), { message: "with template.define, output is the app entry and must be an index.ts file (e.g. ./src/index.ts), or omitted to default to src/index.ts. Other names collide with the derived routes/ directory." }).refine((v) => !(v.template?.define === true && v.components !== void 0 && [
+	"schemas",
+	"responses",
+	"parameters",
+	"examples",
+	"requestBodies",
+	"headers",
+	"securitySchemes",
+	"links",
+	"callbacks",
+	"pathItems",
+	"mediaTypes"
+].some((k) => v.components?.[k] !== void 0)), { message: "with template.define, per-type component outputs (components.schemas, components.responses, ...) are not supported. Use components.output for a single components file." }).refine((v) => {
+	if (v.template?.define !== true || v.components?.output === void 0) return true;
+	const normalize = (p) => p.replace(/^\.\//, "");
+	const componentsOutput = normalize(v.components.output);
+	const appEntry = normalize(v.output ?? deriveAppEntry(componentsOutput));
+	if (!appEntry.endsWith("index.ts")) return true;
+	const baseDir = appEntry === "index.ts" ? "" : appEntry.slice(0, -9);
+	const routesDir = baseDir === "" ? "routes" : `${baseDir}/routes`;
+	return componentsOutput !== appEntry && !componentsOutput.startsWith(`${routesDir}/`);
+}, { message: "with template.define, components.output must not point at the app entry or inside the derived routes/ directory (it would be overwritten). Choose another path, e.g. src/components/index.ts." });
 function parseConfig(config) {
 	const result = ConfigSchema.safeParse(config);
 	if (!result.success) {

package/dist/core/docs/index.js

@@ -1,2 +1,2 @@
-import { t as docs } from "../../docs-380Wcu6a.js";
+import { t as docs } from "../../docs-DbknIWmx.js";
 export { docs };

package/dist/core/hooks/index.js

@@ -1,2 +1,2 @@
-import { t as hooks } from "../../hooks-CkiatAe9.js";
+import { t as hooks } from "../../hooks-CCw7jm8g.js";
 export { hooks };

package/dist/core/rpc/index.js

@@ -1,6 +1,7 @@
+import { f as methodPath, u as makeInferRequestType } from "../../utils-B5PbMfWs.js";
 import { t as emit } from "../../emit-CFR63U4L.js";
-import { A as makeInferRequestType, M as methodPath, c as isOperationLike, f as isRecord, o as isOpenAPIPaths } from "../../guard-zvkMUVYD.js";
-import { a as parsePathItem, i as operationHasArgs, o as resolveSplitOutDir, r as makeOperationDeps, t as formatPath } from "../../rpc-CepeggWU.js";
+import { c as isOperationLike, f as isRecord, o as isOpenAPIPaths } from "../../guard-BSZ8ezEv.js";
+import { a as parsePathItem, i as operationHasArgs, o as resolveSplitOutDir, r as makeOperationDeps, t as formatPath } from "../../rpc-BzPo2tZf.js";
 import path from "node:path";
 //#region src/core/rpc/index.ts
 /**

package/dist/core/type/index.js

@@ -1,5 +1,6 @@
+import { d as makeSafeKey, g as statusCodeToNumber } from "../../utils-B5PbMfWs.js";
 import { t as emit } from "../../emit-CFR63U4L.js";
-import { I as statusCodeToNumber, g as isSchemaArray, i as isMediaWithSchema, j as makeSafeKey, l as isParameter, m as isRequestBody, n as isHttpMethod, s as isOperation, u as isParameterArray, x as isStringRef } from "../../guard-zvkMUVYD.js";
+import { g as isSchemaArray, i as isMediaWithSchema, l as isParameter, m as isRequestBody, n as isHttpMethod, s as isOperation, u as isParameterArray, x as isStringRef } from "../../guard-BSZ8ezEv.js";
 import path from "node:path";
 //#region src/core/type/index.ts
 /**

package/dist/{docs-380Wcu6a.js → docs-DbknIWmx.js}

@@ -1,5 +1,6 @@
+import { s as escapeHtml } from "./utils-B5PbMfWs.js";
 import { a as writeFile, t as mkdir } from "./fsp-BXry-Hx5.js";
-import { D as escapeHtml, a as isOAuthFlowValue, b as isSecurityScheme, f as isRecord, h as isResponses, m as isRequestBody, p as isRefObject, r as isMedia, y as isSecurityArray } from "./guard-zvkMUVYD.js";
+import { a as isOAuthFlowValue, b as isSecurityScheme, f as isRecord, h as isResponses, m as isRequestBody, p as isRefObject, r as isMedia, y as isSecurityArray } from "./guard-BSZ8ezEv.js";
 import path from "node:path";
 import { STATUS_CODES } from "node:http";
 //#region src/generator/docs/index.ts

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

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

package/dist/guard-BSZ8ezEv.js

@@ -0,0 +1,83 @@
+//#region src/guard/index.ts
+function isRecord(v) {
+	return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function isHttpMethod(method) {
+	return method === "get" || method === "put" || method === "post" || method === "delete" || method === "patch" || method === "options" || method === "head" || method === "trace";
+}
+function isValidIdent(str) {
+	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(str);
+}
+function isOpenAPIPaths(v) {
+	if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+	return Object.values(v).every((entry) => typeof entry === "object" && entry !== null && !Array.isArray(entry));
+}
+function isRefObject(v) {
+	return typeof v === "object" && v !== null && !Array.isArray(v) && "$ref" in v && typeof v.$ref === "string";
+}
+function isStringRef(v) {
+	return "$ref" in v && typeof v.$ref === "string";
+}
+function isParameterObject(v) {
+	if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+	if (!("name" in v) || typeof v.name !== "string") return false;
+	if (!("in" in v)) return false;
+	const pos = v.in;
+	return pos === "path" || pos === "query" || pos === "header" || pos === "cookie";
+}
+function isParameter(v) {
+	return typeof v === "object" && v !== null && "name" in v && "in" in v && ("schema" in v || "content" in v);
+}
+function isParameterArray(v) {
+	return Array.isArray(v);
+}
+function isOperationLike(v) {
+	return typeof v === "object" && v !== null && !Array.isArray(v) && "responses" in v;
+}
+function isOperation(v) {
+	return typeof v === "object" && v !== null && "responses" in v;
+}
+function isSchemaProperty(v) {
+	return typeof v === "object" && v !== null && !Array.isArray(v) && "schema" in v;
+}
+function isSchemaArray(v) {
+	return Array.isArray(v);
+}
+/**
+* JSON Schema 2020-12 §4.3.2 / §10.3.1.2 type guard for schema-vs-boolean
+* discrimination. `items`, `additionalProperties`, `unevaluatedItems`, and
+* `unevaluatedProperties` may be either an object schema or a boolean schema
+* (`true` = pass-through, `false` = reject). This narrows the union to the
+* object form so callers can recurse without `as` casts.
+*/
+function isSchemaObject(v) {
+	return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function isMediaWithSchema(v) {
+	return typeof v === "object" && v !== null && "schema" in v;
+}
+function isMedia(v) {
+	return typeof v === "object" && v !== null && "schema" in v;
+}
+function isRequestBody(v) {
+	return typeof v === "object" && v !== null && ("content" in v || "required" in v || "description" in v);
+}
+function isContentBody(v) {
+	return typeof v === "object" && v !== null && !("$ref" in v);
+}
+function isSecurityScheme(v) {
+	return typeof v === "object" && v !== null && !("$ref" in v);
+}
+function isSecurityArray(v) {
+	return Array.isArray(v);
+}
+function isResponses(v) {
+	if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+	return "$ref" in v || "description" in v || "content" in v || "headers" in v || "links" in v;
+}
+function isOAuthFlowValue(v) {
+	if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+	return "authorizationUrl" in v || "tokenUrl" in v || "scopes" in v;
+}
+//#endregion
+export { isValidIdent as S, isSchemaObject as _, isOAuthFlowValue as a, isSecurityScheme as b, isOperationLike as c, isParameterObject as d, isRecord as f, isSchemaArray as g, isResponses as h, isMediaWithSchema as i, isParameter as l, isRequestBody as m, isHttpMethod as n, isOpenAPIPaths as o, isRefObject as p, isMedia as r, isOperation as s, isContentBody as t, isParameterArray as u, isSchemaProperty as v, isStringRef as x, isSecurityArray as y };

package/dist/{hooks-CkiatAe9.js → hooks-CCw7jm8g.js}

@@ -1,6 +1,7 @@
+import { _ as toIdentifierPascalCase, f as methodPath, n as capitalize } from "./utils-B5PbMfWs.js";
 import { t as emit } from "./emit-CFR63U4L.js";
-import { L as toIdentifierPascalCase, M as methodPath, c as isOperationLike, f as isRecord, o as isOpenAPIPaths, w as capitalize } from "./guard-zvkMUVYD.js";
-import { a as parsePathItem, i as operationHasArgs, n as hasNoContentResponse, o as resolveSplitOutDir, r as makeOperationDeps, t as formatPath } from "./rpc-CepeggWU.js";
+import { c as isOperationLike, f as isRecord, o as isOpenAPIPaths } from "./guard-BSZ8ezEv.js";
+import { a as parsePathItem, i as operationHasArgs, n as hasNoContentResponse, o as resolveSplitOutDir, r as makeOperationDeps, t as formatPath } from "./rpc-BzPo2tZf.js";
 import path from "node:path";
 //#region src/helper/query.ts
 function makeHookName(method, pathStr, prefix) {
@@ -313,7 +314,7 @@ function makeSWRHeader(importPath, clientName, hasQuery, hasMutation, hasAnyArgs
 		lines.push("import useSWRMutation from'swr/mutation'");
 		lines.push("import type{SWRMutationConfiguration}from'swr/mutation'");
 	}
-	const honoTypeImports = ["ClientRequestOptions", ...hasAnyArgs ? ["InferRequestType"] : []];
+	const honoTypeImports = ["ClientRequestOptions", ...hasAnyArgs || hasInfiniteQuery ? ["InferRequestType"] : []];
 	lines.push(`import type{${honoTypeImports.join(",")}}from'hono/client'`);
 	lines.push("import{parseResponse}from'hono/client'");
 	lines.push(`import{${clientName}}from'${importPath}'`);
@@ -515,7 +516,7 @@ function makeHeader(importPath, clientName, hasQuery, hasMutation, hasAnyArgs, c
 		...hasMutation ? [config.useMutationOptionsType] : []
 	];
 	const needsVueImports = config.isVueQuery && hasQueryWithArgs;
-	const honoTypeImports = ["ClientRequestOptions", ...hasAnyArgs ? ["InferRequestType"] : []];
+	const honoTypeImports = ["ClientRequestOptions", ...hasAnyArgs || hasInfiniteQuery ? ["InferRequestType"] : []];
 	return `${[
 		...queryImports.length > 0 ? [`import{${queryImports.join(",")}}from'${config.packageName}'`] : [],
 		...typeImports.length > 0 ? [`import type{${typeImports.join(",")}}from'${config.packageName}'`] : [],

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { readConfig } from "./config/index.js";
 import { r as setFormatOptions } from "./emit-CFR63U4L.js";
-import { n as parseOpenAPI, r as takibi, t as makeJob } from "./shared-DC4zuL9A.js";
+import { n as parseOpenAPI, r as takibi, t as makeJob } from "./shared-B-TUm7Fa.js";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 //#region src/cli/index.ts

package/dist/{openapi-8ZYAMj_e.js → openapi-BlTDQFFF.js}

@@ -1,4 +1,5 @@
-import { C as baseError, E as error, F as requestParamsArray, L as toIdentifierPascalCase, M as methodPath, N as normalizeTypes, O as escapeRegexLiteral, P as renderNamedImport, R as uncapitalize, T as ensureSuffix, _ as isSchemaObject, f as isRecord, g as isSchemaArray, j as makeSafeKey, l as isParameter, p as isRefObject, r as isMedia, s as isOperation, z as zodToOpenAPISchema } from "./guard-zvkMUVYD.js";
+import { _ as toIdentifierPascalCase, a as ensureSuffix, c as escapeRegexLiteral, d as makeSafeKey, f as methodPath, h as requestParamsArray, m as renderNamedImport, o as error, p as normalizeTypes, r as cyclicNodes, t as baseError, v as uncapitalize, y as zodToOpenAPISchema } from "./utils-B5PbMfWs.js";
+import { _ as isSchemaObject, f as isRecord, g as isSchemaArray, l as isParameter, p as isRefObject, r as isMedia, s as isOperation } from "./guard-BSZ8ezEv.js";
 import path from "node:path";
 import ts from "typescript";
 //#region src/helper/code.ts
@@ -1634,108 +1635,33 @@ function getChildren(node) {
 	return semanticChildren;
 }
 function collectIdentifiers(node) {
+	const identifiers = [];
 	const visit = (n) => {
-		const current = ts.isIdentifier(n) ? [n.text] : [];
-		const children = getChildren(n).flatMap(visit);
-		return [...current, ...children];
+		if (ts.isIdentifier(n)) identifiers.push(n.text);
+		for (const child of getChildren(n)) visit(child);
 	};
-	return visit(node);
-}
-function extractIdentifiers(code, varNames) {
-	const allIdentifiers = collectIdentifiers(makeSourceFile(code));
-	return [...new Set(allIdentifiers.filter((id) => varNames.has(id)))];
-}
-function createInitialState() {
-	return {
-		indices: /* @__PURE__ */ new Map(),
-		lowLinks: /* @__PURE__ */ new Map(),
-		onStack: /* @__PURE__ */ new Set(),
-		stack: [],
-		sccs: [],
-		index: 0
-	};
-}
-function popStackUntil(stack, onStack, name) {
-	const idx = stack.lastIndexOf(name);
-	if (idx === -1) return {
-		scc: [],
-		newStack: stack,
-		newOnStack: onStack
-	};
-	const scc = stack.slice(idx);
-	return {
-		scc,
-		newStack: stack.slice(0, idx),
-		newOnStack: new Set([...onStack].filter((n) => !scc.includes(n)))
-	};
-}
-function tarjanConnect(name, deps, var2name, state) {
-	const currentIndex = state.index;
-	const indices = new Map(state.indices).set(name, currentIndex);
-	const lowLinks = new Map(state.lowLinks).set(name, currentIndex);
-	const stack = [...state.stack, name];
-	const onStack = /* @__PURE__ */ new Set([...state.onStack, name]);
-	const initialState = {
-		...state,
-		indices,
-		lowLinks,
-		stack,
-		onStack,
-		index: currentIndex + 1
-	};
-	const afterDeps = (deps.get(name) ?? []).reduce((s, depVar) => {
-		const depName = var2name.get(depVar);
-		if (depName === void 0) return s;
-		if (!s.indices.has(depName)) {
-			const afterConnect = tarjanConnect(depName, deps, var2name, s);
-			const newLowLink = Math.min(afterConnect.lowLinks.get(name) ?? 0, afterConnect.lowLinks.get(depName) ?? 0);
-			const updatedLowLinks = new Map(afterConnect.lowLinks).set(name, newLowLink);
-			return {
-				...afterConnect,
-				lowLinks: updatedLowLinks
-			};
-		}
-		if (s.onStack.has(depName)) {
-			const newLowLink = Math.min(s.lowLinks.get(name) ?? 0, s.indices.get(depName) ?? 0);
-			const updatedLowLinks = new Map(s.lowLinks).set(name, newLowLink);
-			return {
-				...s,
-				lowLinks: updatedLowLinks
-			};
-		}
-		return s;
-	}, initialState);
-	if (afterDeps.lowLinks.get(name) === afterDeps.indices.get(name)) {
-		const { scc, newStack, newOnStack } = popStackUntil(afterDeps.stack, afterDeps.onStack, name);
-		return {
-			...afterDeps,
-			stack: newStack,
-			onStack: newOnStack,
-			sccs: [...afterDeps.sccs, scc]
-		};
-	}
-	return afterDeps;
+	visit(node);
+	return identifiers;
 }
 function findCyclicSchemas(names, deps) {
-	const name2var = new Map(names.map((n) => [n, toIdentifierPascalCase(ensureSuffix(n, "Schema"))]));
 	const var2name = new Map(names.map((n) => [toIdentifierPascalCase(ensureSuffix(n, "Schema")), n]));
-	const finalState = names.reduce((state, n) => state.indices.has(n) ? state : tarjanConnect(n, deps, var2name, state), createInitialState());
-	return new Set(finalState.sccs.flatMap((scc) => {
-		if (scc.length > 1) return [...scc];
-		const single = scc[0];
-		if (!single) return [];
-		const selfVar = name2var.get(single);
-		return selfVar && (deps.get(single) ?? []).includes(selfVar) ? [single] : [];
-	}));
+	return cyclicNodes(new Map(names.map((n) => [n, (deps.get(n) ?? []).map((v) => var2name.get(v)).filter((x) => x !== void 0)])));
 }
 function analyzeCircularSchemas(schemas, schemaNames, readonly) {
 	const varNameSet = new Set(schemaNames.map((n) => toIdentifierPascalCase(ensureSuffix(n, "Schema"))));
 	const varNameToName = new Map(schemaNames.map((n) => [toIdentifierPascalCase(ensureSuffix(n, "Schema")), n]));
 	const zSchemaMap = new Map(schemaNames.map((n) => [n, zodToOpenAPI(schemas[n], void 0, readonly === true ? { readonly: true } : void 0)]));
+	const batchedSource = makeSourceFile(schemaNames.map((n) => `const ${toIdentifierPascalCase(ensureSuffix(n, "Schema"))} = ${zSchemaMap.get(n)}`).join("\n"));
+	const initializerIdentifiers = new Map(batchedSource.statements.flatMap((statement) => {
+		if (!ts.isVariableStatement(statement)) return [];
+		const declaration = statement.declarationList.declarations[0];
+		if (!(declaration && ts.isIdentifier(declaration.name) && declaration.initializer)) return [];
+		return [[declaration.name.text, collectIdentifiers(declaration.initializer)]];
+	}));
 	const depsMap = new Map(schemaNames.map((n) => {
-		const code = zSchemaMap.get(n) ?? "";
 		const selfVar = toIdentifierPascalCase(ensureSuffix(n, "Schema"));
-		return [n, extractIdentifiers(code, varNameSet).filter((v) => v !== selfVar)];
+		const identifiers = initializerIdentifiers.get(selfVar) ?? [];
+		return [n, [...new Set(identifiers.filter((id) => varNameSet.has(id)))].filter((v) => v !== selfVar)];
 	}));
 	const cyclicSchemas = findCyclicSchemas(schemaNames, depsMap);
 	const extendedCyclicSchemas = /* @__PURE__ */ new Set([...cyclicSchemas, ...[...cyclicSchemas].flatMap((n) => (depsMap.get(n) ?? []).map((v) => varNameToName.get(v)).filter((x) => x !== void 0))]);
@@ -1799,27 +1725,24 @@ function topoSort(decls) {
 	const makeKey = (kind, name) => `${kind}:${name}`;
 	const map = new Map(decls.map((d) => [makeKey(d.kind, d.name), d]));
 	const findByName = (name) => map.get(makeKey("variable", name)) ?? map.get(makeKey("type", name)) ?? map.get(makeKey("interface", name));
-	const visit = (key, state) => {
-		if (state.perm.has(key) || state.temp.has(key)) return state;
+	const sorted = [];
+	const perm = /* @__PURE__ */ new Set();
+	const temp = /* @__PURE__ */ new Set();
+	const visit = (key) => {
+		if (perm.has(key) || temp.has(key)) return;
 		const decl = map.get(key);
-		if (!decl) return state;
-		const withTemp = {
-			...state,
-			temp: /* @__PURE__ */ new Set([...state.temp, key])
-		};
-		const afterRefs = decl.refs.map((ref) => findByName(ref)).filter((d) => d !== void 0).reduce((s, d) => visit(makeKey(d.kind, d.name), s), withTemp);
-		return {
-			sorted: [...afterRefs.sorted, decl],
-			perm: /* @__PURE__ */ new Set([...afterRefs.perm, key]),
-			temp: new Set([...afterRefs.temp].filter((t) => t !== key))
-		};
-	};
-	const initial = {
-		sorted: [],
-		perm: /* @__PURE__ */ new Set(),
-		temp: /* @__PURE__ */ new Set()
+		if (!decl) return;
+		temp.add(key);
+		for (const ref of decl.refs) {
+			const found = findByName(ref);
+			if (found) visit(makeKey(found.kind, found.name));
+		}
+		temp.delete(key);
+		perm.add(key);
+		sorted.push(decl);
 	};
-	return decls.reduce((state, d) => visit(makeKey(d.kind, d.name), state), initial).sorted;
+	for (const decl of decls) visit(makeKey(decl.kind, decl.name));
+	return sorted;
 }
 function ast(code) {
 	const decls = parseStatements(makeSourceFile(code));
@@ -2365,6 +2288,7 @@ function componentsCode(components, options) {
 function routeCode(openapi, readonly) {
 	const routeEntries = (openapi, readonly) => {
 		const makeEntry = (path, method, operation, readonly) => {
+			const request = makeRequest(operation.parameters, operation.requestBody, readonly);
 			const properties = [
 				`method:${JSON.stringify(method)}`,
 				`path:${JSON.stringify(path)}`,
@@ -2373,7 +2297,7 @@ function routeCode(openapi, readonly) {
 				operation.description ? `description:${JSON.stringify(operation.description)}` : void 0,
 				operation.externalDocs ? `externalDocs:${JSON.stringify(operation.externalDocs)}` : void 0,
 				operation.operationId ? `operationId:${JSON.stringify(operation.operationId)}` : void 0,
-				makeRequest(operation.parameters, operation.requestBody, readonly) ? `request:${makeRequest(operation.parameters, operation.requestBody, readonly)}` : void 0,
+				request ? `request:${request}` : void 0,
 				operation.responses ? `responses:${makeOperationResponses(operation.responses, readonly)}` : void 0,
 				operation.callbacks ? `callbacks:{${makeCallbacks(operation.callbacks, readonly)}}` : void 0,
 				operation.deprecated ? `deprecated:${JSON.stringify(operation.deprecated)}` : void 0,

package/dist/{rpc-CepeggWU.js → rpc-BzPo2tZf.js}

@@ -1,4 +1,4 @@
-import { S as isValidIdent, c as isOperationLike, d as isParameterObject, f as isRecord, p as isRefObject, v as isSchemaProperty } from "./guard-zvkMUVYD.js";
+import { S as isValidIdent, c as isOperationLike, d as isParameterObject, f as isRecord, p as isRefObject, v as isSchemaProperty } from "./guard-BSZ8ezEv.js";
 import path from "node:path";
 //#region src/helper/rpc.ts
 function makeEscaped(s) {