@povio/openapi-codegen-cli 4.0.0-rc.4 → 4.0.0-rc.5

package/README.md

@@ -36,6 +36,31 @@ export default {
 };
 ```
 
+## Lazy schemas
+
+With `tsNamespaces` enabled, every schema of a models namespace is built the moment the module is imported, even when the importer only needs one of them. Set `lazySchemas: true` (or pass `--lazySchemas`) to build each schema on first access instead:
+
+```typescript
+// Generated with lazySchemas: true
+const once = <T>(create: () => T) => {
+  let value: T | undefined;
+  return () => (value ??= create());
+};
+
+const PetSchema = once(() => z.object({ id: z.int(), category: CategorySchema() }));
+
+export const PetModels = {
+  get PetSchema() {
+    return PetSchema();
+  },
+};
+export declare namespace PetModels {
+  export type Pet = z.infer<typeof PetModels.PetSchema>;
+}
+```
+
+`PetModels.PetSchema` stays a regular Zod schema (`.extend`, `.shape`, `.pick` all work and return the same instance on every access), `PetModels.Pet` keeps resolving as a type, and `modelsInCommon` proxies forward to the shared namespace lazily as well. The option requires `tsNamespaces` and is honored by both the TypeScript and native generators. It helps cold starts of apps that import large model modules but render only a slice of them.
+
 ## Configuration Files
 
 The CLI supports TypeScript configuration files to simplify command execution and provide consistent settings with full type safety. Configuration files are automatically discovered in your project root.
@@ -100,6 +125,7 @@ bunx openapi-codegen generate --config my-config.ts
   --tsPath                            (Requires `--importPath` to be 'ts') Typescript import path (default: '@/data')
   --removeOperationPrefixEndingWith   Remove operation name prefixes that end with the specified string (default: 'Controller_')
   --compileSchemas                    Eagerly compile non-recursive Zod schemas (default: false)
+  --lazySchemas                       Build namespace model schemas on first access instead of at import; requires `--tsNamespaces` (default: false)
   --extractEnums                      Extract enums into separate Zod schemas (default: true)
   --modelsInCommon                    Keep all schema declarations in defaultTag models and emit per-module proxy exports (default: false)
   --replaceOptionalWithNullish        Replace `.optional()` chains with `.nullish()` in generated Zod schemas (default: false)
@@ -342,6 +368,8 @@ const config: OpenAPICodegenConfig = {
   // modelsOnly: true,
   // 4) Keep all model declarations in common.models and generate per-module model proxies
   // modelsInCommon: true,
+  // 5) Build each namespace schema on first access instead of at import (requires tsNamespaces)
+  // lazySchemas: true,
 };
 ```
 
@@ -592,17 +620,17 @@ export class JSONDto {
 
 Use package subpaths for runtime imports. Pure `import type` imports may use the package root.
 
-| Runtime exports | Subpath |
-| --- | --- |
-| `AuthContext`, `AuthGuard` | `/auth` |
-| `AbilityContext`, `useAclCheck`, `Can`, `createAclGuard` | `/acl` |
-| `ErrorHandler`, `SharedErrorHandler`, `ApplicationException`, `DomainErrorRegistry` | `/errors` |
-| `useMutationEffects`, `OpenApiQueryConfig` | `/query` |
+| Runtime exports                                                                              | Subpath   |
+| -------------------------------------------------------------------------------------------- | --------- |
+| `AuthContext`, `AuthGuard`                                                                   | `/auth`   |
+| `AbilityContext`, `useAclCheck`, `Can`, `createAclGuard`                                     | `/acl`    |
+| `ErrorHandler`, `SharedErrorHandler`, `ApplicationException`, `DomainErrorRegistry`          | `/errors` |
+| `useMutationEffects`, `OpenApiQueryConfig`                                                   | `/query`  |
 | `OpenApiRouter`, `OpenApiWorkspaceContext`, `useWorkspaceContext`, translation configuration | `/config` |
-| `ZodExtended` | `/zod` |
-| `HttpError`, transport types | `/rest` |
-| `NativeRestClient` | `/native` |
-| `RestClient`, `RestInterceptor` (Axios transport) | `/axios` |
+| `ZodExtended`                                                                                | `/zod`    |
+| `HttpError`, transport types                                                                 | `/rest`   |
+| `NativeRestClient`                                                                           | `/native` |
+| `RestClient`, `RestInterceptor` (Axios transport)                                            | `/axios`  |
 
 For example: `import { AuthContext, AuthGuard } from "@povio/openapi-codegen-cli/auth"`.
 Custom application helpers should import error helpers from `/errors`, `AbilityContext` from `/acl`, and mutation effects from `/query`.

package/dist/{config-BSYiW3xV.d.mts → config-D8ANLlqk.d.mts}

@@ -1,4 +1,4 @@
-import { t as GenerateOptions } from "./options-BV720uS2.mjs";
+import { t as GenerateOptions } from "./options-B7-eMFcv.mjs";
 //#region src/generators/types/config.d.ts
 type OpenAPICodegenConfig = Partial<GenerateOptions>;
 //#endregion

package/dist/config.d.mts

@@ -1,4 +1,4 @@
 import { i as resources, n as configureTranslations, r as ns, t as TranslateFunction } from "./i18n-B_brQh4X.mjs";
 import { n as useWorkspaceContext, r as OpenApiRouter, t as OpenApiWorkspaceContext } from "./workspace.context-isVY9ves.mjs";
-import { a as MutationEffectsTypes, c as RegisteredQueryModule, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-BbLtDfIH.mjs";
-export { type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsTypes, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RegisteredQueryModule, type TranslateFunction, configureTranslations, ns, resources, useWorkspaceContext };
+import { a as MergedMutationVariables, c as OpenApiQueryConfig, i as MergedMutationValues, l as QueryModule, n as InvalidationMapFunc, o as MutationEffectsOf, r as MergedMutationData, s as MutationEffectsTypes, t as InvalidationMap, u as RegisteredQueryModule } from "./queryConfig.context-DwVQWbtL.mjs";
+export { type InvalidationMap, type InvalidationMapFunc, type MergedMutationData, type MergedMutationValues, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsTypes, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RegisteredQueryModule, type TranslateFunction, configureTranslations, ns, resources, useWorkspaceContext };

package/dist/{generate.runner-BMqvEp4L.mjs → generate.runner-LDL6Lbgl.mjs}

@@ -471,6 +471,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	modelsOnly: false,
 	standalone: false,
 	compileSchemas: false,
+	lazySchemas: false,
 	schemaSuffix: SCHEMA_SUFFIX,
 	enumSuffix: ENUM_SUFFIX,
 	modelsInCommon: false,
@@ -1345,6 +1346,7 @@ function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, in
 		workspaceContext: workspaceContext?.split(",")
 	});
 	if (resolvedConfig.modelsInCommon && resolvedConfig.modelsInModules) throw new Error("modelsInCommon and modelsInModules cannot both be enabled");
