@povio/openapi-codegen-cli 3.1.0-rc.1 → 3.1.0-rc.3

package/dist/metro.d.mts

@@ -1,6 +1,6 @@
 import { r as GenerateFileFormatter } from "./options-CE4Koxof.mjs";
 import { t as OpenAPICodegenConfig } from "./config-BU7wVf7U.mjs";
-import { a as GenerateOpenApiFile } from "./openapi-B14GzSA_.mjs";
+import { a as GenerateOpenApiFile } from "./openapi-BkC5yZ-W.mjs";
 import { IncomingMessage, ServerResponse } from "http";
 
 //#region src/metro/openapi-codegen.plugin.d.ts

package/dist/{openapi-B14GzSA_.d.mts → openapi-BkC5yZ-W.d.mts}

@@ -106,26 +106,24 @@ declare function isProcedureMeta(meta: unknown): meta is ProcedureMeta;
 declare function operationKey(method: string, routePath: string): string;
 declare function toPascalCase(value: string): string;
 declare function isZodSchema(value: unknown): value is ZodSchema;
-declare function dtoSchemaName(name: string): string;
-declare function shouldUseDtoSchemaName(moduleName: string, schema: ZodSchema): boolean;
 declare function schemaExportName(moduleName: string, exportName: string, schema: ZodSchema, getSchemaName?: typeof getOpenApiSchemaName): string;
+declare function modelSchemaExportName(exportName: string): string;
 declare function sharedSchemaExportName(exportName: string): string;
 declare function collectModelSchemaExports(options: {
   apiRoot?: string;
   dbTablesRoot?: string;
-  getOpenApiSchemaName?: (schema: unknown) => string | undefined;
-}): Promise<ModelSchemaExport[]>;
-declare function collectApiModelSchemaExports(apiRoot: string, options?: {
-  getOpenApiSchemaName?: (schema: unknown) => string | undefined;
-}): Promise<ModelSchemaExport[]>;
-declare function collectModuleModelSchemaExports(apiRoot: string, moduleName: string, options?: {
-  getOpenApiSchemaName?: (schema: unknown) => string | undefined;
 }): Promise<ModelSchemaExport[]>;
+declare function collectApiModelSchemaExports(apiRoot: string): Promise<ModelSchemaExport[]>;
+declare function collectModuleModelSchemaExports(apiRoot: string, moduleName: string): Promise<ModelSchemaExport[]>;
 declare function collectDbTableModelSchemaExports(tablesRoot: string): Promise<ModelSchemaExport[]>;
 declare function collectDbTableModelSchemaExport(tablesRoot: string, tableName: string): Promise<ModelSchemaExport[]>;
 declare function toOpenAPIAclRule(rule: string): JsonObject;
 declare function collectOperationMeta(router: AnyContractRouter, routerPath?: string[], operationMeta?: Map<string, OperationContractInfo>): Map<string, OperationContractInfo>;
 declare function getObjectPropertySchema(schema: AnySchema, property: string): AnySchema | undefined;
+declare function routeHasPathParameters(routePath?: string): boolean;
+declare function getProcedureInputSchemaRole(route: OrpcContractProcedureData["route"]): "Params" | "Query" | "Request";
+declare function procedureSchemaName(procedureName: string, role: "Params" | "Query" | "Request" | "Response"): string;
+declare function addContractSchema(schemas: OpenApiSchemaRegistry, schema: AnySchema | undefined, name: string, getSchemaName: (schema: unknown) => string | undefined, strategy?: "input" | "output"): void;
 declare function collectContractSchemas(router: AnyContractRouter, routerPath?: string[], schemas?: OpenApiSchemaRegistry, getSchemaName?: typeof getOpenApiSchemaName): OpenApiSchemaRegistry;
 declare function collectContractSchemaRoots(router: AnyContractRouter, roots?: Set<unknown>): Set<AnySchema>;
 declare function visitZodSchema(schema: ZodSchema, visit: (schema: ZodSchema) => void, seen?: Set<{
@@ -134,11 +132,14 @@ declare function visitZodSchema(schema: ZodSchema, visit: (schema: ZodSchema) =>
   };
 }>): void;
 declare function collectSchemaRegistryRoots(registry: OpenApiSchemaRegistry): Set<AnySchema>;
