@povio/openapi-codegen-cli 3.1.0-rc.2 → 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-D9apjIRy.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-D9apjIRy.d.mts → openapi-BkC5yZ-W.d.mts}

@@ -107,18 +107,14 @@ declare function operationKey(method: string, routePath: string): string;
 declare function toPascalCase(value: string): string;
 declare function isZodSchema(value: unknown): value is ZodSchema;
 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;
@@ -136,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;
@@ -169,4 +168,4 @@ declare function applyPaginatedItemSchemas(spec: JsonObject): void;
 declare function toOpenAPI30Document(spec: JsonObject): JsonObject;
 declare function generateORPCOpenAPISpec(options: GenerateORPCOpenAPISpecOptions): Promise<JsonObject>;
 //#endregion
-export { getStringEnumValues as $, collectModuleModelSchemaExports as A, generateOpenApiFile as B, collectApiModelSchemaExports as C, toPascalCase as Ct, collectDbTableModelSchemaExports as D, collectDbTableModelSchemaExport as E, compactTagName as F, getModuleOpenApiTag as G, getContractProcedureData as H, defineOpenApiSchemas as I, getOperationAction as J, getObjectPropertySchema as K, findComponentEnumNames as L, collectOperationTags as M, collectReachableModelSchemas as N, collectExtraSchemas as O, collectSchemaRegistryRoots as P, getRobodevModuleRoles as Q, findEnumNames as R, asStringArray as S, toOpenAPIAclRule as St, collectContractSchemas as T, getDerivedOperationId as U, getComponentSchemas as V, getModuleOpenApiController as W, getPaginatedItemSchema as X, getOperationController as Y, getProcedureInputSchemaRole as Z, applyOperationMeta as _, schemaExportName as _t, GenerateOpenApiFile as a, isZodSchema as at, applyRobodevModuleExtensions as b, toOpenAPI30Document as bt, GenerateTinyOpenApiFileOptions as c, namedOpenApiOutputSchema as ct, ProcedureMeta as d, namedOpenApiSchema as dt, isContractProcedure as et, TinyOpenApiModule as f, operationKey as ft, applyEnumExtensions as g, schemaComponentRef as gt, addContractSchema as h, routeHasPathParameters as ht, GenerateORPCOpenAPISpecOptions as i, isProcedureMeta as it, collectOperationMeta as j, collectModelSchemaExports as k, JsonObject as l, namedOpenApiRequestSchema as lt, ZodSchema as m, resolveOpenApiOutputPath as mt, AnyContractRouter as n, isNullableOnlySchema as nt, GenerateOpenApiFileOptions as o, namedControllerActionInputDtoSchema as ot, TinyOpenApiUserRole as p, procedureSchemaName as pt, getOpenApiSchemaName as q, AnySchema as r, isObject as rt, GenerateOpenApiFileResult as s, namedControllerActionSchema as st, AclRule as t, isNullSchema as tt, OpenApiSchemaRegistry as u, namedOpenApiResponseSchema as ut, applyPaginatedItemSchemas as v, sharedSchemaExportName as vt, collectContractSchemaRoots as w, visitZodSchema as wt, applyRobodevUserRolesExtension as x, toOpenAPI30Schema as xt, applyParameterExtensions as y, stripNoContentResponseBodies 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.2";
+	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 getStringEnumValues, A as collectModuleModelSchemaExports, B as generateOpenApiFile, C as collectApiModelSchemaExports, Ct as toPascalCase, D as collectDbTableModelSchemaExports, E as collectDbTableModelSchemaExport, F as compactTagName, G as getModuleOpenApiTag, H as getContractProcedureData, I as defineOpenApiSchemas, J as getOperationAction, K as getObjectPropertySchema, L as findComponentEnumNames, M as collectOperationTags, N as collectReachableModelSchemas, O as collectExtraSchemas, P as collectSchemaRegistryRoots, Q as getRobodevModuleRoles, R as findEnumNames, S as asStringArray, St as toOpenAPIAclRule, T as collectContractSchemas, U as getDerivedOperationId, V as getComponentSchemas, W as getModuleOpenApiController, X as getPaginatedItemSchema, Y as getOperationController, Z as getProcedureInputSchemaRole, _ as applyOperationMeta, _t as schemaExportName, a as GenerateOpenApiFile, at as isZodSchema, b as applyRobodevModuleExtensions, bt as toOpenAPI30Document, c as GenerateTinyOpenApiFileOptions, ct as namedOpenApiOutputSchema, d as ProcedureMeta, dt as namedOpenApiSchema, et as isContractProcedure, f as TinyOpenApiModule, ft as operationKey, g as applyEnumExtensions, gt as schemaComponentRef, h as addContractSchema, ht as routeHasPathParameters, i as GenerateORPCOpenAPISpecOptions, it as isProcedureMeta, j as collectOperationMeta, k as collectModelSchemaExports, l as JsonObject, lt as namedOpenApiRequestSchema, m as ZodSchema, mt as resolveOpenApiOutputPath, n as AnyContractRouter, nt as isNullableOnlySchema, o as GenerateOpenApiFileOptions, ot as namedControllerActionInputDtoSchema, p as TinyOpenApiUserRole, pt as procedureSchemaName, q as getOpenApiSchemaName, r as AnySchema, rt as isObject, s as GenerateOpenApiFileResult, st as namedControllerActionSchema, t as AclRule, tt as isNullSchema, u as OpenApiSchemaRegistry, ut as namedOpenApiResponseSchema, v as applyPaginatedItemSchemas, vt as sharedSchemaExportName, w as collectContractSchemaRoots, wt as visitZodSchema, x as applyRobodevUserRolesExtension, xt as toOpenAPI30Schema, y as applyParameterExtensions, yt as stripNoContentResponseBodies, z as generateORPCOpenAPISpec } from "./openapi-D9apjIRy.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, addContractSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, 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, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, procedureSchemaName, resolveOpenApiOutputPath, routeHasPathParameters, schemaComponentRef, schemaExportName, sharedSchemaExportName, 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

@@ -208,19 +208,22 @@ function schemaExportName(moduleName, exportName, schema, getSchemaName = getOpe
 	const singularModulePrefix = modulePrefix.endsWith("s") ? modulePrefix.slice(0, -1) : modulePrefix;
 	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);
@@ -234,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;
@@ -363,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) => {
@@ -579,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),
@@ -632,4 +648,4 @@ async function generateORPCOpenAPISpec(options) {
 }
 
 //#endregion
-export { addContractSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, 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, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, procedureSchemaName, resolveOpenApiOutputPath, routeHasPathParameters, schemaComponentRef, schemaExportName, sharedSchemaExportName, 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-D9apjIRy.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.2"
+  "version": "3.1.0-rc.3"
 }