+	if (resolvedConfig.lazySchemas && !resolvedConfig.tsNamespaces) throw new Error("lazySchemas requires tsNamespaces");
 	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
 	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
 	return resolvedConfig;
@@ -1472,7 +1474,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-oe5uj0P4.mjs").then((n) => n.n);
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-B7VWwIbb.mjs").then((n) => n.n);
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/{generate.utils-D4eHo3wO.cjs → generate.utils-BFeGvk98.cjs}

@@ -100,6 +100,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	modelsOnly: false,
 	standalone: false,
 	compileSchemas: false,
+	lazySchemas: false,
 	schemaSuffix: SCHEMA_SUFFIX,
 	enumSuffix: ENUM_SUFFIX,
 	modelsInCommon: false,

package/dist/{generateCodeFromOpenAPIDoc-oe5uj0P4.mjs → generateCodeFromOpenAPIDoc-B7VWwIbb.mjs}

@@ -1,5 +1,5 @@
-import { a as isQuery, i as isMutation, n as getDestructuredVariables, r as isInfiniteQuery, s as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-BqEeVt1w.mjs";
-import { $t as AXIOS_DEFAULT_IMPORT_NAME, A as getAbilityConditionType, B as getImportedZodSchemaInferedTypeName, C as getTagFileName, D as getImportPath, E as getEndpointsImports, Et as isParamMediaTypeAllowed, F as getAbilitySubjectTypes, G as getZodSchemaType, H as getZodSchemaDescription, I as getAclData, J as getUniqueArray, K as getSchemaDescriptions, L as getAppAbilitiesType, Lt as isReferenceObject, M as getAbilityDescription, N as getAbilityFunctionName, O as getModelsImports, P as getAbilitySubject, Pt as wrapWithQuotesIfNeeded, Qt as ZOD_IMPORT, R as hasAbilityConditions, Rt as isSchemaObject, S as getQueryTypesImportPath, T as getAclImports, U as getZodSchemaInferedTypeName, V as getImportedZodSchemaName, W as getZodSchemaPropertyDescriptions, X as invalidVariableNameCharactersToCamel, Y as DEFAULT_GENERATE_OPTIONS, _n as Profiler, _t as getNamespaceName, an as NATIVE_RESPONSE_TYPE, at as APP_REST_CLIENT_FILE, b as getFileNameWithExtension, c as getEndpointBody, cn as getEndpointTag, ct as MUTATION_EFFECTS, d as getEndpointPath, dn as shouldInlineEndpointsForTag, dt as QUERY_OPTIONS_TYPES, en as AXIOS_IMPORT, f as getImportedEndpointName, fn as capitalize, ft as ZOD_EXTENDED, g as requiresBody, gn as snakeToCamel, gt as REST_PACKAGE_IMPORT_PATH, h as renderMediaUploadMutationBody, ht as NATIVE_PACKAGE_IMPORT_PATH, i as shouldUseNativeCodegen, it as isNamedZodSchema, j as getAbilityConditionsTypes, k as getAbilityAction, l as getEndpointConfig, lt as QUERY_MODULES_FILE, m as mapEndpointParamsToFunctionParams, mt as CONFIG_PACKAGE_IMPORT_PATH, nn as AXIOS_REQUEST_CONFIG_TYPE, o as getOutputFileName, on as getRequestConfigTypeName, ot as APP_REST_CLIENT_NAME, p as hasEndpointConfig, pt as AXIOS_PACKAGE_IMPORT_PATH, r as compileNativeData, rt as isEnumZodSchema, st as DOMAIN_ERRORS_FILE, tn as AXIOS_REQUEST_CONFIG_NAME, u as getEndpointName, ut as QUERY_MODULE_ENUM, w as getTagImportPath, x as getQueryModulesImportPath, y as getAppRestClientImportPath, z as renderAclCheckCall } from "./generate.runner-BMqvEp4L.mjs";
+import { a as isQuery, i as isMutation, n as getDestructuredVariables, r as isInfiniteQuery, s as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-C0iehdg8.mjs";
+import { $t as AXIOS_DEFAULT_IMPORT_NAME, A as getAbilityConditionType, B as getImportedZodSchemaInferedTypeName, C as getTagFileName, D as getImportPath, E as getEndpointsImports, Et as isParamMediaTypeAllowed, F as getAbilitySubjectTypes, G as getZodSchemaType, H as getZodSchemaDescription, I as getAclData, J as getUniqueArray, K as getSchemaDescriptions, L as getAppAbilitiesType, Lt as isReferenceObject, M as getAbilityDescription, N as getAbilityFunctionName, O as getModelsImports, P as getAbilitySubject, Pt as wrapWithQuotesIfNeeded, Qt as ZOD_IMPORT, R as hasAbilityConditions, Rt as isSchemaObject, S as getQueryTypesImportPath, T as getAclImports, U as getZodSchemaInferedTypeName, V as getImportedZodSchemaName, W as getZodSchemaPropertyDescriptions, X as invalidVariableNameCharactersToCamel, Y as DEFAULT_GENERATE_OPTIONS, _n as Profiler, _t as getNamespaceName, an as NATIVE_RESPONSE_TYPE, at as APP_REST_CLIENT_FILE, b as getFileNameWithExtension, c as getEndpointBody, cn as getEndpointTag, ct as MUTATION_EFFECTS, d as getEndpointPath, dn as shouldInlineEndpointsForTag, dt as QUERY_OPTIONS_TYPES, en as AXIOS_IMPORT, f as getImportedEndpointName, fn as capitalize, ft as ZOD_EXTENDED, g as requiresBody, gn as snakeToCamel, gt as REST_PACKAGE_IMPORT_PATH, h as renderMediaUploadMutationBody, ht as NATIVE_PACKAGE_IMPORT_PATH, i as shouldUseNativeCodegen, it as isNamedZodSchema, j as getAbilityConditionsTypes, k as getAbilityAction, l as getEndpointConfig, lt as QUERY_MODULES_FILE, m as mapEndpointParamsToFunctionParams, mt as CONFIG_PACKAGE_IMPORT_PATH, nn as AXIOS_REQUEST_CONFIG_TYPE, o as getOutputFileName, on as getRequestConfigTypeName, ot as APP_REST_CLIENT_NAME, p as hasEndpointConfig, pt as AXIOS_PACKAGE_IMPORT_PATH, r as compileNativeData, rt as isEnumZodSchema, st as DOMAIN_ERRORS_FILE, tn as AXIOS_REQUEST_CONFIG_NAME, u as getEndpointName, ut as QUERY_MODULE_ENUM, w as getTagImportPath, x as getQueryModulesImportPath, y as getAppRestClientImportPath, z as renderAclCheckCall } from "./generate.runner-LDL6Lbgl.mjs";
 import "node:module";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -341,6 +341,83 @@ function renderEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 	return lines.join("\n        ");
 }
 //#endregion
+//#region src/generators/utils/generate/generate.lazy.utils.ts
+const ONCE_HELPER_LINES = [
+	"const once = <T>(create: () => T) => {",
+	"  let value: T | undefined;",
+	"  return () => (value ??= create());",
+	"};"
+];
+const isIdentifierChar = (char) => /[A-Za-z0-9_$]/.test(char);
+const findLiteralEnd = (code, start, quote) => {
+	let index = start + 1;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\\") {
+			index += 2;
+			continue;
+		}
+		index += 1;
+		if (char === quote) break;
+	}
+	return Math.min(index, code.length);
+};
+const findRegexEnd = (code, start) => {
+	let escaped = false;
+	let characterClass = false;
+	for (let index = start + 1; index < code.length; index += 1) {
+		const char = code[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (char === "[") characterClass = true;
+		if (char === "]") characterClass = false;
+		if (char === "/" && !characterClass) return index + 1;
+	}
+	return code.length;
+};
+/**
+* Rewrites bare references to sibling schemas (`PetSchema`) into factory calls (`PetSchema()`).
+* Member accesses (`CommonModels.PetSchema`, `.enum`), object keys and literal values are left alone.
+*/
+function callLazySchemaReferences(code, schemaNames) {
+	let output = "";
+	let index = 0;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\"" || char === "'" || char === "`") {
+			const end = findLiteralEnd(code, index, char);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (char === "/" && output.trimEnd().endsWith(".regex(")) {
+			const end = findRegexEnd(code, index);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (isIdentifierChar(char)) {
+			let end = index + 1;
+			while (end < code.length && isIdentifierChar(code[end])) end += 1;
+			const identifier = code.slice(index, end);
+			const isMemberAccess = output.endsWith(".");
+			const isObjectKey = code.slice(end).trimStart().startsWith(":");
+			output += schemaNames.has(identifier) && !isMemberAccess && !isObjectKey ? `${identifier}()` : identifier;
+			index = end;
+			continue;
+		}
+		output += char;
+		index += 1;
+	}
+	return output;
+}
+//#endregion
 //#region src/generators/generate/generateModels.ts
 function generateModels({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedModels?.(tag);
@@ -376,6 +453,12 @@ function generateModels({ resolver, data, tag }) {
 	lines.push(renderImport$1(ZOD_IMPORT));
 	for (const modelsImport of modelsImports) lines.push(renderImport$1(modelsImport));
 	lines.push("");
+	if (resolver.options.lazySchemas && resolver.options.tsNamespaces) return renderLazyModels({
+		resolver,
+		tag,
+		zodSchemasData,
+		lines
+	});
 	if (resolver.options.tsNamespaces) lines.push(`export namespace ${getNamespaceName({
 		type: "models",
 		tag,
@@ -400,6 +483,50 @@ function generateModels({ resolver, data, tag }) {
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderLazyModels({ resolver, tag, zodSchemasData, lines }) {
+	const namespace = getNamespaceName({
+		type: "models",
+		tag,
+		options: resolver.options
+	});
+	const schemaNames = new Set(Object.keys(zodSchemasData));
+	const members = [];
+	const types = [];
+	lines.push(...ONCE_HELPER_LINES, "");
+	for (const [name, zodSchema] of Object.entries(zodSchemasData)) {
+		const inferredTypeName = getZodSchemaInferedTypeName(name, resolver.options);
+		const typeAnnotation = zodSchema.isCircular ? `: () => z.ZodObject<z.ZodRawShape> & z.ZodType<${namespace}.${inferredTypeName}>` : "";
+		const schemaCode = resolver.options.compileSchemas && !zodSchema.isCircular ? `z.compile(${zodSchema.code})` : zodSchema.code;
+		lines.push(`const ${name}${typeAnnotation} = once(() => ${callLazySchemaReferences(schemaCode, schemaNames)});`);
+		members.push(...indent(renderModelJsDocs({
+			name,
+			zodSchema,
+			tag,
+			resolver
+		}).split("\n")));
+		members.push(...renderLazyMember(name, `${name}()`));
+		if (zodSchema.isCircular && zodSchema.schemaObj) types.push(`  export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		else types.push(`  export type ${inferredTypeName} = z.infer<typeof ${namespace}.${name}>;`);
+		if (zodSchema.isEnum) {
+			lines.push(`const ${inferredTypeName} = once(() => ${name}().enum);`);
+			members.push(...renderLazyMember(inferredTypeName, `${inferredTypeName}()`));
+		}
+	}
+	lines.push("");
+	lines.push(`export const ${namespace} = {`, ...members, "};");
+	lines.push(`export declare namespace ${namespace} {`, ...types, "}");
+	return lines.join("\n") + "\n";
+}
+function renderLazyMember(name, value) {
+	return [
+		`  get ${name}() {`,
+		`    return ${value};`,
+		`  },`
+	];
+}
+function indent(lines) {
+	return lines.map((line) => `  ${line}`);
+}
 function renderSchemaType(schema, resolver) {
 	if (isReferenceObject(schema)) {
 		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
@@ -458,6 +585,20 @@ function renderModelsProxy({ resolver, data, tag }) {
 	})}`;
 	const inferredTypeNames = schemaNames.map((schemaName) => getZodSchemaInferedTypeName(schemaName, resolver.options));
 	const enumInferredTypeNames = schemaNames.filter((schemaName) => isEnumZodSchema(commonZodSchemas[schemaName] ?? "")).map((schemaName) => getZodSchemaInferedTypeName(schemaName, resolver.options));
+	if (resolver.options.tsNamespaces && resolver.options.lazySchemas) {
+		const lines = [];
+		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);
+		lines.push("");
+		lines.push(`export const ${modelsNamespace} = {`);
+		for (const schemaName of schemaNames) lines.push(...renderLazyMember(schemaName, `${commonNamespace}.${schemaName}`));
+		for (const enumName of enumInferredTypeNames) lines.push(...renderLazyMember(enumName, `${commonNamespace}.${enumName}`));
+		lines.push("};");
+		lines.push(`export declare namespace ${modelsNamespace} {`);
+		for (const typeName of inferredTypeNames) lines.push(`  export type ${typeName} = ${commonNamespace}.${typeName};`);
+		lines.push("}");
+		lines.push("");
+		return lines.join("\n");
+	}
 	if (resolver.options.tsNamespaces) {
 		const lines = [];
 		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);

package/dist/{generateCodeFromOpenAPIDoc-DRLE112u.cjs → generateCodeFromOpenAPIDoc-CpAdx6I3.cjs}

@@ -1,4 +1,4 @@
-const require_generate_utils = require("./generate.utils-D4eHo3wO.cjs");
+const require_generate_utils = require("./generate.utils-BFeGvk98.cjs");
 let openapi_types = require("openapi-types");
 //#region src/generators/const/acl.const.ts
 const ACL_APP_ABILITY_FILE = {
@@ -2341,6 +2341,83 @@ function renderEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 	return lines.join("\n        ");
 }
 //#endregion
+//#region src/generators/utils/generate/generate.lazy.utils.ts
+const ONCE_HELPER_LINES = [
+	"const once = <T>(create: () => T) => {",
+	"  let value: T | undefined;",
+	"  return () => (value ??= create());",
+	"};"
+];
+const isIdentifierChar = (char) => /[A-Za-z0-9_$]/.test(char);
+const findLiteralEnd = (code, start, quote) => {
+	let index = start + 1;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\\") {
+			index += 2;
+			continue;
+		}
+		index += 1;
+		if (char === quote) break;
+	}
+	return Math.min(index, code.length);
+};
+const findRegexEnd = (code, start) => {
+	let escaped = false;
+	let characterClass = false;
+	for (let index = start + 1; index < code.length; index += 1) {
+		const char = code[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (char === "[") characterClass = true;
+		if (char === "]") characterClass = false;
+		if (char === "/" && !characterClass) return index + 1;
+	}
+	return code.length;
+};
+/**
+* Rewrites bare references to sibling schemas (`PetSchema`) into factory calls (`PetSchema()`).
+* Member accesses (`CommonModels.PetSchema`, `.enum`), object keys and literal values are left alone.
+*/
+function callLazySchemaReferences(code, schemaNames) {
+	let output = "";
+	let index = 0;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\"" || char === "'" || char === "`") {
+			const end = findLiteralEnd(code, index, char);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (char === "/" && output.trimEnd().endsWith(".regex(")) {
+			const end = findRegexEnd(code, index);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (isIdentifierChar(char)) {
+			let end = index + 1;
+			while (end < code.length && isIdentifierChar(code[end])) end += 1;
+			const identifier = code.slice(index, end);
+			const isMemberAccess = output.endsWith(".");
+			const isObjectKey = code.slice(end).trimStart().startsWith(":");
+			output += schemaNames.has(identifier) && !isMemberAccess && !isObjectKey ? `${identifier}()` : identifier;
+			index = end;
+			continue;
+		}
+		output += char;
+		index += 1;
+	}
+	return output;
+}
+//#endregion
 //#region src/generators/generate/generateModels.ts
 function generateModels({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedModels?.(tag);
@@ -2376,6 +2453,12 @@ function generateModels({ resolver, data, tag }) {
 	lines.push(renderImport$1(require_generate_utils.ZOD_IMPORT));
 	for (const modelsImport of modelsImports) lines.push(renderImport$1(modelsImport));
 	lines.push("");
+	if (resolver.options.lazySchemas && resolver.options.tsNamespaces) return renderLazyModels({
+		resolver,
+		tag,
+		zodSchemasData,
+		lines
+	});
 	if (resolver.options.tsNamespaces) lines.push(`export namespace ${require_generate_utils.getNamespaceName({
 		type: "models",
 		tag,
@@ -2400,6 +2483,50 @@ function generateModels({ resolver, data, tag }) {
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderLazyModels({ resolver, tag, zodSchemasData, lines }) {
+	const namespace = require_generate_utils.getNamespaceName({
+		type: "models",
+		tag,
+		options: resolver.options
+	});
+	const schemaNames = new Set(Object.keys(zodSchemasData));
+	const members = [];
+	const types = [];
+	lines.push(...ONCE_HELPER_LINES, "");
+	for (const [name, zodSchema] of Object.entries(zodSchemasData)) {
+		const inferredTypeName = require_generate_utils.getZodSchemaInferedTypeName(name, resolver.options);
+		const typeAnnotation = zodSchema.isCircular ? `: () => z.ZodObject<z.ZodRawShape> & z.ZodType<${namespace}.${inferredTypeName}>` : "";
+		const schemaCode = resolver.options.compileSchemas && !zodSchema.isCircular ? `z.compile(${zodSchema.code})` : zodSchema.code;
+		lines.push(`const ${name}${typeAnnotation} = once(() => ${callLazySchemaReferences(schemaCode, schemaNames)});`);
+		members.push(...indent(renderModelJsDocs({
+			name,
+			zodSchema,
+			tag,
+			resolver
+		}).split("\n")));
+		members.push(...renderLazyMember(name, `${name}()`));
+		if (zodSchema.isCircular && zodSchema.schemaObj) types.push(`  export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		else types.push(`  export type ${inferredTypeName} = z.infer<typeof ${namespace}.${name}>;`);
+		if (zodSchema.isEnum) {
+			lines.push(`const ${inferredTypeName} = once(() => ${name}().enum);`);
+			members.push(...renderLazyMember(inferredTypeName, `${inferredTypeName}()`));
+		}
+	}
+	lines.push("");
+	lines.push(`export const ${namespace} = {`, ...members, "};");
+	lines.push(`export declare namespace ${namespace} {`, ...types, "}");
+	return lines.join("\n") + "\n";
+}
+function renderLazyMember(name, value) {
+	return [
+		`  get ${name}() {`,
+		`    return ${value};`,
+		`  },`
+	];
+}
+function indent(lines) {
+	return lines.map((line) => `  ${line}`);
+}
 function renderSchemaType(schema, resolver) {
 	if (require_generate_utils.isReferenceObject(schema)) {
 		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
@@ -2458,6 +2585,20 @@ function renderModelsProxy({ resolver, data, tag }) {
 	})}`;
 	const inferredTypeNames = schemaNames.map((schemaName) => require_generate_utils.getZodSchemaInferedTypeName(schemaName, resolver.options));
 	const enumInferredTypeNames = schemaNames.filter((schemaName) => require_generate_utils.isEnumZodSchema(commonZodSchemas[schemaName] ?? "")).map((schemaName) => require_generate_utils.getZodSchemaInferedTypeName(schemaName, resolver.options));
+	if (resolver.options.tsNamespaces && resolver.options.lazySchemas) {
+		const lines = [];
+		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);
+		lines.push("");
+		lines.push(`export const ${modelsNamespace} = {`);
+		for (const schemaName of schemaNames) lines.push(...renderLazyMember(schemaName, `${commonNamespace}.${schemaName}`));
+		for (const enumName of enumInferredTypeNames) lines.push(...renderLazyMember(enumName, `${commonNamespace}.${enumName}`));
+		lines.push("};");
+		lines.push(`export declare namespace ${modelsNamespace} {`);
+		for (const typeName of inferredTypeNames) lines.push(`  export type ${typeName} = ${commonNamespace}.${typeName};`);
+		lines.push("}");
+		lines.push("");
+		return lines.join("\n");
+	}
 	if (resolver.options.tsNamespaces) {
 		const lines = [];
 		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);

package/dist/generator.d.mts

@@ -1,4 +1,4 @@
-import { n as GenerateFileData, t as GenerateOptions } from "./options-BV720uS2.mjs";
+import { n as GenerateFileData, t as GenerateOptions } from "./options-B7-eMFcv.mjs";
 import { OpenAPIV3 } from "openapi-types";
 //#region src/generators/types/metadata.d.ts
 interface GenerateParams {

package/dist/generator.mjs

@@ -1,6 +1,6 @@
-import { r as getQueryName, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-oe5uj0P4.mjs";
-import { a as isQuery, i as isMutation, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-BqEeVt1w.mjs";
-import { Et as isParamMediaTypeAllowed, Tt as isMediaTypeAllowed, X as invalidVariableNameCharactersToCamel, Y as DEFAULT_GENERATE_OPTIONS, _ as getSchemaTsMetaType, _t as getNamespaceName, sn as formatTag, t as getOpenApiDoc, v as getTsTypeBase, w as getTagImportPath } from "./generate.runner-BMqvEp4L.mjs";
+import { r as getQueryName, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-B7VWwIbb.mjs";
+import { a as isQuery, i as isMutation, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-C0iehdg8.mjs";
+import { Et as isParamMediaTypeAllowed, Tt as isMediaTypeAllowed, X as invalidVariableNameCharactersToCamel, Y as DEFAULT_GENERATE_OPTIONS, _ as getSchemaTsMetaType, _t as getNamespaceName, sn as formatTag, t as getOpenApiDoc, v as getTsTypeBase, w as getTagImportPath } from "./generate.runner-LDL6Lbgl.mjs";
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts
 async function getMetadataFromOpenAPIDoc(openApiDoc, options) {
 	const { resolver, data } = await getDataFromOpenAPIDoc(openApiDoc, options);

package/dist/{getDataFromOpenAPIDoc-BqEeVt1w.mjs → getDataFromOpenAPIDoc-C0iehdg8.mjs}

@@ -1,4 +1,4 @@
-import { $ as getParamZodSchemaName, At as pathParamToVariableName, Bt as ALLOWED_PATH_IN, Ct as isErrorStatus, Dt as isPathExcluded, Et as isParamMediaTypeAllowed, Ft as inferRequiredSchema, Gt as ENUM_SCHEMA, Ht as BLOB_SCHEMA, It as isArraySchemaObject, J as getUniqueArray, Jt as STRING_SCHEMA, Kt as INT_SCHEMA, Lt as isReferenceObject, Mt as replaceHyphenatedPath, Nt as unwrapQuotesIfNeeded, Ot as isPrimitiveType, Pt as wrapWithQuotesIfNeeded, Q as getEnumZodSchemaName, Rt as isSchemaObject, St as getSchemaRef, Tt as isMediaTypeAllowed, Ut as DATETIME_SCHEMA, Vt as ANY_SCHEMA, Wt as EMAIL_SCHEMA, X as invalidVariableNameCharactersToCamel, Xt as UUID_SCHEMA, Yt as URL_SCHEMA, Z as getBodyZodSchemaName, Zt as VOID_SCHEMA, _n as Profiler, _t as getNamespaceName, bt as getParameterEnumNames, cn as getEndpointTag, et as getResponseZodSchemaName, fn as capitalize, gn as snakeToCamel, hn as removeWord, in as JSON_APPLICATION_FORMAT, it as isNamedZodSchema, jt as pathToVariableName, kt as isSortingParameterObject, ln as getOperationTag, m as mapEndpointParamsToFunctionParams, mn as getMostCommonAdjacentCombinationSplit, nt as getZodSchemaOperationName, pn as decapitalize, q as iterateSchema, qt as NUMBER_SCHEMA, rn as BODY_PARAMETER_NAME, s as pick, sn as formatTag, tt as getZodSchemaName, un as isTagIncluded, vt as autocorrectRef, wt as isMainResponseStatus, xt as getSchemaNameByRef, yt as escapeControlCharacters, zt as ALLOWED_METHODS } from "./generate.runner-BMqvEp4L.mjs";
+import { $ as getParamZodSchemaName, At as pathParamToVariableName, Bt as ALLOWED_PATH_IN, Ct as isErrorStatus, Dt as isPathExcluded, Et as isParamMediaTypeAllowed, Ft as inferRequiredSchema, Gt as ENUM_SCHEMA, Ht as BLOB_SCHEMA, It as isArraySchemaObject, J as getUniqueArray, Jt as STRING_SCHEMA, Kt as INT_SCHEMA, Lt as isReferenceObject, Mt as replaceHyphenatedPath, Nt as unwrapQuotesIfNeeded, Ot as isPrimitiveType, Pt as wrapWithQuotesIfNeeded, Q as getEnumZodSchemaName, Rt as isSchemaObject, St as getSchemaRef, Tt as isMediaTypeAllowed, Ut as DATETIME_SCHEMA, Vt as ANY_SCHEMA, Wt as EMAIL_SCHEMA, X as invalidVariableNameCharactersToCamel, Xt as UUID_SCHEMA, Yt as URL_SCHEMA, Z as getBodyZodSchemaName, Zt as VOID_SCHEMA, _n as Profiler, _t as getNamespaceName, bt as getParameterEnumNames, cn as getEndpointTag, et as getResponseZodSchemaName, fn as capitalize, gn as snakeToCamel, hn as removeWord, in as JSON_APPLICATION_FORMAT, it as isNamedZodSchema, jt as pathToVariableName, kt as isSortingParameterObject, ln as getOperationTag, m as mapEndpointParamsToFunctionParams, mn as getMostCommonAdjacentCombinationSplit, nt as getZodSchemaOperationName, pn as decapitalize, q as iterateSchema, qt as NUMBER_SCHEMA, rn as BODY_PARAMETER_NAME, s as pick, sn as formatTag, tt as getZodSchemaName, un as isTagIncluded, vt as autocorrectRef, wt as isMainResponseStatus, xt as getSchemaNameByRef, yt as escapeControlCharacters, zt as ALLOWED_METHODS } from "./generate.runner-LDL6Lbgl.mjs";
 import { OpenAPIV3 } from "openapi-types";
 //#region src/generators/const/validation.const.ts
 const HTTP_STATUS_CODES = {

package/dist/index.d.mts

@@ -3,10 +3,10 @@ import { a as ErrorHandler, c as GeneralErrorCodes, i as ErrorEntry, l as Shared
 import { n as AuthGuardProps, r as AuthContext, t as AuthGuard } from "./AuthGuard-GbtTDXs0.mjs";
 import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-CbS77dei.mjs";
 import { n as useWorkspaceContext, r as OpenApiRouter, t as OpenApiWorkspaceContext } from "./workspace.context-isVY9ves.mjs";
-import { a as MutationEffectsTypes, c as RegisteredQueryModule, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-BbLtDfIH.mjs";
+import { a as MergedMutationVariables, c as OpenApiQueryConfig, i as MergedMutationValues, l as QueryModule, n as InvalidationMapFunc, o as MutationEffectsOf, r as MergedMutationData, s as MutationEffectsTypes, t as InvalidationMap, u as RegisteredQueryModule } from "./queryConfig.context-DwVQWbtL.mjs";
 import { t as RestUtils } from "./rest.utils-DpiFIdhF.mjs";
-import { t as OpenAPICodegenConfig } from "./config-BSYiW3xV.mjs";
+import { t as OpenAPICodegenConfig } from "./config-D8ANLlqk.mjs";
 import { d as TransportResponse, l as TransportRequest, n as HttpError, p as UploadProgress, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
 import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-DZxdDcpz.mjs";
-import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-CmGB4BOV.mjs";
-export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type ErrorRethrower, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequestConfig as NativeRequestConfig, type TransportResponse as NativeResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RegisteredQueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, type TranslateFunction, configureTranslations, ns, resources, useMutationEffects, useWorkspaceContext };
+import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-I4y5WUkj.mjs";
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type ErrorRethrower, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MergedMutationData, type MergedMutationValues, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequestConfig as NativeRequestConfig, type TransportResponse as NativeResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RegisteredQueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, type TranslateFunction, configureTranslations, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/metro.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generate_utils = require("./generate.utils-D4eHo3wO.cjs");
+const require_generate_utils = require("./generate.utils-BFeGvk98.cjs");
 let fs = require("fs");
 fs = require_generate_utils.__toESM(fs, 1);
 let path = require("path");
@@ -15,6 +15,7 @@ function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, in
 		workspaceContext: workspaceContext?.split(",")
 	});
 	if (resolvedConfig.modelsInCommon && resolvedConfig.modelsInModules) throw new Error("modelsInCommon and modelsInModules cannot both be enabled");
+	if (resolvedConfig.lazySchemas && !resolvedConfig.tsNamespaces) throw new Error("lazySchemas requires tsNamespaces");
 	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
 	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
 	return resolvedConfig;
@@ -102,7 +103,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-DRLE112u.cjs"));
+		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-CpAdx6I3.cjs"));
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/metro.d.mts

@@ -1,6 +1,6 @@
-import { r as GenerateFileFormatter } from "./options-BV720uS2.mjs";
-import { t as OpenAPICodegenConfig } from "./config-BSYiW3xV.mjs";
-import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DEtp4qCv.mjs";
+import { r as GenerateFileFormatter } from "./options-B7-eMFcv.mjs";
+import { t as OpenAPICodegenConfig } from "./config-D8ANLlqk.mjs";
+import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DES1kzvS.mjs";
 import { IncomingMessage, ServerResponse } from "http";
 //#region src/metro/openapi-codegen.plugin.d.ts
 type OpenApiCodegenMetroConfig = OpenAPICodegenConfig & {

package/dist/metro.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-R_Dnb1mt.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-CmW9oZdT.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-DPUNTduQ.mjs";
 import fs from "fs";
 import path from "path";

package/dist/{openapi-codegen.runner-R_Dnb1mt.mjs → openapi-codegen.runner-CmW9oZdT.mjs}

@@ -1,4 +1,4 @@
-import { _n as Profiler, n as runGenerate } from "./generate.runner-BMqvEp4L.mjs";
+import { _n as Profiler, n as runGenerate } from "./generate.runner-LDL6Lbgl.mjs";
 import path from "path";
 //#region src/plugins/openapi-codegen.runner.ts
 function createOpenApiCodegenRunner(config, options = {}) {

package/dist/{openapi-source.runner-DEtp4qCv.d.mts → openapi-source.runner-DES1kzvS.d.mts}

@@ -1,4 +1,4 @@
-import { t as OpenAPICodegenConfig } from "./config-BSYiW3xV.mjs";
+import { t as OpenAPICodegenConfig } from "./config-D8ANLlqk.mjs";
 //#region src/tiny/openapi.d.ts
 interface GenerateOpenApiFileOptions {
   argv?: readonly string[];

package/dist/{options-BV720uS2.d.mts → options-B7-eMFcv.d.mts}

@@ -16,6 +16,8 @@ type GenerateFileFormatter = (file: GenerateFileData) => string | Promise<string
 interface ZodGenerateOptions {
   /** Eagerly compile non-recursive schemas. Defaults to false to avoid startup work. */
   compileSchemas?: boolean;
+  /** Build namespace model schemas on first access instead of at import. Requires tsNamespaces. */
+  lazySchemas?: boolean;
   schemaSuffix: string;
   enumSuffix: string;
   modelsInCommon?: boolean;

package/dist/query.d.mts

@@ -1,3 +1,3 @@
-import { a as MutationEffectsTypes, c as RegisteredQueryModule, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-BbLtDfIH.mjs";
-import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-CmGB4BOV.mjs";
-export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, OpenApiQueryConfig, type QueryModule, type RegisteredQueryModule, useMutationEffects };
+import { a as MergedMutationVariables, c as OpenApiQueryConfig, i as MergedMutationValues, l as QueryModule, n as InvalidationMapFunc, o as MutationEffectsOf, r as MergedMutationData, s as MutationEffectsTypes, t as InvalidationMap, u as RegisteredQueryModule } from "./queryConfig.context-DwVQWbtL.mjs";
+import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-I4y5WUkj.mjs";
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, type InvalidationMap, type InvalidationMapFunc, type MergedMutationData, type MergedMutationValues, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, OpenApiQueryConfig, type QueryModule, type RegisteredQueryModule, useMutationEffects };

package/dist/{queryConfig.context-BbLtDfIH.d.mts → queryConfig.context-DwVQWbtL.d.mts}

@@ -22,13 +22,18 @@ type IsUnion<T, TAll = T> = T extends unknown ? ([TAll] extends [T] ? false : tr
 type MergeableMembers<T> = T extends readonly unknown[] | ((...args: never) => unknown) | Date ? never : ObjectMembers<T>;
 type MergedValue<T> = true extends IsUnion<MergeableMembers<T>> ? MergedObjects<MergeableMembers<T>> | Exclude<T, MergeableMembers<T>> : T;
 type MergedObjects<T> = { [K in Extract<keyof T, PropertyKey>]: MergedValue<ValueOfUnion<T, K>>; } & { [K in Exclude<KeysOfUnion<T>, keyof T>]?: MergedValue<ValueOfUnion<T, K>>; };
+type VoidAsUndefined<T> = [void] extends [T] ? Exclude<T, void> | undefined : T;
 /**
- * The variables of a module's mutations as one object: keys some mutations lack become optional, at any
- * depth (e.g. fields of request bodies only some mutations send). Mutations without variables (`void`)
- * stay in the union, as their callbacks receive `undefined`.
+ * A union of a module's mutation values as one object: keys some mutations lack become optional, at any
+ * depth (e.g. fields of request bodies only some mutations send). `void` becomes `undefined`, which is
+ * what callbacks receive for mutations without one.
  */
-type MergedMutationVariables<T> = [ObjectMembers<T>] extends [never] ? T : MergedObjects<ObjectMembers<T>> | Exclude<T, object>;
-type InvalidationMapFuncFor<T> = InvalidationMapFunc<T extends MutationEffectsTypes ? T["data"] : never, MergedMutationVariables<T extends MutationEffectsTypes ? T["variables"] : never>>;
+type MergedMutationValues<T> = [ObjectMembers<T>] extends [never] ? VoidAsUndefined<T> : MergedObjects<ObjectMembers<T>> | VoidAsUndefined<Exclude<T, object>>;
+/** The variables of a module's mutations as one object; see `MergedMutationValues`. */
+type MergedMutationVariables<T> = MergedMutationValues<T>;
+/** The responses of a module's mutations as one object; see `MergedMutationValues`. */
+type MergedMutationData<T> = MergedMutationValues<T>;
+type InvalidationMapFuncFor<T> = InvalidationMapFunc<MergedMutationData<T extends MutationEffectsTypes ? T["data"] : never>, MergedMutationVariables<T extends MutationEffectsTypes ? T["variables"] : never>>;
 declare global {
   /**
    * Mutation types per module. The generated `queryModules.ts` extends it with `QueryModuleMutations`, so
@@ -63,4 +68,4 @@ declare namespace OpenApiQueryConfig {
   export {};
 }
 //#endregion
-export { MutationEffectsTypes as a, RegisteredQueryModule as c, MutationEffectsOf as i, InvalidationMapFunc as n, OpenApiQueryConfig as o, MergedMutationVariables as r, QueryModule as s, InvalidationMap as t };
+export { MergedMutationVariables as a, OpenApiQueryConfig as c, MergedMutationValues as i, QueryModule as l, InvalidationMapFunc as n, MutationEffectsOf as o, MergedMutationData as r, MutationEffectsTypes as s, InvalidationMap as t, RegisteredQueryModule as u };

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
-import { c as VALIDATION_ERROR_TYPE_TITLE, o as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-BqEeVt1w.mjs";
-import { C as getTagFileName, _n as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-BMqvEp4L.mjs";
+import { c as VALIDATION_ERROR_TYPE_TITLE, o as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-C0iehdg8.mjs";
+import { C as getTagFileName, _n as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-LDL6Lbgl.mjs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { styleText } from "node:util";
@@ -31,7 +31,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "4.0.0-rc.4";
+	return "4.0.0-rc.5";
 }
 //#endregion
 //#region src/helpers/yargs.helper.ts
@@ -268,6 +268,7 @@ var GenerateOptions = class {
 	excludeRedundantZodSchemas;
 	importPath;
 	compileSchemas;
+	lazySchemas;
 	extractEnums;
 	modelsInCommon;
 	modelsInModules;
@@ -330,6 +331,10 @@ __decorate([YargOption({
 	envAlias: "compileSchemas",
 	type: "boolean"
 }), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "compileSchemas", void 0);
+__decorate([YargOption({
+	envAlias: "lazySchemas",
+	type: "boolean"
+}), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "lazySchemas", void 0);
 __decorate([YargOption({
 	envAlias: "extractEnums",
 	type: "boolean"

package/dist/tiny.d.mts

@@ -1,2 +1,2 @@
-import { $ as getModuleOpenApiTag, A as collectApiModelSchemaExports, At as toOpenAPI30Document, B as collectReachableModelSchemas, C as applyEnumExtensions, Ct as procedureSchemaName, D as applyRobodevModuleExtensions, Dt as schemaExportName, E as applyParameterExtensions, Et as schemaComponentRef, F as collectExtraSchemas, G as findComponentEnumNames, H as compactTagName, I as collectModelSchemaExports, J as generateOpenApiFile, K as findEnumNames, L as collectModuleModelSchemaExports, M as collectContractSchemas, Mt as toOpenAPIAclRule, N as collectDbTableModelSchemaExport, Nt as toPascalCase, O as applyRobodevUserRolesExtension, Ot as sharedSchemaExportName, P as collectDbTableModelSchemaExports, Pt as visitZodSchema, Q as getModuleOpenApiController, R as collectOperationMeta, S as addContractSchema, St as operationKey, T as applyPaginatedItemSchemas, Tt as routeHasPathParameters, U as createModelSchemaNameGetter, V as collectSchemaRegistryRoots, W as defineOpenApiSchemas, X as getContractProcedureData, Y as getComponentSchemas, Z as getDerivedOperationId, _ as OpenApiSchemaRegistry, _t as namedControllerActionSchema, a as isTinyOpenApiFakeMode, at as getProcedureInputSchemaRole, b as TinyOpenApiUserRole, bt as namedOpenApiResponseSchema, c as AnyContractRouter, ct as isContractProcedure, d as GenerateOpenApiFile, dt as isObject, et as getObjectPropertySchema, f as GenerateOpenApiFileOptions, ft as isProcedureMeta, g as JsonObject, gt as namedControllerActionInputDtoSchema, h as GenerateTinyOpenApiFileOptions, ht as modelSchemaNameEntries, i as getLocalInputPath, it as getPaginatedItemSchema, j as collectContractSchemaRoots, jt as toOpenAPI30Schema, k as asStringArray, kt as stripNoContentResponseBodies, l as AnySchema, lt as isNullSchema, m as GenerateOpenApiSpec, mt as modelSchemaExportName, nt as getOperationAction, o as normalizeWatchFolders, ot as getRobodevModuleRoles, p as GenerateOpenApiFileResult, pt as isZodSchema, q as generateORPCOpenAPISpec, r as createTinyOpenApiSourceRunner, rt as getOperationController, s as AclRule, st as getStringEnumValues, t as TinyOpenApiSourceRunnerConfig, tt as getOpenApiSchemaName, u as GenerateORPCOpenAPISpecOptions, ut as isNullableOnlySchema, v as ProcedureMeta, vt as namedOpenApiOutputSchema, w as applyOperationMeta, wt as resolveOpenApiOutputPath, x as ZodSchema, xt as namedOpenApiSchema, y as TinyOpenApiModule, yt as namedOpenApiRequestSchema, z as collectOperationTags } from "./openapi-source.runner-DEtp4qCv.mjs";
+import { $ as getModuleOpenApiTag, A as collectApiModelSchemaExports, At as toOpenAPI30Document, B as collectReachableModelSchemas, C as applyEnumExtensions, Ct as procedureSchemaName, D as applyRobodevModuleExtensions, Dt as schemaExportName, E as applyParameterExtensions, Et as schemaComponentRef, F as collectExtraSchemas, G as findComponentEnumNames, H as compactTagName, I as collectModelSchemaExports, J as generateOpenApiFile, K as findEnumNames, L as collectModuleModelSchemaExports, M as collectContractSchemas, Mt as toOpenAPIAclRule, N as collectDbTableModelSchemaExport, Nt as toPascalCase, O as applyRobodevUserRolesExtension, Ot as sharedSchemaExportName, P as collectDbTableModelSchemaExports, Pt as visitZodSchema, Q as getModuleOpenApiController, R as collectOperationMeta, S as addContractSchema, St as operationKey, T as applyPaginatedItemSchemas, Tt as routeHasPathParameters, U as createModelSchemaNameGetter, V as collectSchemaRegistryRoots, W as defineOpenApiSchemas, X as getContractProcedureData, Y as getComponentSchemas, Z as getDerivedOperationId, _ as OpenApiSchemaRegistry, _t as namedControllerActionSchema, a as isTinyOpenApiFakeMode, at as getProcedureInputSchemaRole, b as TinyOpenApiUserRole, bt as namedOpenApiResponseSchema, c as AnyContractRouter, ct as isContractProcedure, d as GenerateOpenApiFile, dt as isObject, et as getObjectPropertySchema, f as GenerateOpenApiFileOptions, ft as isProcedureMeta, g as JsonObject, gt as namedControllerActionInputDtoSchema, h as GenerateTinyOpenApiFileOptions, ht as modelSchemaNameEntries, i as getLocalInputPath, it as getPaginatedItemSchema, j as collectContractSchemaRoots, jt as toOpenAPI30Schema, k as asStringArray, kt as stripNoContentResponseBodies, l as AnySchema, lt as isNullSchema, m as GenerateOpenApiSpec, mt as modelSchemaExportName, nt as getOperationAction, o as normalizeWatchFolders, ot as getRobodevModuleRoles, p as GenerateOpenApiFileResult, pt as isZodSchema, q as generateORPCOpenAPISpec, r as createTinyOpenApiSourceRunner, rt as getOperationController, s as AclRule, st as getStringEnumValues, t as TinyOpenApiSourceRunnerConfig, tt as getOpenApiSchemaName, u as GenerateORPCOpenAPISpecOptions, ut as isNullableOnlySchema, v as ProcedureMeta, vt as namedOpenApiOutputSchema, w as applyOperationMeta, wt as resolveOpenApiOutputPath, x as ZodSchema, xt as namedOpenApiSchema, y as TinyOpenApiModule, yt as namedOpenApiRequestSchema, z as collectOperationTags } from "./openapi-source.runner-DES1kzvS.mjs";
 export { AclRule, AnyContractRouter, AnySchema, GenerateORPCOpenAPISpecOptions, GenerateOpenApiFile, GenerateOpenApiFileOptions, GenerateOpenApiFileResult, GenerateOpenApiSpec, 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/{useMutationEffects-CmGB4BOV.d.mts → useMutationEffects-I4y5WUkj.d.mts}

@@ -1,5 +1,5 @@
 import { c as GeneralErrorCodes, t as ApplicationException } from "./error-handling-BpAQHWrU.mjs";
-import { s as QueryModule, t as InvalidationMap } from "./queryConfig.context-BbLtDfIH.mjs";
+import { l as QueryModule, t as InvalidationMap } from "./queryConfig.context-DwVQWbtL.mjs";
 import { InfiniteData, QueryKey, UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
 //#region src/lib/react-query.types.d.ts
 type Function = (...args: never) => unknown;

package/dist/vite.d.mts

@@ -1,6 +1,6 @@
-import { r as GenerateFileFormatter } from "./options-BV720uS2.mjs";
-import { t as OpenAPICodegenConfig } from "./config-BSYiW3xV.mjs";
-import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DEtp4qCv.mjs";
+import { r as GenerateFileFormatter } from "./options-B7-eMFcv.mjs";
+import { t as OpenAPICodegenConfig } from "./config-D8ANLlqk.mjs";
+import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DES1kzvS.mjs";
 import { Plugin, PluginOption } from "vite";
 //#region src/plugins/openapi-codegen.runner.d.ts
 type OpenApiCodegenPluginConfig = OpenAPICodegenConfig & {

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-R_Dnb1mt.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-CmW9oZdT.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-DPUNTduQ.mjs";
 import path from "path";
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -128,7 +128,7 @@
     "@casl/ability": "6.8.0",
     "@casl/react": "5.0.1",
     "@tanstack/react-query": "~5.90.21",
-    "@types/bun": "1.4.3",
+    "@types/bun": "1.4.4",
     "@types/node": "^25.3.0",
     "@types/prompt-sync": "^4.2.3",
     "@types/react": "^19.2.14",
@@ -183,9 +183,9 @@
     }
   },
   "engines": {
-    "bun": ">= 1.4.3",
+    "bun": ">= 1.4.4",
     "node": ">= 18"
   },
-  "packageManager": "bun@1.4.3",
-  "version": "4.0.0-rc.4"
+  "packageManager": "bun@1.4.4",
+  "version": "4.0.0-rc.5"
 }