+declare function modelSchemaNameEntries(modelSchemas: ModelSchemaExport[]): Map<ZodSchema, string>;
+declare function createModelSchemaNameGetter(modelSchemas: ModelSchemaExport[], getSchemaName?: typeof getOpenApiSchemaName): (schema: unknown) => string | undefined;
 declare function collectReachableModelSchemas(router: AnyContractRouter, options?: {
   apiRoot?: string;
   dbTablesRoot?: string;
   excludedSchemas?: Set<AnySchema>;
   getOpenApiSchemaName?: (schema: unknown) => string | undefined;
+  modelSchemas?: ModelSchemaExport[];
 }): Promise<OpenApiSchemaRegistry>;
 declare function compactTagName(value: string): string;
 declare function getModuleOpenApiController(apiModules: Record<string, TinyOpenApiModule>, moduleName: string): string;
@@ -167,4 +168,4 @@ declare function applyPaginatedItemSchemas(spec: JsonObject): void;
 declare function toOpenAPI30Document(spec: JsonObject): JsonObject;
 declare function generateORPCOpenAPISpec(options: GenerateORPCOpenAPISpecOptions): Promise<JsonObject>;
 //#endregion
-export { isContractProcedure as $, collectOperationMeta as A, generateOpenApiFile as B, collectContractSchemaRoots as C, collectExtraSchemas as D, collectDbTableModelSchemaExports as E, defineOpenApiSchemas as F, getModuleOpenApiTag as G, getContractProcedureData as H, dtoSchemaName as I, getOperationAction as J, getObjectPropertySchema as K, findComponentEnumNames as L, collectReachableModelSchemas as M, collectSchemaRegistryRoots as N, collectModelSchemaExports as O, compactTagName as P, getStringEnumValues as Q, findEnumNames as R, collectApiModelSchemaExports as S, visitZodSchema as St, collectDbTableModelSchemaExport as T, getDerivedOperationId as U, getComponentSchemas as V, getModuleOpenApiController as W, getPaginatedItemSchema as X, getOperationController as Y, getRobodevModuleRoles as Z, applyPaginatedItemSchemas as _, stripNoContentResponseBodies as _t, GenerateOpenApiFile as a, namedControllerActionInputDtoSchema as at, applyRobodevUserRolesExtension as b, toOpenAPIAclRule as bt, GenerateTinyOpenApiFileOptions as c, namedOpenApiRequestSchema as ct, ProcedureMeta as d, operationKey as dt, isNullSchema as et, TinyOpenApiModule as f, resolveOpenApiOutputPath as ft, applyOperationMeta as g, shouldUseDtoSchemaName as gt, applyEnumExtensions as h, sharedSchemaExportName as ht, GenerateORPCOpenAPISpecOptions as i, isZodSchema as it, collectOperationTags as j, collectModuleModelSchemaExports as k, JsonObject as l, namedOpenApiResponseSchema as lt, ZodSchema as m, schemaExportName as mt, AnyContractRouter as n, isObject as nt, GenerateOpenApiFileOptions as o, namedControllerActionSchema as ot, TinyOpenApiUserRole as p, schemaComponentRef as pt, getOpenApiSchemaName as q, AnySchema as r, isProcedureMeta as rt, GenerateOpenApiFileResult as s, namedOpenApiOutputSchema as st, AclRule as t, isNullableOnlySchema as tt, OpenApiSchemaRegistry as u, namedOpenApiSchema as ut, applyParameterExtensions as v, toOpenAPI30Document as vt, collectContractSchemas as w, asStringArray as x, toPascalCase as xt, applyRobodevModuleExtensions as y, toOpenAPI30Schema as yt, generateORPCOpenAPISpec as z };
+export { getRobodevModuleRoles as $, collectModuleModelSchemaExports as A, generateORPCOpenAPISpec as B, collectApiModelSchemaExports as C, toOpenAPI30Document as Ct, collectDbTableModelSchemaExports as D, visitZodSchema as Dt, collectDbTableModelSchemaExport as E, toPascalCase as Et, compactTagName as F, getModuleOpenApiController as G, getComponentSchemas as H, createModelSchemaNameGetter as I, getOpenApiSchemaName as J, getModuleOpenApiTag as K, defineOpenApiSchemas as L, collectOperationTags as M, collectReachableModelSchemas as N, collectExtraSchemas as O, collectSchemaRegistryRoots as P, getProcedureInputSchemaRole as Q, findComponentEnumNames as R, asStringArray as S, stripNoContentResponseBodies as St, collectContractSchemas as T, toOpenAPIAclRule as Tt, getContractProcedureData as U, generateOpenApiFile as V, getDerivedOperationId as W, getOperationController as X, getOperationAction as Y, getPaginatedItemSchema as Z, applyOperationMeta as _, resolveOpenApiOutputPath as _t, GenerateOpenApiFile as a, isProcedureMeta as at, applyRobodevModuleExtensions as b, schemaExportName as bt, GenerateTinyOpenApiFileOptions as c, modelSchemaNameEntries as ct, ProcedureMeta as d, namedOpenApiOutputSchema as dt, getStringEnumValues as et, TinyOpenApiModule as f, namedOpenApiRequestSchema as ft, applyEnumExtensions as g, procedureSchemaName as gt, addContractSchema as h, operationKey as ht, GenerateORPCOpenAPISpecOptions as i, isObject as it, collectOperationMeta as j, collectModelSchemaExports as k, JsonObject as l, namedControllerActionInputDtoSchema as lt, ZodSchema as m, namedOpenApiSchema as mt, AnyContractRouter as n, isNullSchema as nt, GenerateOpenApiFileOptions as o, isZodSchema as ot, TinyOpenApiUserRole as p, namedOpenApiResponseSchema as pt, getObjectPropertySchema as q, AnySchema as r, isNullableOnlySchema as rt, GenerateOpenApiFileResult as s, modelSchemaExportName as st, AclRule as t, isContractProcedure as tt, OpenApiSchemaRegistry as u, namedControllerActionSchema as ut, applyPaginatedItemSchemas as v, routeHasPathParameters as vt, collectContractSchemaRoots as w, toOpenAPI30Schema as wt, applyRobodevUserRolesExtension as x, sharedSchemaExportName as xt, applyParameterExtensions as y, schemaComponentRef as yt, findEnumNames as z };

package/dist/sh.mjs

@@ -39,7 +39,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "3.1.0-rc.1";
+	return "3.1.0-rc.3";
 }
 
 //#endregion

package/dist/tiny.d.mts

@@ -1,6 +1,6 @@
 import "./options-CE4Koxof.mjs";
 import { t as OpenAPICodegenConfig } from "./config-BU7wVf7U.mjs";
-import { $ as isContractProcedure, A as collectOperationMeta, B as generateOpenApiFile, C as collectContractSchemaRoots, D as collectExtraSchemas, E as collectDbTableModelSchemaExports, F as defineOpenApiSchemas, G as getModuleOpenApiTag, H as getContractProcedureData, I as dtoSchemaName, J as getOperationAction, K as getObjectPropertySchema, L as findComponentEnumNames, M as collectReachableModelSchemas, N as collectSchemaRegistryRoots, O as collectModelSchemaExports, P as compactTagName, Q as getStringEnumValues, R as findEnumNames, S as collectApiModelSchemaExports, St as visitZodSchema, T as collectDbTableModelSchemaExport, U as getDerivedOperationId, V as getComponentSchemas, W as getModuleOpenApiController, X as getPaginatedItemSchema, Y as getOperationController, Z as getRobodevModuleRoles, _ as applyPaginatedItemSchemas, _t as stripNoContentResponseBodies, a as GenerateOpenApiFile, at as namedControllerActionInputDtoSchema, b as applyRobodevUserRolesExtension, bt as toOpenAPIAclRule, c as GenerateTinyOpenApiFileOptions, ct as namedOpenApiRequestSchema, d as ProcedureMeta, dt as operationKey, et as isNullSchema, f as TinyOpenApiModule, ft as resolveOpenApiOutputPath, g as applyOperationMeta, gt as shouldUseDtoSchemaName, h as applyEnumExtensions, ht as sharedSchemaExportName, i as GenerateORPCOpenAPISpecOptions, it as isZodSchema, j as collectOperationTags, k as collectModuleModelSchemaExports, l as JsonObject, lt as namedOpenApiResponseSchema, m as ZodSchema, mt as schemaExportName, n as AnyContractRouter, nt as isObject, o as GenerateOpenApiFileOptions, ot as namedControllerActionSchema, p as TinyOpenApiUserRole, pt as schemaComponentRef, q as getOpenApiSchemaName, r as AnySchema, rt as isProcedureMeta, s as GenerateOpenApiFileResult, st as namedOpenApiOutputSchema, t as AclRule, tt as isNullableOnlySchema, u as OpenApiSchemaRegistry, ut as namedOpenApiSchema, v as applyParameterExtensions, vt as toOpenAPI30Document, w as collectContractSchemas, x as asStringArray, xt as toPascalCase, y as applyRobodevModuleExtensions, yt as toOpenAPI30Schema, z as generateORPCOpenAPISpec } from "./openapi-B14GzSA_.mjs";
+import { $ as getRobodevModuleRoles, A as collectModuleModelSchemaExports, B as generateORPCOpenAPISpec, C as collectApiModelSchemaExports, Ct as toOpenAPI30Document, D as collectDbTableModelSchemaExports, Dt as visitZodSchema, E as collectDbTableModelSchemaExport, Et as toPascalCase, F as compactTagName, G as getModuleOpenApiController, H as getComponentSchemas, I as createModelSchemaNameGetter, J as getOpenApiSchemaName, K as getModuleOpenApiTag, L as defineOpenApiSchemas, M as collectOperationTags, N as collectReachableModelSchemas, O as collectExtraSchemas, P as collectSchemaRegistryRoots, Q as getProcedureInputSchemaRole, R as findComponentEnumNames, S as asStringArray, St as stripNoContentResponseBodies, T as collectContractSchemas, Tt as toOpenAPIAclRule, U as getContractProcedureData, V as generateOpenApiFile, W as getDerivedOperationId, X as getOperationController, Y as getOperationAction, Z as getPaginatedItemSchema, _ as applyOperationMeta, _t as resolveOpenApiOutputPath, a as GenerateOpenApiFile, at as isProcedureMeta, b as applyRobodevModuleExtensions, bt as schemaExportName, c as GenerateTinyOpenApiFileOptions, ct as modelSchemaNameEntries, d as ProcedureMeta, dt as namedOpenApiOutputSchema, et as getStringEnumValues, f as TinyOpenApiModule, ft as namedOpenApiRequestSchema, g as applyEnumExtensions, gt as procedureSchemaName, h as addContractSchema, ht as operationKey, i as GenerateORPCOpenAPISpecOptions, it as isObject, j as collectOperationMeta, k as collectModelSchemaExports, l as JsonObject, lt as namedControllerActionInputDtoSchema, m as ZodSchema, mt as namedOpenApiSchema, n as AnyContractRouter, nt as isNullSchema, o as GenerateOpenApiFileOptions, ot as isZodSchema, p as TinyOpenApiUserRole, pt as namedOpenApiResponseSchema, q as getObjectPropertySchema, r as AnySchema, rt as isNullableOnlySchema, s as GenerateOpenApiFileResult, st as modelSchemaExportName, t as AclRule, tt as isContractProcedure, u as OpenApiSchemaRegistry, ut as namedControllerActionSchema, v as applyPaginatedItemSchemas, vt as routeHasPathParameters, w as collectContractSchemaRoots, wt as toOpenAPI30Schema, x as applyRobodevUserRolesExtension, xt as sharedSchemaExportName, y as applyParameterExtensions, yt as schemaComponentRef, z as findEnumNames } from "./openapi-BkC5yZ-W.mjs";
 
 //#region src/tiny/openapi-source.runner.d.ts
 interface TinyOpenApiSourceRunnerConfig {
@@ -18,4 +18,4 @@ declare function isTinyOpenApiFakeMode(apiMode?: string | undefined): boolean;
 declare function getLocalInputPath(input: OpenAPICodegenConfig["input"], root: string): string | undefined;
 declare function normalizeWatchFolders(root: string, watchFolders?: readonly string[]): string[];
 //#endregion
-export { AclRule, AnyContractRouter, AnySchema, GenerateORPCOpenAPISpecOptions, GenerateOpenApiFile, GenerateOpenApiFileOptions, GenerateOpenApiFileResult, GenerateTinyOpenApiFileOptions, JsonObject, OpenApiSchemaRegistry, ProcedureMeta, TinyOpenApiModule, type TinyOpenApiSourceRunnerConfig, TinyOpenApiUserRole, ZodSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, createTinyOpenApiSourceRunner, defineOpenApiSchemas, dtoSchemaName, findComponentEnumNames, findEnumNames, generateORPCOpenAPISpec, generateOpenApiFile, getComponentSchemas, getContractProcedureData, getDerivedOperationId, getModuleOpenApiController, getModuleOpenApiTag, getObjectPropertySchema, getOpenApiSchemaName, getOperationAction, getOperationController, getPaginatedItemSchema, getRobodevModuleRoles, getStringEnumValues, getLocalInputPath as getTinyOpenApiLocalInputPath, isContractProcedure, isNullSchema, isNullableOnlySchema, isObject, isProcedureMeta, isTinyOpenApiFakeMode, isZodSchema, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, resolveOpenApiOutputPath, schemaComponentRef, schemaExportName, sharedSchemaExportName, shouldUseDtoSchemaName, stripNoContentResponseBodies, toOpenAPI30Document, toOpenAPI30Schema, toOpenAPIAclRule, toPascalCase, visitZodSchema };
+export { AclRule, AnyContractRouter, AnySchema, GenerateORPCOpenAPISpecOptions, GenerateOpenApiFile, GenerateOpenApiFileOptions, GenerateOpenApiFileResult, GenerateTinyOpenApiFileOptions, JsonObject, OpenApiSchemaRegistry, ProcedureMeta, TinyOpenApiModule, type TinyOpenApiSourceRunnerConfig, TinyOpenApiUserRole, ZodSchema, addContractSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, createModelSchemaNameGetter, createTinyOpenApiSourceRunner, defineOpenApiSchemas, findComponentEnumNames, findEnumNames, generateORPCOpenAPISpec, generateOpenApiFile, getComponentSchemas, getContractProcedureData, getDerivedOperationId, getModuleOpenApiController, getModuleOpenApiTag, getObjectPropertySchema, getOpenApiSchemaName, getOperationAction, getOperationController, getPaginatedItemSchema, getProcedureInputSchemaRole, getRobodevModuleRoles, getStringEnumValues, getLocalInputPath as getTinyOpenApiLocalInputPath, isContractProcedure, isNullSchema, isNullableOnlySchema, isObject, isProcedureMeta, isTinyOpenApiFakeMode, isZodSchema, modelSchemaExportName, modelSchemaNameEntries, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, procedureSchemaName, resolveOpenApiOutputPath, routeHasPathParameters, schemaComponentRef, schemaExportName, sharedSchemaExportName, stripNoContentResponseBodies, toOpenAPI30Document, toOpenAPI30Schema, toOpenAPIAclRule, toPascalCase, visitZodSchema };

package/dist/tiny.mjs

@@ -8,11 +8,10 @@ import { access, readdir } from "fs/promises";
 async function importRuntimeModule(specifier) {
 	return new Function("specifier", "return import(specifier)")(specifier);
 }
-const DTO_SUFFIX = "Dto";
-const PAGINATED_OUTPUT_SUFFIX = "PaginateOutputDto";
+const PAGINATED_OUTPUT_SUFFIX = "PaginateOutput";
 const PAGINATED_RESPONSE_SUFFIX = "PaginateResponse";
 const PAGINATION_RESPONSE_OUTPUT_SUFFIX = "PaginationResponseOutput";
-const PAGINATED_ITEM_SUFFIX = "PaginateItemDto";
+const PAGINATED_ITEM_SUFFIX = "PaginateItem";
 const PAGINATED_ITEM_OUTPUT_SUFFIX = "PaginateItemOutput";
 const PAGINATION_DTO_SCHEMA_NAME = "PaginationDto";
 const PAGINATION_PROPERTY_NAMES = [
@@ -84,13 +83,13 @@ function namedOpenApiResponseSchema(schema, name) {
 	return namedOpenApiSchema(schema, `${name}Response`);
 }
 function namedOpenApiOutputSchema(schema, name) {
-	return namedOpenApiSchema(schema, `${name}Output`);
+	return namedOpenApiResponseSchema(schema, name);
 }
 function namedControllerActionSchema(schema, controller, action, suffix) {
 	return namedOpenApiSchema(schema, `${controller}Controller${toPascalCase(action)}${suffix}`);
 }
 function namedControllerActionInputDtoSchema(schema, controller, action) {
-	return namedControllerActionSchema(schema, controller, action, "InputDto");
+	return namedControllerActionSchema(schema, controller, action, "Request");
 }
 function getOpenApiSchemaName(schema) {
 	return typeof schema === "object" && schema !== null ? openApiSchemaNames.get(schema) : void 0;
@@ -201,34 +200,30 @@ function toPascalCase(value) {
 function isZodSchema(value) {
 	return isObject(value) && isObject(value["~standard"]) && value["~standard"].vendor === "zod" && isObject(value._zod) && isObject(value._zod.def);
 }
-function dtoSchemaName(name) {
-	return name.endsWith(DTO_SUFFIX) ? name : `${name}${DTO_SUFFIX}`;
-}
-function shouldUseDtoSchemaName(moduleName, schema) {
-	return moduleName !== "common" && ["object", "array"].includes(String(schema._zod.def.type));
-}
 function schemaExportName(moduleName, exportName, schema, getSchemaName = getOpenApiSchemaName) {
 	const explicitName = getSchemaName(schema);
 	if (explicitName) return explicitName;
-	const schemaName = exportName.replace(/Schema$/, "").replace(/DTO$/u, DTO_SUFFIX);
+	const schemaName = exportName.replace(/Schema$/, "").replace(/DTO$/u, "");
 	const modulePrefix = toPascalCase(moduleName);
 	const singularModulePrefix = modulePrefix.endsWith("s") ? modulePrefix.slice(0, -1) : modulePrefix;
-	const prefixedName = moduleName === "common" || schemaName.startsWith(modulePrefix) || schemaName.startsWith(singularModulePrefix) ? schemaName : `${modulePrefix}${schemaName}`;
-	return shouldUseDtoSchemaName(moduleName, schema) ? dtoSchemaName(prefixedName) : prefixedName;
+	return moduleName === "common" || schemaName.startsWith(modulePrefix) || schemaName.startsWith(singularModulePrefix) ? schemaName : `${modulePrefix}${schemaName}`;
+}
+function modelSchemaExportName(exportName) {
+	return exportName.replace(/Schema$/, "");
 }
 function sharedSchemaExportName(exportName) {
 	return exportName.replace(/Schema$/, "");
 }
 async function collectModelSchemaExports(options) {
-	const apiSchemaGroups = options.apiRoot ? await collectApiModelSchemaExports(options.apiRoot, options) : [];
+	const apiSchemaGroups = options.apiRoot ? await collectApiModelSchemaExports(options.apiRoot) : [];
 	const dbSchemaExports = options.dbTablesRoot ? await collectDbTableModelSchemaExports(options.dbTablesRoot) : [];
 	return [...apiSchemaGroups, ...dbSchemaExports];
 }
-async function collectApiModelSchemaExports(apiRoot, options = {}) {
+async function collectApiModelSchemaExports(apiRoot) {
 	const entries = await readdir(apiRoot, { withFileTypes: true });
-	return (await Promise.all(entries.filter((item) => item.isDirectory()).sort((a, b) => a.name.localeCompare(b.name)).map((entry) => collectModuleModelSchemaExports(apiRoot, entry.name, options)))).flat();
+	return (await Promise.all(entries.filter((item) => item.isDirectory()).sort((a, b) => a.name.localeCompare(b.name)).map((entry) => collectModuleModelSchemaExports(apiRoot, entry.name)))).flat();
 }
-async function collectModuleModelSchemaExports(apiRoot, moduleName, options = {}) {
+async function collectModuleModelSchemaExports(apiRoot, moduleName) {
 	const modelsPath = join(apiRoot, moduleName, `${moduleName}.models.ts`);
 	try {
 		await access(modelsPath);
@@ -242,7 +237,7 @@ async function collectModuleModelSchemaExports(apiRoot, moduleName, options = {}
 	const schemas = [];
 	for (const [exportName, schema] of Object.entries(models)) if (exportName.endsWith("Schema") && isZodSchema(schema)) schemas.push({
 		moduleName,
-		name: schemaExportName(moduleName, exportName, schema, options.getOpenApiSchemaName),
+		name: modelSchemaExportName(exportName),
 		schema
 	});
 	return schemas;
@@ -298,23 +293,35 @@ function getObjectPropertySchema(schema, property) {
 	const propertySchema = shape[property];
 	return isZodSchema(propertySchema) ? propertySchema : void 0;
 }
+function routeHasPathParameters(routePath) {
+	return typeof routePath === "string" && /\{[^}]+\}/u.test(routePath);
+}
+function getProcedureInputSchemaRole(route) {
+	if (routeHasPathParameters(route.path)) return "Params";
+	return route.method?.toUpperCase() === "GET" ? "Query" : "Request";
+}
+function procedureSchemaName(procedureName, role) {
+	if (procedureName.endsWith(role)) return procedureName;
+	return `${procedureName}${role}`;
+}
+function addContractSchema(schemas, schema, name, getSchemaName, strategy) {
+	if (!schema) return;
+	schemas[getSchemaName(schema) ?? name] = {
+		schema,
+		...strategy ? { strategy } : {}
+	};
+}
 function collectContractSchemas(router, routerPath = [], schemas = {}, getSchemaName = getOpenApiSchemaName) {
 	const procedure = getContractProcedureData(router);
 	if (procedure) {
 		const procedureName = routerPath.map(toPascalCase).join("");
 		const { inputSchema, outputSchema, route } = procedure;
-		if (inputSchema) {
-			const schema = route.inputStructure === "detailed" ? getObjectPropertySchema(inputSchema, "body") ?? inputSchema : inputSchema;
-			const inputName = getSchemaName(schema) ?? dtoSchemaName(`${procedureName}Input`);
-			schemas[inputName] = { schema };
-		}
-		if (outputSchema && route.successStatus !== 204) {
-			const outputName = getSchemaName(outputSchema) ?? dtoSchemaName(`${procedureName}Output`);
-			schemas[outputName] = {
-				schema: outputSchema,
-				strategy: "output"
-			};
-		}
+		if (inputSchema) if (route.inputStructure === "detailed") {
+			addContractSchema(schemas, getObjectPropertySchema(inputSchema, "params"), procedureSchemaName(procedureName, "Params"), getSchemaName);
+			addContractSchema(schemas, getObjectPropertySchema(inputSchema, "query"), procedureSchemaName(procedureName, "Query"), getSchemaName);
+			addContractSchema(schemas, getObjectPropertySchema(inputSchema, "body") ?? inputSchema, procedureSchemaName(procedureName, "Request"), getSchemaName);
+		} else addContractSchema(schemas, inputSchema, procedureSchemaName(procedureName, getProcedureInputSchemaRole(route)), getSchemaName);
+		if (outputSchema && route.successStatus !== 204) addContractSchema(schemas, outputSchema, procedureSchemaName(procedureName, "Response"), getSchemaName, "output");
 		return schemas;
 	}
 	for (const [name, child] of routerEntries(router)) collectContractSchemas(child, [...routerPath, name], schemas, getSchemaName);
@@ -359,18 +366,25 @@ function collectSchemaRegistryRoots(registry) {
 		return schemas;
 	}, /* @__PURE__ */ new Set());
 }
+function modelSchemaNameEntries(modelSchemas) {
+	const schemaNameBySchema = /* @__PURE__ */ new Map();
+	for (const { name, schema } of modelSchemas) {
+		const existingName = schemaNameBySchema.get(schema);
+		if (!existingName || name.length < existingName.length) schemaNameBySchema.set(schema, name);
+	}
+	return schemaNameBySchema;
+}
+function createModelSchemaNameGetter(modelSchemas, getSchemaName = getOpenApiSchemaName) {
+	const schemaNameBySchema = modelSchemaNameEntries(modelSchemas);
+	return (schema) => (isZodSchema(schema) ? schemaNameBySchema.get(schema) : void 0) ?? getSchemaName(schema);
+}
 async function collectReachableModelSchemas(router, options = {}) {
 	const excludedSchemas = options.excludedSchemas ?? /* @__PURE__ */ new Set();
-	const modelSchemas = await collectModelSchemaExports(options);
-	const schemaNameBySchema = /* @__PURE__ */ new Map();
+	const modelSchemas = options.modelSchemas ?? await collectModelSchemaExports(options);
+	const schemaNameBySchema = modelSchemaNameEntries(modelSchemas);
 	const routeRoots = collectContractSchemaRoots(router);
 	const reachableSchemas = {};
 	for (const { moduleName, name, schema } of modelSchemas) if ((moduleName === "common" || name.endsWith("SortableKey") || name.endsWith("OrderParamEnum")) && !excludedSchemas.has(schema)) reachableSchemas[name] = { schema };
-	for (const { name, schema } of modelSchemas) {
-		const existingName = schemaNameBySchema.get(schema);
-		if (!existingName) schemaNameBySchema.set(schema, name);
-		else if (existingName !== name) schemaNameBySchema.set(schema, existingName.length <= name.length ? existingName : name);
-	}
 	for (const root of routeRoots) {
 		if (!isZodSchema(root)) continue;
 		visitZodSchema(root, (schema) => {
@@ -575,14 +589,20 @@ function toOpenAPI30Document(spec) {
 async function generateORPCOpenAPISpec(options) {
 	const [{ OpenAPIGenerator }, { ZodToJsonSchemaConverter }] = await Promise.all([importRuntimeModule("@orpc/openapi"), importRuntimeModule("@orpc/zod/zod4")]);
 	const generator = new OpenAPIGenerator({ schemaConverters: [new ZodToJsonSchemaConverter()] });
-	const getSchemaName = options.getOpenApiSchemaName ?? getOpenApiSchemaName;
+	const explicitSchemaName = options.getOpenApiSchemaName ?? getOpenApiSchemaName;
+	const modelSchemas = await collectModelSchemaExports({
+		apiRoot: options.apiRoot,
+		dbTablesRoot: options.dbTablesRoot
+	});
+	const getSchemaName = createModelSchemaNameGetter(modelSchemas, explicitSchemaName);
 	const operationMeta = collectOperationMeta(options.contract);
 	const extraSchemas = collectExtraSchemas(options.apiModules);
 	const reachableModelSchemas = await collectReachableModelSchemas(options.contract, {
 		apiRoot: options.apiRoot,
 		dbTablesRoot: options.dbTablesRoot,
 		excludedSchemas: collectSchemaRegistryRoots(extraSchemas),
-		getOpenApiSchemaName: getSchemaName
+		getOpenApiSchemaName: getSchemaName,
+		modelSchemas
 	});
 	const commonSchemas = {
 		...collectContractSchemas(options.contract, [], {}, getSchemaName),
@@ -628,4 +648,4 @@ async function generateORPCOpenAPISpec(options) {
 }
 
 //#endregion
-export { applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, createTinyOpenApiSourceRunner, defineOpenApiSchemas, dtoSchemaName, findComponentEnumNames, findEnumNames, generateORPCOpenAPISpec, generateOpenApiFile, getComponentSchemas, getContractProcedureData, getDerivedOperationId, getModuleOpenApiController, getModuleOpenApiTag, getObjectPropertySchema, getOpenApiSchemaName, getOperationAction, getOperationController, getPaginatedItemSchema, getRobodevModuleRoles, getStringEnumValues, getLocalInputPath as getTinyOpenApiLocalInputPath, isContractProcedure, isNullSchema, isNullableOnlySchema, isObject, isProcedureMeta, isTinyOpenApiFakeMode, isZodSchema, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, resolveOpenApiOutputPath, schemaComponentRef, schemaExportName, sharedSchemaExportName, shouldUseDtoSchemaName, stripNoContentResponseBodies, toOpenAPI30Document, toOpenAPI30Schema, toOpenAPIAclRule, toPascalCase, visitZodSchema };
+export { addContractSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, createModelSchemaNameGetter, createTinyOpenApiSourceRunner, defineOpenApiSchemas, findComponentEnumNames, findEnumNames, generateORPCOpenAPISpec, generateOpenApiFile, getComponentSchemas, getContractProcedureData, getDerivedOperationId, getModuleOpenApiController, getModuleOpenApiTag, getObjectPropertySchema, getOpenApiSchemaName, getOperationAction, getOperationController, getPaginatedItemSchema, getProcedureInputSchemaRole, getRobodevModuleRoles, getStringEnumValues, getLocalInputPath as getTinyOpenApiLocalInputPath, isContractProcedure, isNullSchema, isNullableOnlySchema, isObject, isProcedureMeta, isTinyOpenApiFakeMode, isZodSchema, modelSchemaExportName, modelSchemaNameEntries, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, procedureSchemaName, resolveOpenApiOutputPath, routeHasPathParameters, schemaComponentRef, schemaExportName, sharedSchemaExportName, stripNoContentResponseBodies, toOpenAPI30Document, toOpenAPI30Schema, toOpenAPIAclRule, toPascalCase, visitZodSchema };

package/dist/vite.d.mts

@@ -1,6 +1,6 @@
 import { r as GenerateFileFormatter } from "./options-CE4Koxof.mjs";
 import { t as OpenAPICodegenConfig } from "./config-BU7wVf7U.mjs";
-import { a as GenerateOpenApiFile } from "./openapi-B14GzSA_.mjs";
+import { a as GenerateOpenApiFile } from "./openapi-BkC5yZ-W.mjs";
 import { Plugin, PluginOption } from "vite";
 
 //#region src/plugins/openapi-codegen.runner.d.ts

package/package.json

@@ -138,5 +138,5 @@
     "pnpm": ">= 9"
   },
   "packageManager": "pnpm@10.4.0",
-  "version": "3.1.0-rc.1"
+  "version": "3.1.0-rc.3"
 }