@povio/openapi-codegen-cli 3.2.0-rc.9 → 3.2.0

package/dist/{native-bindings-BTQGSGhU.mjs → generate.runner-BD9BbYIx.mjs}

@@ -1260,9 +1260,9 @@ function renderMediaUploadMutationBody({ resolver, endpointFunction, resolvedEnd
 		"  let dataToSend: File | FormData = file;",
 		"  if (method === \"post\") {",
 		"    dataToSend = new FormData();",
-		"    if (uploadInstructions.fields) {",
-		"      for (const [key, value] of uploadInstructions.fields) {",
-		"        dataToSend.append(key, value);",
+		"    if (\"fields\" in uploadInstructions && uploadInstructions.fields) {",
+		"      for (const [key, value] of Object.entries(uploadInstructions.fields)) {",
+		"        dataToSend.append(key, String(value));",
 		"      }",
 		"    }",
 		"    dataToSend.append(\"file\", file);",
@@ -1437,6 +1437,20 @@ function removeEmptyDirectories(root) {
 	removeIfEmpty(root);
 }
 //#endregion
+//#region src/generators/core/resolveConfig.ts
+function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, inlineEndpointsExcludeModules, workspaceContext, ...options } }) {
+	const resolvedConfig = deepMerge(DEFAULT_GENERATE_OPTIONS, fileConfig ?? {}, {
+		...options,
+		includeTags: includeTags?.split(","),
+		excludeTags: excludeTags?.split(","),
+		inlineEndpointsExcludeModules: inlineEndpointsExcludeModules?.split(","),
+		workspaceContext: workspaceContext?.split(",")
+	});
+	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
+	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
+	return resolvedConfig;
+}
+//#endregion
 //#region src/native/native-bindings.ts
 let bindings;
 let nativePath;
@@ -1477,4 +1491,170 @@ function compileNativeData(source, yaml, optionsJson) {
 	return getNativeBindings().compileData(source, yaml, optionsJson);
 }
 //#endregion
-export { getImportedAbilityFunctionName as $, isPrimitiveType as $t, getEndpointsImports as A, NATIVE_RESPONSE_TYPE as An, APP_REST_CLIENT_NAME as At, getPrefetchInfiniteQueryName as B, getMostCommonAdjacentCombinationSplit as Bn, PACKAGE_IMPORT_PATH as Bt, getAppRestClientImportPath as C, ZOD_IMPORT as Cn, getParamZodSchemaName as Ct, getTagFileName as D, AXIOS_REQUEST_CONFIG_TYPE as Dn, isEnumZodSchema as Dt, getQueryTypesImportPath as E, AXIOS_REQUEST_CONFIG_NAME as En, getZodSchemaOperationName as Et, mergeImports as F, isTagIncluded as Fn, QUERY_MODULE_ENUM as Ft, getAbilityConditionType as G, getParameterEnumNames as Gt, getQueryName as H, removeWord as Hn, getNamespaceName as Ht, getImportedInfiniteQueryName as I, shouldInlineEndpointsForTag as In, QUERY_OPTIONS_TYPES as It, getAbilityFunctionName as J, isErrorStatus as Jt, getAbilityConditionsTypes as K, getSchemaNameByRef as Kt, getImportedQueryName as L, camelToSpaceSeparated as Ln, ZOD_EXTENDED as Lt, getInfiniteQueriesImports as M, formatTag as Mn, DOMAIN_ERRORS_FILE as Mt, getModelsImports as N, getEndpointTag as Nn, MUTATION_EFFECTS as Nt, getTagImportPath as O, BODY_PARAMETER_NAME as On, isNamedZodSchema as Ot, getQueriesImports as P, getOperationTag as Pn, QUERY_MODULES_FILE as Pt, getAppAbilitiesType as Q, isPathExcluded as Qt, getInfiniteQueryName as R, capitalize as Rn, CONFIG_PACKAGE_IMPORT_PATH as Rt, getTsTypeBase as S, VOID_SCHEMA as Sn, getEnumZodSchemaName as St, getQueryModulesImportPath as T, AXIOS_IMPORT as Tn, getZodSchemaName as Tt, getQueryOptionsName as U, snakeToCamel as Un, autocorrectRef as Ut, getPrefetchQueryName as V, kebabToCamel as Vn, REST_PACKAGE_IMPORT_PATH as Vt, getAbilityAction as W, Profiler as Wn, escapeControlCharacters as Wt, getAbilitySubjectTypes as X, isMediaTypeAllowed as Xt, getAbilitySubject as Y, isMainResponseStatus as Yt, getAclData as Z, isParamMediaTypeAllowed as Zt, hasEndpointConfig as _, INT_SCHEMA as _n, isReadAllEndpoint as _t, writeGenerateFileData as a, wrapWithQuotesIfNeeded as an, getZodSchemaInferedTypeName as at, requiresBody as b, URL_SCHEMA as bn, invalidVariableNameCharactersToCamel as bt, getDestructuredVariables as c, isReferenceObject as cn, getSchemaDescriptions as ct, isQuery as d, ALLOWED_PATH_IN as dn, DEFAULT_GENERATE_OPTIONS as dt, isSortingParameterObject as en, hasAbilityConditions as et, getEndpointBody as f, ANY_SCHEMA as fn, getPathSegments as ft, getImportedEndpointName as g, ENUM_SCHEMA as gn, isPathSegmentParam as gt, getEndpointPath as h, EMAIL_SCHEMA as hn, isDeleteEndpoint as ht, removeStaleGeneratedFiles as i, unwrapQuotesIfNeeded as in, getZodSchemaDescription as it, getImportPath as j, getRequestConfigTypeName as jn, BUILDERS_UTILS as jt, getAclImports as k, JSON_APPLICATION_FORMAT as kn, APP_REST_CLIENT_FILE as kt, isInfiniteQuery as l, isSchemaObject as ln, iterateSchema as lt, getEndpointName as m, DATETIME_SCHEMA as mn, isCreateEndpoint as mt, shouldUseNativeCodegen as n, pathToVariableName as nn, getImportedZodSchemaInferedTypeName as nt, deepMerge as o, inferRequiredSchema as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, BLOB_SCHEMA as pn, isBulkDeleteEndpoint as pt, getAbilityDescription as q, getSchemaRef as qt, getOutputFileName as r, replaceHyphenatedPath as rn, getImportedZodSchemaName as rt, pick as s, isArraySchemaObject as sn, getZodSchemaType as st, compileNativeData as t, pathParamToVariableName as tn, renderAclCheckCall as tt, isMutation as u, ALLOWED_METHODS as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, NUMBER_SCHEMA as vn, isReadEndpoint as vt, getFileNameWithExtension as w, AXIOS_DEFAULT_IMPORT_NAME as wn, getResponseZodSchemaName as wt, getSchemaTsMetaType as x, UUID_SCHEMA as xn, getBodyZodSchemaName as xt, renderMediaUploadMutationBody as y, STRING_SCHEMA as yn, isUpdateEndpoint as yt, getInfiniteQueryOptionsName as z, decapitalize as zn, NATIVE_PACKAGE_IMPORT_PATH as zt };
+//#region src/native/generateFilesFromNativeOpenAPI.ts
+function generateFilesFromNativeOpenAPI(source, yaml, options) {
+	if (!supportsCompleteNativeRender(options)) {
+		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
+		return;
+	}
+	const nativeData = compileNativeData(source, yaml, JSON.stringify({
+		...options,
+		nativeCompact: true
+	})).data;
+	if (!nativeData.renderedComplete) {
+		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
+		return;
+	}
+	const files = [];
+	const taggedRenderers = options.modelsOnly ? [["models", nativeData.renderedModels]] : [
+		["models", nativeData.renderedModels],
+		["endpoints", nativeData.renderedEndpoints],
+		["queries", nativeData.renderedQueries],
+		...options.acl ? [["acl", nativeData.renderedAcl]] : []
+	];
+	for (const tag of nativeData.renderedTags) for (const [type, rendered] of taggedRenderers) {
+		const content = rendered[tag];
+		if (content) files.push(taggedFile(options, tag, type, content));
+	}
+	if (!options.modelsOnly) {
+		if (options.acl && nativeData.renderedShared.appAcl) files.push(outputFile(options, "acl/app.ability.ts", nativeData.renderedShared.appAcl));
+		if (options.mutationEffects && nativeData.renderedShared.queryModules) files.push(outputFile(options, "queryModules.ts", nativeData.renderedShared.queryModules));
+		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : ""}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
+		if (nativeData.renderedShared.domainErrors) files.push(outputFile(options, "domain-errors.ts", nativeData.renderedShared.domainErrors));
+	}
+	return files;
+}
+function supportsCompleteNativeRender(options) {
+	return options.splitByTags && (options.modelsInCommon && options.tsNamespaces || !options.modelsInCommon && !options.tsNamespaces) && !options.inlineEndpoints && !options.builderConfigs && (options.workspaceContext?.length ?? 0) === 0;
+}
+function taggedFile(options, tag, type, content) {
+	return outputFile(options, getTagFileName({
+		tag,
+		type,
+		options
+	}), content);
+}
+function outputFile(options, fileName, content) {
+	return {
+		fileName: getOutputFileName({
+			output: options.output,
+			fileName
+		}),
+		content
+	};
+}
+//#endregion
+//#region src/generators/run/generate.runner.ts
+async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler = new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1") }) {
+	const config = profiler.runSync("config.resolve", () => resolveConfig({
+		fileConfig,
+		params: params ?? {}
+	}));
+	const useNative = shouldUseNativeCodegen();
+	const isJson = path.extname(new URL(config.input, "file://").pathname).toLowerCase() === ".json";
+	const useRawNativeInput = useNative && (isJson || typeof Bun === "undefined");
+	let nativeInput = useRawNativeInput ? await getRawOpenApiSource(config.input, profiler) : await getOpenApiSource(config.input, profiler);
+	if (useNative && !useRawNativeInput) {
+		const document = "document" in nativeInput ? nativeInput.document : void 0;
+		nativeInput = {
+			...nativeInput,
+			source: profiler.runSync("openapi.serialize", () => JSON.stringify(document)),
+			yaml: false
+		};
+	}
+	const openApiDoc = "document" in nativeInput ? nativeInput.document : {};
+	const outputExists = fs.existsSync(config.output);
+	const filesData = await profiler.runAsync("generate.total", async () => {
+		if (useNative) {
+			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
+			if (nativeFiles) return nativeFiles;
+		}
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-idp1RVDa.mjs").then((n) => n.n);
+		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
+			source: nativeInput.source,
+			yaml: nativeInput.yaml
+		});
+	});
+	if (config.clearOutput) profiler.runSync("files.removeStaleGenerated", () => {
+		removeStaleGeneratedFiles({
+			output: config.output,
+			filesData,
+			options: config
+		});
+	});
+	await profiler.runAsync("files.write", async () => {
+		await writeGenerateFileData(filesData, {
+			formatGeneratedFile,
+			skipExistingCheck: !outputExists
+		});
+	});
+	return {
+		skipped: false,
+		config,
+		stats: getGenerateStats(filesData, config)
+	};
+}
+async function getOpenApiDoc(input, profiler = new Profiler(false)) {
+	return (await getOpenApiSource(input, profiler)).document;
+}
+async function getOpenApiSource(input, profiler = new Profiler(false)) {
+	const raw = await getRawOpenApiSource(input, profiler);
+	const { source } = raw;
+	const document = await profiler.runAsync("openapi.parse", () => parseOpenApiSource(input, source));
+	return {
+		...raw,
+		document
+	};
+}
+async function getRawOpenApiSource(input, profiler = new Profiler(false)) {
+	return {
+		source: await profiler.runAsync("openapi.read", () => readOpenApiSource(input)),
+		yaml: path.extname(new URL(input, "file://").pathname).toLowerCase() !== ".json"
+	};
+}
+async function readOpenApiSource(input) {
+	if (/^https?:\/\//i.test(input)) {
+		const response = await fetch(input);
+		if (!response.ok) throw new Error(`Unable to load OpenAPI document: ${response.status} ${response.statusText}`);
+		return response.text();
+	}
+	return fs.promises.readFile(input, "utf-8");
+}
+async function parseOpenApiSource(input, source) {
+	try {
+		return JSON.parse(source.charCodeAt(0) === 65279 ? source.slice(1) : source);
+	} catch (error) {
+		if (path.extname(new URL(input, "file://").pathname).toLowerCase() === ".json") throw error;
+		if (typeof Bun !== "undefined") return Bun.YAML.parse(source);
+		const { parse } = await import("yaml");
+		return parse(source);
+	}
+}
+function getGenerateStats(filesData, config) {
+	const generatedFilesCount = filesData.length;
+	if (generatedFilesCount === 0) return {
+		generatedFilesCount,
+		generatedModulesCount: 0
+	};
+	if (!config.splitByTags) return {
+		generatedFilesCount,
+		generatedModulesCount: 1
+	};
+	const moduleSuffixes = new Set(Object.values(config.configs).map((generateConfig) => generateConfig.outputFileNameSuffix).filter(Boolean));
+	const modules = /* @__PURE__ */ new Set();
+	for (const file of filesData) {
+		const segments = path.relative(config.output, file.fileName).split(path.sep).filter(Boolean);
+		if (segments.length < 2) continue;
+		const moduleName = segments[0];
+		const fileName = segments[segments.length - 1];
+		if (!fileName.startsWith(`${moduleName}.`)) continue;
+		const suffix = fileName.slice(moduleName.length + 1).replace(/\.tsx?$/, "");
+		if (moduleSuffixes.has(suffix)) modules.add(moduleName);
+	}
+	return {
+		generatedFilesCount,
+		generatedModulesCount: modules.size
+	};
+}
+//#endregion
+export { getImportedAbilityFunctionName as $, isPrimitiveType as $t, getEndpointsImports as A, NATIVE_RESPONSE_TYPE as An, APP_REST_CLIENT_NAME as At, getPrefetchInfiniteQueryName as B, getMostCommonAdjacentCombinationSplit as Bn, PACKAGE_IMPORT_PATH as Bt, getAppRestClientImportPath as C, ZOD_IMPORT as Cn, getParamZodSchemaName as Ct, getTagFileName as D, AXIOS_REQUEST_CONFIG_TYPE as Dn, isEnumZodSchema as Dt, getQueryTypesImportPath as E, AXIOS_REQUEST_CONFIG_NAME as En, getZodSchemaOperationName as Et, mergeImports as F, isTagIncluded as Fn, QUERY_MODULE_ENUM as Ft, getAbilityConditionType as G, getParameterEnumNames as Gt, getQueryName as H, removeWord as Hn, getNamespaceName as Ht, getImportedInfiniteQueryName as I, shouldInlineEndpointsForTag as In, QUERY_OPTIONS_TYPES as It, getAbilityFunctionName as J, isErrorStatus as Jt, getAbilityConditionsTypes as K, getSchemaNameByRef as Kt, getImportedQueryName as L, camelToSpaceSeparated as Ln, ZOD_EXTENDED as Lt, getInfiniteQueriesImports as M, formatTag as Mn, DOMAIN_ERRORS_FILE as Mt, getModelsImports as N, getEndpointTag as Nn, MUTATION_EFFECTS as Nt, getTagImportPath as O, BODY_PARAMETER_NAME as On, isNamedZodSchema as Ot, getQueriesImports as P, getOperationTag as Pn, QUERY_MODULES_FILE as Pt, getAppAbilitiesType as Q, isPathExcluded as Qt, getInfiniteQueryName as R, capitalize as Rn, CONFIG_PACKAGE_IMPORT_PATH as Rt, getTsTypeBase as S, VOID_SCHEMA as Sn, getEnumZodSchemaName as St, getQueryModulesImportPath as T, AXIOS_IMPORT as Tn, getZodSchemaName as Tt, getQueryOptionsName as U, snakeToCamel as Un, autocorrectRef as Ut, getPrefetchQueryName as V, kebabToCamel as Vn, REST_PACKAGE_IMPORT_PATH as Vt, getAbilityAction as W, Profiler as Wn, escapeControlCharacters as Wt, getAbilitySubjectTypes as X, isMediaTypeAllowed as Xt, getAbilitySubject as Y, isMainResponseStatus as Yt, getAclData as Z, isParamMediaTypeAllowed as Zt, hasEndpointConfig as _, INT_SCHEMA as _n, isReadAllEndpoint as _t, resolveConfig as a, wrapWithQuotesIfNeeded as an, getZodSchemaInferedTypeName as at, requiresBody as b, URL_SCHEMA as bn, invalidVariableNameCharactersToCamel as bt, getDestructuredVariables as c, isReferenceObject as cn, getSchemaDescriptions as ct, isQuery as d, ALLOWED_PATH_IN as dn, DEFAULT_GENERATE_OPTIONS as dt, isSortingParameterObject as en, hasAbilityConditions as et, getEndpointBody as f, ANY_SCHEMA as fn, getPathSegments as ft, getImportedEndpointName as g, ENUM_SCHEMA as gn, isPathSegmentParam as gt, getEndpointPath as h, EMAIL_SCHEMA as hn, isDeleteEndpoint as ht, shouldUseNativeCodegen as i, unwrapQuotesIfNeeded as in, getZodSchemaDescription as it, getImportPath as j, getRequestConfigTypeName as jn, BUILDERS_UTILS as jt, getAclImports as k, JSON_APPLICATION_FORMAT as kn, APP_REST_CLIENT_FILE as kt, isInfiniteQuery as l, isSchemaObject as ln, iterateSchema as lt, getEndpointName as m, DATETIME_SCHEMA as mn, isCreateEndpoint as mt, runGenerate as n, pathToVariableName as nn, getImportedZodSchemaInferedTypeName as nt, getOutputFileName as o, inferRequiredSchema as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, BLOB_SCHEMA as pn, isBulkDeleteEndpoint as pt, getAbilityDescription as q, getSchemaRef as qt, compileNativeData as r, replaceHyphenatedPath as rn, getImportedZodSchemaName as rt, pick as s, isArraySchemaObject as sn, getZodSchemaType as st, getOpenApiDoc as t, pathParamToVariableName as tn, renderAclCheckCall as tt, isMutation as u, ALLOWED_METHODS as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, NUMBER_SCHEMA as vn, isReadEndpoint as vt, getFileNameWithExtension as w, AXIOS_DEFAULT_IMPORT_NAME as wn, getResponseZodSchemaName as wt, getSchemaTsMetaType as x, UUID_SCHEMA as xn, getBodyZodSchemaName as xt, renderMediaUploadMutationBody as y, STRING_SCHEMA as yn, isUpdateEndpoint as yt, getInfiniteQueryOptionsName as z, decapitalize as zn, NATIVE_PACKAGE_IMPORT_PATH as zt };

package/dist/{generate.utils-CT-LA-gX.cjs → generate.utils-BqlgVd-i.cjs}

@@ -364,13 +364,13 @@ function shouldUseNativeCodegen() {
 }
 function getNativeBindings() {
 	if (!bindings) {
-		const require = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+		const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 		const resolvedNativePath = getNativePath();
 		if (typeof process.dlopen === "function") {
 			const nativeModule = { exports: {} };
 			process.dlopen(nativeModule, resolvedNativePath);
 			bindings = nativeModule.exports;
-		} else bindings = require(resolvedNativePath);
+		} else bindings = require$1(resolvedNativePath);
 	}
 	return bindings;
 }
@@ -1145,9 +1145,9 @@ function renderMediaUploadMutationBody({ resolver, endpointFunction, resolvedEnd
 		"  let dataToSend: File | FormData = file;",
 		"  if (method === \"post\") {",
 		"    dataToSend = new FormData();",
-		"    if (uploadInstructions.fields) {",
-		"      for (const [key, value] of uploadInstructions.fields) {",
-		"        dataToSend.append(key, value);",
+		"    if (\"fields\" in uploadInstructions && uploadInstructions.fields) {",
+		"      for (const [key, value] of Object.entries(uploadInstructions.fields)) {",
+		"        dataToSend.append(key, String(value));",
 		"      }",
 		"    }",
 		"    dataToSend.append(\"file\", file);",

package/dist/{generateCodeFromOpenAPIDoc-iEa8YAUQ.cjs → generateCodeFromOpenAPIDoc-CkVgg5Zy.cjs}

@@ -1,4 +1,4 @@
-const require_generate_utils = require("./generate.utils-CT-LA-gX.cjs");
+const require_generate_utils = require("./generate.utils-BqlgVd-i.cjs");
 //#region src/generators/const/acl.const.ts
 const ACL_APP_ABILITY_FILE = {
 	fileName: "acl/app.ability",
@@ -81,12 +81,14 @@ function formatPatternIfNeeded(pattern) {
 function getZodChainableNumberValidations(schema) {
 	const validations = [];
 	if (schema.enum) return "";
-	if (schema.minimum !== void 0) if (schema.exclusiveMinimum === true) validations.push(`gt(${schema.minimum})`);
-	else validations.push(`gte(${schema.minimum})`);
-	else if (typeof schema.exclusiveMinimum === "number") validations.push(`gt(${schema.exclusiveMinimum})`);
-	if (schema.maximum !== void 0) if (schema.exclusiveMaximum === true) validations.push(`lt(${schema.maximum})`);
-	else validations.push(`lte(${schema.maximum})`);
-	else if (typeof schema.exclusiveMaximum === "number") validations.push(`lt(${schema.exclusiveMaximum})`);
+	if (schema.minimum !== void 0) {
+		if (schema.exclusiveMinimum === true) validations.push(`gt(${schema.minimum})`);
+		else validations.push(`gte(${schema.minimum})`);
+	} else if (typeof schema.exclusiveMinimum === "number") validations.push(`gt(${schema.exclusiveMinimum})`);
+	if (schema.maximum !== void 0) {
+		if (schema.exclusiveMaximum === true) validations.push(`lt(${schema.maximum})`);
+		else validations.push(`lte(${schema.maximum})`);
+	} else if (typeof schema.exclusiveMaximum === "number") validations.push(`lt(${schema.exclusiveMaximum})`);
 	if (schema.multipleOf) validations.push(`multipleOf(${schema.multipleOf})`);
 	return validations.join(".");
 }
@@ -161,8 +163,10 @@ function getOpenAPISchemaComplexity(current, schema) {
 			const props = Object.values(schema.properties);
 			current += complexityByComposite("object") + sum(props.map((prop) => getOpenAPISchemaComplexity(0, prop)));
 		} else current += complexityByComposite("empty-object");
-		if (schema.additionalProperties) if (typeof schema.additionalProperties === "object") current += getOpenAPISchemaComplexity(0, schema.additionalProperties);
-		else current += getOpenAPISchemaComplexity(1);
+		if (schema.additionalProperties) {
+			if (typeof schema.additionalProperties === "object") current += getOpenAPISchemaComplexity(0, schema.additionalProperties);
+			else current += getOpenAPISchemaComplexity(1);
+		}
 	}
 	return current;
 }
@@ -346,7 +350,7 @@ function getZodSchema({ schema, resolver, meta: inheritedMeta, tag }) {
 				propZodSchema,
 				isCircular
 			];
-		}).map(([prop, propSchema, isCircular]) => isCircular ? `get ${require_generate_utils.wrapWithQuotesIfNeeded(prop)}() { return ${propSchema} }` : `${require_generate_utils.wrapWithQuotesIfNeeded(prop)}: ${propSchema}`).join(", ")} }`;
+		}).map(([prop, propSchema, isCircular]) => isCircular ? `${require_generate_utils.wrapWithQuotesIfNeeded(prop)}: z.lazy(() => ${propSchema})` : `${require_generate_utils.wrapWithQuotesIfNeeded(prop)}: ${propSchema}`).join(", ")} }`;
 		let additionalPropsSchema = "";
 		if (schema.additionalProperties) additionalPropsSchema = `.catchall(${typeof schema.additionalProperties === "object" && Object.keys(schema.additionalProperties).length > 0 ? getZodSchema({
 			...params,
@@ -554,7 +558,8 @@ function getEnumZodSchema({ resolver, schema, zodSchema, meta, tag }) {
 	return zodSchema.assign(`${namespacePrefix}${extractedEnumZodSchema.zodSchemaName}`);
 }
 function getEnumZodSchemaCode(schema) {
-	return `${require_generate_utils.ENUM_SCHEMA}([${schema.enum?.map((value) => value === null ? "null" : `"${value}"`).join(", ")}])`;
+	const values = schema.enum?.filter((value) => value !== null) ?? [];
+	return `${require_generate_utils.ENUM_SCHEMA}([${values.map((value) => `"${value}"`).join(", ")}])`;
 }
 function getEnumZodSchemaCodeFromEnumNames(enumNames) {
 	return `${require_generate_utils.ENUM_SCHEMA}([${enumNames.map((value) => `"${value}"`).join(", ")}])`;
@@ -2185,8 +2190,10 @@ function getBuilderConfigs({ data, tag, resolver }) {
 		if (!columnsConfig) return;
 		importedEndpoints.push(readAllEndpoint);
 		importedInfiniteEndpoints.push(readAllEndpoint);
-		if (columnsConfig.zodSchema) if (require_generate_utils.isNamedZodSchema(columnsConfig.zodSchema)) importedZodSchemas.push(columnsConfig.zodSchema);
-		else hasZodImport = true;
+		if (columnsConfig.zodSchema) {
+			if (require_generate_utils.isNamedZodSchema(columnsConfig.zodSchema)) importedZodSchemas.push(columnsConfig.zodSchema);
+			else hasZodImport = true;
+		}
 		if (columnsConfig.sortableEnumSchemaName) importedZodSchemas.push(columnsConfig.sortableEnumSchemaName);
 		const filter = readAllEndpoint.parameters.find((param) => param.name === resolver.options.filterParamName);
 		if (filter) importedZodSchemas.push(filter.zodSchema);
@@ -2802,8 +2809,8 @@ function generateModels({ resolver, data, tag }) {
 	for (const [key, code] of Object.entries(zodSchemas)) {
 		const schemaRef = resolver.getRefByZodSchemaName(key);
 		zodSchemasData[key] = {
-			code,
-			isCiruclar: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
+			code: resolver.options.modelsInModules ? code.replace(/\b[A-Z][A-Za-z0-9]*Models\./g, "") : code,
+			isCircular: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
 			isEnum: require_generate_utils.isEnumZodSchema(code),
 			schemaObj: resolver.getZodSchemaObj(key)
 		};
@@ -2824,14 +2831,51 @@ function generateModels({ resolver, data, tag }) {
 			tag,
 			resolver
 		}));
-		lines.push(`export const ${name} = ${zodSchema.code};`);
-		lines.push(`export type ${require_generate_utils.getZodSchemaInferedTypeName(name, resolver.options)} = z.infer<typeof ${name}>;`);
+		const inferredTypeName = require_generate_utils.getZodSchemaInferedTypeName(name, resolver.options);
+		if (zodSchema.isCircular && zodSchema.schemaObj) lines.push(`export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		const typeAnnotation = zodSchema.isCircular ? `: z.ZodObject<z.ZodRawShape> & z.ZodType<${inferredTypeName}>` : "";
+		const schemaCode = zodSchema.isCircular ? zodSchema.code : `z.compile(${zodSchema.code})`;
+		lines.push(`export const ${name}${typeAnnotation} = ${schemaCode};`);
+		if (!zodSchema.isCircular) lines.push(`export type ${inferredTypeName} = z.infer<typeof ${name}>;`);
 		if (zodSchema.isEnum) lines.push(`export const ${require_generate_utils.getZodSchemaInferedTypeName(name, resolver.options)} = ${name}.enum;`);
 		lines.push("");
 	}
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderSchemaType(schema, resolver) {
+	if (require_generate_utils.isReferenceObject(schema)) {
+		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
+		return schemaName ? require_generate_utils.getZodSchemaInferedTypeName(schemaName, resolver.options) : "unknown";
+	}
+	const composite = schema.allOf ?? schema.oneOf ?? schema.anyOf;
+	if (composite?.length) {
+		const separator = schema.allOf ? " & " : " | ";
+		return addNullable(schema, composite.map((part) => renderSchemaType(part, resolver)).join(separator));
+	}
+	if (schema.enum?.length) return addNullable(schema, schema.enum.map((value) => JSON.stringify(value)).join(" | "));
+	if (schema.type === "array") return addNullable(schema, `Array<${schema.items ? renderSchemaType(schema.items, resolver) : "unknown"}>`);
+	if (schema.type === "object" || schema.properties || schema.additionalProperties) {
+		const properties = Object.entries(schema.properties ?? {}).map(([name, property]) => {
+			const isRequired = resolver.options.withImplicitRequiredProps || schema.required?.includes(name);
+			const hasDefault = !require_generate_utils.isReferenceObject(property) && property.default !== void 0;
+			const optional = isRequired || hasDefault ? "" : "?";
+			const propertyType = renderSchemaType(property, resolver);
+			const outputType = resolver.options.replaceOptionalWithNullish && optional && (require_generate_utils.isReferenceObject(property) || !property.nullable) ? `${propertyType} | null` : propertyType;
+			return `${require_generate_utils.wrapWithQuotesIfNeeded(name)}${optional}: ${outputType}`;
+		});
+		if (schema.additionalProperties) {
+			const valueType = typeof schema.additionalProperties === "object" ? renderSchemaType(schema.additionalProperties, resolver) : "unknown";
+			properties.push(`[key: string]: ${valueType}`);
+		}
+		return addNullable(schema, `{ ${properties.join("; ")} }`);
+	}
+	const primitiveType = schema.type;
+	return addNullable(schema, primitiveType === "string" ? "string" : primitiveType === "number" || primitiveType === "integer" ? "number" : primitiveType === "boolean" ? "boolean" : primitiveType === "null" ? "null" : "unknown");
+}
+function addNullable(schema, type) {
+	return schema.nullable && type !== "null" ? `${type} | null` : type;
+}
 function renderModelsProxy({ resolver, data, tag }) {
 	const commonZodSchemas = data.get(resolver.options.defaultTag)?.zodSchemas ?? {};
 	const schemaNames = getUsedSchemaNames({
@@ -3389,9 +3433,10 @@ function renderInfiniteQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ pageParam, signal }: { pageParam: number; signal: AbortSignal }) => ${endpointFunction}(${endpointArgsWithPage}${hasRequestConfigParam ? `, ${requestConfigWithSignal}` : ""}),`);
 	lines.push("  initialPageParam: 1,");
-	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }: Awaited<ReturnType<typeof ${endpointFunction}>>) => {`);
+	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }: Awaited<ReturnType<typeof ${endpointFunction}>> & Partial<Record<${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.page)} | ${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.totalItems)} | ${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.limit)}, number | null>>) => {`);
 	lines.push(`    const pageParam = ${resolver.options.infiniteQueryResponseParamNames.page} ?? 1;`);
-	lines.push(`    return pageParam * limitParam < (${resolver.options.infiniteQueryResponseParamNames.totalItems} ?? 0) ? pageParam + 1 : null;`);
+	lines.push("    const pageSize = limitParam ?? 0;");
+	lines.push(`    return pageParam * pageSize < (${resolver.options.infiniteQueryResponseParamNames.totalItems} ?? 0) ? pageParam + 1 : null;`);
 	lines.push("  },");
 	lines.push("});");
 	return lines.join("\n");

package/dist/{generateCodeFromOpenAPIDoc--ufinTug.mjs → generateCodeFromOpenAPIDoc-idp1RVDa.mjs}

@@ -1,5 +1,5 @@
-import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-D8w0QElH.mjs";
-import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as CONFIG_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, n as shouldUseNativeCodegen, nt as getImportedZodSchemaInferedTypeName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as getOutputFileName, rt as getImportedZodSchemaName, st as getZodSchemaType, t as compileNativeData, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as NATIVE_PACKAGE_IMPORT_PATH } from "./native-bindings-BTQGSGhU.mjs";
+import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cyrm3VKA.mjs";
+import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as CONFIG_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, an as wrapWithQuotesIfNeeded, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as NATIVE_PACKAGE_IMPORT_PATH } from "./generate.runner-BD9BbYIx.mjs";
 import "node:module";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -207,8 +207,10 @@ function getBuilderConfigs({ data, tag, resolver }) {
 		if (!columnsConfig) return;
 		importedEndpoints.push(readAllEndpoint);
 		importedInfiniteEndpoints.push(readAllEndpoint);
-		if (columnsConfig.zodSchema) if (isNamedZodSchema(columnsConfig.zodSchema)) importedZodSchemas.push(columnsConfig.zodSchema);
-		else hasZodImport = true;
+		if (columnsConfig.zodSchema) {
+			if (isNamedZodSchema(columnsConfig.zodSchema)) importedZodSchemas.push(columnsConfig.zodSchema);
+			else hasZodImport = true;
+		}
 		if (columnsConfig.sortableEnumSchemaName) importedZodSchemas.push(columnsConfig.sortableEnumSchemaName);
 		const filter = readAllEndpoint.parameters.find((param) => param.name === resolver.options.filterParamName);
 		if (filter) importedZodSchemas.push(filter.zodSchema);
@@ -824,8 +826,8 @@ function generateModels({ resolver, data, tag }) {
 	for (const [key, code] of Object.entries(zodSchemas)) {
 		const schemaRef = resolver.getRefByZodSchemaName(key);
 		zodSchemasData[key] = {
-			code,
-			isCiruclar: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
+			code: resolver.options.modelsInModules ? code.replace(/\b[A-Z][A-Za-z0-9]*Models\./g, "") : code,
+			isCircular: schemaRef ? resolver.isSchemaCircular(schemaRef) : false,
 			isEnum: isEnumZodSchema(code),
 			schemaObj: resolver.getZodSchemaObj(key)
 		};
@@ -846,14 +848,51 @@ function generateModels({ resolver, data, tag }) {
 			tag,
 			resolver
 		}));
-		lines.push(`export const ${name} = ${zodSchema.code};`);
-		lines.push(`export type ${getZodSchemaInferedTypeName(name, resolver.options)} = z.infer<typeof ${name}>;`);
+		const inferredTypeName = getZodSchemaInferedTypeName(name, resolver.options);
+		if (zodSchema.isCircular && zodSchema.schemaObj) lines.push(`export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		const typeAnnotation = zodSchema.isCircular ? `: z.ZodObject<z.ZodRawShape> & z.ZodType<${inferredTypeName}>` : "";
+		const schemaCode = zodSchema.isCircular ? zodSchema.code : `z.compile(${zodSchema.code})`;
+		lines.push(`export const ${name}${typeAnnotation} = ${schemaCode};`);
+		if (!zodSchema.isCircular) lines.push(`export type ${inferredTypeName} = z.infer<typeof ${name}>;`);
 		if (zodSchema.isEnum) lines.push(`export const ${getZodSchemaInferedTypeName(name, resolver.options)} = ${name}.enum;`);
 		lines.push("");
 	}
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderSchemaType(schema, resolver) {
+	if (isReferenceObject(schema)) {
+		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
+		return schemaName ? getZodSchemaInferedTypeName(schemaName, resolver.options) : "unknown";
+	}
+	const composite = schema.allOf ?? schema.oneOf ?? schema.anyOf;
+	if (composite?.length) {
+		const separator = schema.allOf ? " & " : " | ";
+		return addNullable(schema, composite.map((part) => renderSchemaType(part, resolver)).join(separator));
+	}
+	if (schema.enum?.length) return addNullable(schema, schema.enum.map((value) => JSON.stringify(value)).join(" | "));
+	if (schema.type === "array") return addNullable(schema, `Array<${schema.items ? renderSchemaType(schema.items, resolver) : "unknown"}>`);
+	if (schema.type === "object" || schema.properties || schema.additionalProperties) {
+		const properties = Object.entries(schema.properties ?? {}).map(([name, property]) => {
+			const isRequired = resolver.options.withImplicitRequiredProps || schema.required?.includes(name);
+			const hasDefault = !isReferenceObject(property) && property.default !== void 0;
+			const optional = isRequired || hasDefault ? "" : "?";
+			const propertyType = renderSchemaType(property, resolver);
+			const outputType = resolver.options.replaceOptionalWithNullish && optional && (isReferenceObject(property) || !property.nullable) ? `${propertyType} | null` : propertyType;
+			return `${wrapWithQuotesIfNeeded(name)}${optional}: ${outputType}`;
+		});
+		if (schema.additionalProperties) {
+			const valueType = typeof schema.additionalProperties === "object" ? renderSchemaType(schema.additionalProperties, resolver) : "unknown";
+			properties.push(`[key: string]: ${valueType}`);
+		}
+		return addNullable(schema, `{ ${properties.join("; ")} }`);
+	}
+	const primitiveType = schema.type;
+	return addNullable(schema, primitiveType === "string" ? "string" : primitiveType === "number" || primitiveType === "integer" ? "number" : primitiveType === "boolean" ? "boolean" : primitiveType === "null" ? "null" : "unknown");
+}
+function addNullable(schema, type) {
+	return schema.nullable && type !== "null" ? `${type} | null` : type;
+}
 function renderModelsProxy({ resolver, data, tag }) {
 	const commonZodSchemas = data.get(resolver.options.defaultTag)?.zodSchemas ?? {};
 	const schemaNames = getUsedSchemaNames({
@@ -1411,9 +1450,10 @@ function renderInfiniteQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ pageParam, signal }: { pageParam: number; signal: AbortSignal }) => ${endpointFunction}(${endpointArgsWithPage}${hasRequestConfigParam ? `, ${requestConfigWithSignal}` : ""}),`);
 	lines.push("  initialPageParam: 1,");
-	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }: Awaited<ReturnType<typeof ${endpointFunction}>>) => {`);
+	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }: Awaited<ReturnType<typeof ${endpointFunction}>> & Partial<Record<${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.page)} | ${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.totalItems)} | ${JSON.stringify(resolver.options.infiniteQueryResponseParamNames.limit)}, number | null>>) => {`);
 	lines.push(`    const pageParam = ${resolver.options.infiniteQueryResponseParamNames.page} ?? 1;`);
-	lines.push(`    return pageParam * limitParam < (${resolver.options.infiniteQueryResponseParamNames.totalItems} ?? 0) ? pageParam + 1 : null;`);
+	lines.push("    const pageSize = limitParam ?? 0;");
+	lines.push(`    return pageParam * pageSize < (${resolver.options.infiniteQueryResponseParamNames.totalItems} ?? 0) ? pageParam + 1 : null;`);
 	lines.push("  },");
 	lines.push("});");
 	return lines.join("\n");

package/dist/generator.mjs

@@ -1,7 +1,6 @@
-import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc--ufinTug.mjs";
-import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-D8w0QElH.mjs";
-import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, u as isMutation, x as getSchemaTsMetaType } from "./native-bindings-BTQGSGhU.mjs";
-import { t as getOpenApiDoc } from "./generate.runner-D8AYuEFm.mjs";
+import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-idp1RVDa.mjs";
+import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cyrm3VKA.mjs";
+import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-BD9BbYIx.mjs";
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts
 async function getMetadataFromOpenAPIDoc(openApiDoc, options) {
 	const { resolver, data } = await getDataFromOpenAPIDoc(openApiDoc, options);

package/dist/{getDataFromOpenAPIDoc-D8w0QElH.mjs → getDataFromOpenAPIDoc-Cyrm3VKA.mjs}

@@ -1,4 +1,4 @@
-import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./native-bindings-BTQGSGhU.mjs";
+import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./generate.runner-BD9BbYIx.mjs";
 //#region src/generators/const/validation.const.ts
 const HTTP_STATUS_CODES = {
 	"100": "Continue",
@@ -119,12 +119,14 @@ function formatPatternIfNeeded(pattern) {
 function getZodChainableNumberValidations(schema) {
 	const validations = [];
 	if (schema.enum) return "";
-	if (schema.minimum !== void 0) if (schema.exclusiveMinimum === true) validations.push(`gt(${schema.minimum})`);
-	else validations.push(`gte(${schema.minimum})`);
-	else if (typeof schema.exclusiveMinimum === "number") validations.push(`gt(${schema.exclusiveMinimum})`);
-	if (schema.maximum !== void 0) if (schema.exclusiveMaximum === true) validations.push(`lt(${schema.maximum})`);
-	else validations.push(`lte(${schema.maximum})`);
-	else if (typeof schema.exclusiveMaximum === "number") validations.push(`lt(${schema.exclusiveMaximum})`);
+	if (schema.minimum !== void 0) {
+		if (schema.exclusiveMinimum === true) validations.push(`gt(${schema.minimum})`);
+		else validations.push(`gte(${schema.minimum})`);
+	} else if (typeof schema.exclusiveMinimum === "number") validations.push(`gt(${schema.exclusiveMinimum})`);
+	if (schema.maximum !== void 0) {
+		if (schema.exclusiveMaximum === true) validations.push(`lt(${schema.maximum})`);
+		else validations.push(`lte(${schema.maximum})`);
+	} else if (typeof schema.exclusiveMaximum === "number") validations.push(`lt(${schema.exclusiveMaximum})`);
 	if (schema.multipleOf) validations.push(`multipleOf(${schema.multipleOf})`);
 	return validations.join(".");
 }
@@ -199,8 +201,10 @@ function getOpenAPISchemaComplexity(current, schema) {
 			const props = Object.values(schema.properties);
 			current += complexityByComposite("object") + sum(props.map((prop) => getOpenAPISchemaComplexity(0, prop)));
 		} else current += complexityByComposite("empty-object");
-		if (schema.additionalProperties) if (typeof schema.additionalProperties === "object") current += getOpenAPISchemaComplexity(0, schema.additionalProperties);
-		else current += getOpenAPISchemaComplexity(1);
+		if (schema.additionalProperties) {
+			if (typeof schema.additionalProperties === "object") current += getOpenAPISchemaComplexity(0, schema.additionalProperties);
+			else current += getOpenAPISchemaComplexity(1);
+		}
 	}
 	return current;
 }
@@ -384,7 +388,7 @@ function getZodSchema({ schema, resolver, meta: inheritedMeta, tag }) {
 				propZodSchema,
 				isCircular
 			];
-		}).map(([prop, propSchema, isCircular]) => isCircular ? `get ${wrapWithQuotesIfNeeded(prop)}() { return ${propSchema} }` : `${wrapWithQuotesIfNeeded(prop)}: ${propSchema}`).join(", ")} }`;
+		}).map(([prop, propSchema, isCircular]) => isCircular ? `${wrapWithQuotesIfNeeded(prop)}: z.lazy(() => ${propSchema})` : `${wrapWithQuotesIfNeeded(prop)}: ${propSchema}`).join(", ")} }`;
 		let additionalPropsSchema = "";
 		if (schema.additionalProperties) additionalPropsSchema = `.catchall(${typeof schema.additionalProperties === "object" && Object.keys(schema.additionalProperties).length > 0 ? getZodSchema({
 			...params,
@@ -592,7 +596,8 @@ function getEnumZodSchema({ resolver, schema, zodSchema, meta, tag }) {
 	return zodSchema.assign(`${namespacePrefix}${extractedEnumZodSchema.zodSchemaName}`);
 }
 function getEnumZodSchemaCode(schema) {
-	return `${ENUM_SCHEMA}([${schema.enum?.map((value) => value === null ? "null" : `"${value}"`).join(", ")}])`;
+	const values = schema.enum?.filter((value) => value !== null) ?? [];
+	return `${ENUM_SCHEMA}([${values.map((value) => `"${value}"`).join(", ")}])`;
 }
 function getEnumZodSchemaCodeFromEnumNames(enumNames) {
 	return `${ENUM_SCHEMA}([${enumNames.map((value) => `"${value}"`).join(", ")}])`;

package/dist/index.d.mts

@@ -7,6 +7,6 @@ import { i as QueryModule, n as InvalidationMapFunc, r as OpenApiQueryConfig, t
 import { t as RestUtils } from "./rest.utils-rezWAIYL.mjs";
 import { t as OpenAPICodegenConfig } from "./config-DgrOddSC.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-Cz6saoq5.mjs";
+import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-PgziZt1f.mjs";
 import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-DIdL8tlx.mjs";
 export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, 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 RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, type TranslateFunction, configureTranslations, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { i as resources, n as ns, t as configureTranslations } from "./i18n-D-Fe
 import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, r as ErrorHandler, t as ApplicationException } from "./error-handling-BeydPL7s.mjs";
 import { t as HttpError } from "./rest-transport.types-DxitRtsB.mjs";
 import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-D5NCNTm1.mjs";
-import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-CAWR8H5Y.mjs";
+import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-Np4Ov54n.mjs";
 import { t as OpenApiQueryConfig } from "./queryConfig.context-CldQ5YL9.mjs";
 import { t as useMutationEffects } from "./useMutationEffects-PB1fvKWM.mjs";
 import { t as OpenApiRouter } from "./router.context-EPlMBk3G.mjs";

package/dist/metro.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generate_utils = require("./generate.utils-CT-LA-gX.cjs");
+const require_generate_utils = require("./generate.utils-BqlgVd-i.cjs");
 let fs = require("fs");
 fs = require_generate_utils.__toESM(fs, 1);
 let path = require("path");
@@ -97,7 +97,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-iEa8YAUQ.cjs"));
+		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-CkVgg5Zy.cjs"));
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/metro.mjs

@@ -1,5 +1,5 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-6Yth6QZC.mjs";
-import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-BZ6ZLgRO.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BZH4V6rq.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";
 //#region src/metro/openapi-codegen.plugin.ts

package/dist/{native-rest-interceptor-CAWR8H5Y.mjs → native-rest-interceptor-Np4Ov54n.mjs}

@@ -3,12 +3,14 @@ import { z } from "zod";
 //#region src/lib/rest/native-rest-client.ts
 var NativeRestClient = class {
 	interceptors;
-	constructor({ config, interceptors = [] } = {}) {
+	errorHandler;
+	constructor({ config, interceptors = [], errorHandler } = {}) {
 		this.baseURL = config?.baseURL ?? "";
 		this.headers = config?.headers;
 		this.credentials = config?.credentials;
 		this.fetch = config?.fetch ?? globalThis.fetch.bind(globalThis);
 		this.interceptors = [...interceptors];
+		this.errorHandler = errorHandler;
 	}
 	baseURL;
 	headers;
@@ -55,10 +57,12 @@ var NativeRestClient = class {
 			const headers = new Headers(this.headers);
 			new Headers(config.headers).forEach((value, key) => headers.set(key, value));
 			let body;
-			if (data != null) if (data instanceof FormData || data instanceof Blob || typeof data === "string") body = data;
-			else {
-				body = JSON.stringify(data);
-				if (!headers.has("content-type")) headers.set("content-type", "application/json");
+			if (data != null) {
+				if (data instanceof FormData || data instanceof Blob || typeof data === "string") body = data;
+				else {
+					body = JSON.stringify(data);
+					if (!headers.has("content-type")) headers.set("content-type", "application/json");
+				}
 			}
 			const request = {
 				url: this.resolveUrl(path, config.params),
@@ -84,7 +88,8 @@ var NativeRestClient = class {
 			} : dataResult;
 		} catch (error) {
 			if (error instanceof z.ZodError) error.name = "BE Response schema mismatch - ZodError";
-			throw await this.runErrorInterceptors(error);
+			const transformed = await this.runErrorInterceptors(error);
+			throw this.errorHandler ? this.errorHandler.rethrowError(transformed) : transformed;
 		}
 	}
 	async execute(request, config = {}, applyInterceptors = true) {
@@ -92,8 +97,10 @@ var NativeRestClient = class {
 		if (applyInterceptors) for (const interceptor of this.interceptors) next = await interceptor.onRequest?.(next) ?? next;
 		const timeoutController = config.timeout ? new AbortController() : void 0;
 		const timer = timeoutController ? setTimeout(() => timeoutController.abort(), config.timeout) : void 0;
-		if (timeoutController && next.signal) if (next.signal.aborted) timeoutController.abort(next.signal.reason);
-		else next.signal.addEventListener("abort", () => timeoutController.abort(next.signal?.reason), { once: true });
+		if (timeoutController && next.signal) {
+			if (next.signal.aborted) timeoutController.abort(next.signal.reason);
+			else next.signal.addEventListener("abort", () => timeoutController.abort(next.signal?.reason), { once: true });
+		}
 		const signal = timeoutController?.signal ?? next.signal;
 		try {
 			const res = await this.fetch(next.url, {

package/dist/{native-rest-interceptor-Cz6saoq5.d.mts → native-rest-interceptor-PgziZt1f.d.mts}

@@ -1,9 +1,11 @@
+import { a as ErrorHandler } from "./error-handling-LPEPQV1V.mjs";
 import { a as RestTransport, c as TransportFetch, d as TransportResponse, l as TransportRequest, o as RestTransportInterceptor, r as RestRequestInfo, s as TransportErrorContext, t as GeneralTransportErrorCode, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
 //#region src/lib/rest/native-rest-client.d.ts
 type NativeResult<T, IsRawRes extends boolean> = IsRawRes extends true ? TransportResponse<T> : T;
 declare class NativeRestClient implements RestTransport {
   private readonly interceptors;
-  constructor({ config, interceptors }?: {
+  private readonly errorHandler?;
+  constructor({ config, interceptors, errorHandler }?: {
     config?: {
       baseURL?: string;
       headers?: HeadersInit;
@@ -11,6 +13,7 @@ declare class NativeRestClient implements RestTransport {
       fetch?: TransportFetch;
     };
     interceptors?: RestTransportInterceptor[];
+    errorHandler?: ErrorHandler<any>;
   });
   private readonly baseURL;
   private readonly headers?;

package/dist/native.d.mts

@@ -1,3 +1,3 @@
 import { a as RestTransport, d as TransportResponse, f as TransportResult, i as RestResponseType, l as TransportRequest, n as HttpError, o as RestTransportInterceptor, p as UploadProgress, r as RestRequestInfo, t as GeneralTransportErrorCode, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
-import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-Cz6saoq5.mjs";
+import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-PgziZt1f.mjs";
 export { type GeneralTransportErrorCode, HttpError, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequest, type TransportRequestConfig as NativeRequestConfig, type TransportRequestConfig, type TransportResponse as NativeResponse, type TransportResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, type UploadProgress, type RestRequestInfo, type RestResponseType, type RestTransport, type RestTransportInterceptor, type TransportResult };

package/dist/native.mjs

@@ -1,3 +1,3 @@
 import { t as HttpError } from "./rest-transport.types-DxitRtsB.mjs";
-import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-CAWR8H5Y.mjs";
+import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-Np4Ov54n.mjs";
 export { HttpError, HttpError as NativeHttpError, NativeRestClient, NativeRestInterceptor };

package/dist/{openapi-codegen.runner-6Yth6QZC.mjs → openapi-codegen.runner-BZH4V6rq.mjs}

@@ -1,5 +1,4 @@
-import { Wn as Profiler } from "./native-bindings-BTQGSGhU.mjs";
-import { n as runGenerate } from "./generate.runner-D8AYuEFm.mjs";
+import { Wn as Profiler, n as runGenerate } from "./generate.runner-BD9BbYIx.mjs";
 import path from "path";
 //#region src/plugins/openapi-codegen.runner.ts
 function createOpenApiCodegenRunner(config, options = {}) {

package/dist/{openapi-source.runner-BZ6ZLgRO.mjs → openapi-source.runner-DPUNTduQ.mjs}

@@ -314,11 +314,13 @@ function collectContractSchemas(router, routerPath = [], schemas = {}, getSchema
 	if (procedure) {
 		const procedureName = routerPath.map(toPascalCase).join("");
 		const { inputSchema, outputSchema, route } = procedure;
-		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 (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;
 	}

package/dist/sh.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
-import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-D8w0QElH.mjs";
-import { D as getTagFileName, Wn as Profiler, r as getOutputFileName } from "./native-bindings-BTQGSGhU.mjs";
-import { n as runGenerate, r as resolveConfig, t as getOpenApiDoc } from "./generate.runner-D8AYuEFm.mjs";
+import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cyrm3VKA.mjs";
+import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-BD9BbYIx.mjs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { styleText } from "node:util";
@@ -32,7 +31,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "3.2.0-rc.9";
+	return "3.2.0";
 }
 //#endregion
 //#region src/helpers/yargs.helper.ts
@@ -158,12 +157,12 @@ async function check({ verbose, config: configParam, includeTags: _includeTagsPa
 	else throw new Error(`Found ${errorMessages.length} issues. Time: ${Date.now() - start}ms`);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/decorateMetadata.js
+//#region \0@oxc-project+runtime@0.148.0/helpers/esm/decorateMetadata.js
 function __decorateMetadata(k, v) {
 	if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.148.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -241,8 +240,10 @@ async function generate({ prettier, verbose, config: configParam, ...params }) {
 function execPrettier({ output, verbose }) {
 	if (verbose) logInfo("Running Prettier...");
 	exec(`prettier --write ${output} `, (error) => {
-		if (verbose) if (error) logError(error, "Prettier error");
-		else logSuccess("Prettier finished.");
+		if (verbose) {
+			if (error) logError(error, "Prettier error");
+			else logSuccess("Prettier finished.");
+		}
 	});
 }
 //#endregion

package/dist/tiny.mjs

@@ -1,2 +1,2 @@
-import { $ as namedControllerActionInputDtoSchema, A as generateORPCOpenAPISpec, B as getOperationController, C as collectReachableModelSchemas, D as defineOpenApiSchemas, E as createModelSchemaNameGetter, F as getModuleOpenApiController, G as isContractProcedure, H as getProcedureInputSchemaRole, I as getModuleOpenApiTag, J as isObject, K as isNullSchema, L as getObjectPropertySchema, M as getComponentSchemas, N as getContractProcedureData, O as findComponentEnumNames, P as getDerivedOperationId, Q as modelSchemaNameEntries, R as getOpenApiSchemaName, S as collectOperationTags, T as compactTagName, U as getRobodevModuleRoles, V as getPaginatedItemSchema, W as getStringEnumValues, X as isZodSchema, Y as isProcedureMeta, Z as modelSchemaExportName, _ as collectDbTableModelSchemaExports, _t as visitZodSchema, a as addContractSchema, at as operationKey, b as collectModuleModelSchemaExports, c as applyPaginatedItemSchemas, ct as routeHasPathParameters, d as applyRobodevUserRolesExtension, dt as sharedSchemaExportName, et as namedControllerActionSchema, f as asStringArray, ft as stripNoContentResponseBodies, g as collectDbTableModelSchemaExport, gt as toPascalCase, h as collectContractSchemas, ht as toOpenAPIAclRule, i as normalizeWatchFolders, it as namedOpenApiSchema, j as generateOpenApiFile, k as findEnumNames, l as applyParameterExtensions, lt as schemaComponentRef, m as collectContractSchemaRoots, mt as toOpenAPI30Schema, n as getLocalInputPath, nt as namedOpenApiRequestSchema, o as applyEnumExtensions, ot as procedureSchemaName, p as collectApiModelSchemaExports, pt as toOpenAPI30Document, q as isNullableOnlySchema, r as isTinyOpenApiFakeMode, rt as namedOpenApiResponseSchema, s as applyOperationMeta, st as resolveOpenApiOutputPath, t as createTinyOpenApiSourceRunner, tt as namedOpenApiOutputSchema, u as applyRobodevModuleExtensions, ut as schemaExportName, v as collectExtraSchemas, w as collectSchemaRegistryRoots, x as collectOperationMeta, y as collectModelSchemaExports, z as getOperationAction } from "./openapi-source.runner-BZ6ZLgRO.mjs";
+import { $ as namedControllerActionInputDtoSchema, A as generateORPCOpenAPISpec, B as getOperationController, C as collectReachableModelSchemas, D as defineOpenApiSchemas, E as createModelSchemaNameGetter, F as getModuleOpenApiController, G as isContractProcedure, H as getProcedureInputSchemaRole, I as getModuleOpenApiTag, J as isObject, K as isNullSchema, L as getObjectPropertySchema, M as getComponentSchemas, N as getContractProcedureData, O as findComponentEnumNames, P as getDerivedOperationId, Q as modelSchemaNameEntries, R as getOpenApiSchemaName, S as collectOperationTags, T as compactTagName, U as getRobodevModuleRoles, V as getPaginatedItemSchema, W as getStringEnumValues, X as isZodSchema, Y as isProcedureMeta, Z as modelSchemaExportName, _ as collectDbTableModelSchemaExports, _t as visitZodSchema, a as addContractSchema, at as operationKey, b as collectModuleModelSchemaExports, c as applyPaginatedItemSchemas, ct as routeHasPathParameters, d as applyRobodevUserRolesExtension, dt as sharedSchemaExportName, et as namedControllerActionSchema, f as asStringArray, ft as stripNoContentResponseBodies, g as collectDbTableModelSchemaExport, gt as toPascalCase, h as collectContractSchemas, ht as toOpenAPIAclRule, i as normalizeWatchFolders, it as namedOpenApiSchema, j as generateOpenApiFile, k as findEnumNames, l as applyParameterExtensions, lt as schemaComponentRef, m as collectContractSchemaRoots, mt as toOpenAPI30Schema, n as getLocalInputPath, nt as namedOpenApiRequestSchema, o as applyEnumExtensions, ot as procedureSchemaName, p as collectApiModelSchemaExports, pt as toOpenAPI30Document, q as isNullableOnlySchema, r as isTinyOpenApiFakeMode, rt as namedOpenApiResponseSchema, s as applyOperationMeta, st as resolveOpenApiOutputPath, t as createTinyOpenApiSourceRunner, tt as namedOpenApiOutputSchema, u as applyRobodevModuleExtensions, ut as schemaExportName, v as collectExtraSchemas, w as collectSchemaRegistryRoots, x as collectOperationMeta, y as collectModelSchemaExports, z as getOperationAction } from "./openapi-source.runner-DPUNTduQ.mjs";
 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.mjs

@@ -1,5 +1,5 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-6Yth6QZC.mjs";
-import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-BZ6ZLgRO.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BZH4V6rq.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
 function openApiCodegen(config) {

package/package.json

@@ -127,7 +127,7 @@
     "@casl/ability": "6.8.0",
     "@casl/react": "5.0.1",
     "@tanstack/react-query": "~5.90.21",
-    "@types/bun": "1.3.14",
+    "@types/bun": "1.4.1",
     "@types/node": "^25.3.0",
     "@types/prompt-sync": "^4.2.3",
     "@types/react": "^19.2.14",
@@ -146,7 +146,7 @@
     "vite": "npm:rolldown-vite@^7.3.1",
     "vite-plugin-dts": "^4.5.4",
     "vitest": "4.0.18",
-    "zod": "^4.3.6"
+    "zod": "^4.5.0"
   },
   "peerDependencies": {
     "@casl/ability": "^6.7.3",
@@ -156,7 +156,7 @@
     "i18next": "^25.8.11",
     "react": "^19.1.0",
     "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
-    "zod": "^4.1.12"
+    "zod": "^4.5.0"
   },
   "peerDependenciesMeta": {
     "@casl/ability": {
@@ -182,9 +182,9 @@
     }
   },
   "engines": {
-    "bun": ">= 1.3.14",
+    "bun": ">= 1.4",
     "node": ">= 18"
   },
-  "packageManager": "bun@1.3.14",
-  "version": "3.2.0-rc.9"
+  "packageManager": "bun@1.4.1",
+  "version": "3.2.0"
 }

package/dist/generate.runner-D8AYuEFm.mjs

@@ -1,184 +0,0 @@
-import { D as getTagFileName, Wn as Profiler, a as writeGenerateFileData, dt as DEFAULT_GENERATE_OPTIONS, i as removeStaleGeneratedFiles, n as shouldUseNativeCodegen, o as deepMerge, r as getOutputFileName, t as compileNativeData } from "./native-bindings-BTQGSGhU.mjs";
-import fs from "fs";
-import path from "path";
-//#region src/generators/core/resolveConfig.ts
-function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, inlineEndpointsExcludeModules, workspaceContext, ...options } }) {
-	const resolvedConfig = deepMerge(DEFAULT_GENERATE_OPTIONS, fileConfig ?? {}, {
-		...options,
-		includeTags: includeTags?.split(","),
-		excludeTags: excludeTags?.split(","),
-		inlineEndpointsExcludeModules: inlineEndpointsExcludeModules?.split(","),
-		workspaceContext: workspaceContext?.split(",")
-	});
-	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
-	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
-	return resolvedConfig;
-}
-//#endregion
-//#region src/native/generateFilesFromNativeOpenAPI.ts
-function generateFilesFromNativeOpenAPI(source, yaml, options) {
-	if (!supportsCompleteNativeRender(options)) {
-		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
-		return;
-	}
-	const nativeData = compileNativeData(source, yaml, JSON.stringify({
-		...options,
-		nativeCompact: true
-	})).data;
-	if (!nativeData.renderedComplete) {
-		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
-		return;
-	}
-	const files = [];
-	const taggedRenderers = options.modelsOnly ? [["models", nativeData.renderedModels]] : [
-		["models", nativeData.renderedModels],
-		["endpoints", nativeData.renderedEndpoints],
-		["queries", nativeData.renderedQueries],
-		...options.acl ? [["acl", nativeData.renderedAcl]] : []
-	];
-	for (const tag of nativeData.renderedTags) for (const [type, rendered] of taggedRenderers) {
-		const content = rendered[tag];
-		if (content) files.push(taggedFile(options, tag, type, content));
-	}
-	if (!options.modelsOnly) {
-		if (options.acl && nativeData.renderedShared.appAcl) files.push(outputFile(options, "acl/app.ability.ts", nativeData.renderedShared.appAcl));
-		if (options.mutationEffects && nativeData.renderedShared.queryModules) files.push(outputFile(options, "queryModules.ts", nativeData.renderedShared.queryModules));
-		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : ""}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
-		if (nativeData.renderedShared.domainErrors) files.push(outputFile(options, "domain-errors.ts", nativeData.renderedShared.domainErrors));
-	}
-	return files;
-}
-function supportsCompleteNativeRender(options) {
-	return options.splitByTags && (options.modelsInCommon && options.tsNamespaces || !options.modelsInCommon && !options.tsNamespaces) && !options.inlineEndpoints && !options.builderConfigs && (options.workspaceContext?.length ?? 0) === 0;
-}
-function taggedFile(options, tag, type, content) {
-	return outputFile(options, getTagFileName({
-		tag,
-		type,
-		options
-	}), content);
-}
-function outputFile(options, fileName, content) {
-	return {
-		fileName: getOutputFileName({
-			output: options.output,
-			fileName
-		}),
-		content
-	};
-}
-//#endregion
-//#region src/generators/run/generate.runner.ts
-async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler = new Profiler(process.env.OPENAPI_CODEGEN_PROFILE === "1") }) {
-	const config = profiler.runSync("config.resolve", () => resolveConfig({
-		fileConfig,
-		params: params ?? {}
-	}));
-	const useNative = shouldUseNativeCodegen();
-	const isJson = path.extname(new URL(config.input, "file://").pathname).toLowerCase() === ".json";
-	const useRawNativeInput = useNative && (isJson || typeof Bun === "undefined");
-	let nativeInput = useRawNativeInput ? await getRawOpenApiSource(config.input, profiler) : await getOpenApiSource(config.input, profiler);
-	if (useNative && !useRawNativeInput) {
-		const document = "document" in nativeInput ? nativeInput.document : void 0;
-		nativeInput = {
-			...nativeInput,
-			source: profiler.runSync("openapi.serialize", () => JSON.stringify(document)),
-			yaml: false
-		};
-	}
-	const openApiDoc = "document" in nativeInput ? nativeInput.document : {};
-	const outputExists = fs.existsSync(config.output);
-	const filesData = await profiler.runAsync("generate.total", async () => {
-		if (useNative) {
-			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
-			if (nativeFiles) return nativeFiles;
-		}
-		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc--ufinTug.mjs").then((n) => n.n);
-		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
-			source: nativeInput.source,
-			yaml: nativeInput.yaml
-		});
-	});
-	if (config.clearOutput) profiler.runSync("files.removeStaleGenerated", () => {
-		removeStaleGeneratedFiles({
-			output: config.output,
-			filesData,
-			options: config
-		});
-	});
-	await profiler.runAsync("files.write", async () => {
-		await writeGenerateFileData(filesData, {
-			formatGeneratedFile,
-			skipExistingCheck: !outputExists
-		});
-	});
-	return {
-		skipped: false,
-		config,
-		stats: getGenerateStats(filesData, config)
-	};
-}
-async function getOpenApiDoc(input, profiler = new Profiler(false)) {
-	return (await getOpenApiSource(input, profiler)).document;
-}
-async function getOpenApiSource(input, profiler = new Profiler(false)) {
-	const raw = await getRawOpenApiSource(input, profiler);
-	const { source } = raw;
-	const document = await profiler.runAsync("openapi.parse", () => parseOpenApiSource(input, source));
-	return {
-		...raw,
-		document
-	};
-}
-async function getRawOpenApiSource(input, profiler = new Profiler(false)) {
-	return {
-		source: await profiler.runAsync("openapi.read", () => readOpenApiSource(input)),
-		yaml: path.extname(new URL(input, "file://").pathname).toLowerCase() !== ".json"
-	};
-}
-async function readOpenApiSource(input) {
-	if (/^https?:\/\//i.test(input)) {
-		const response = await fetch(input);
-		if (!response.ok) throw new Error(`Unable to load OpenAPI document: ${response.status} ${response.statusText}`);
-		return response.text();
-	}
-	return fs.promises.readFile(input, "utf-8");
-}
-async function parseOpenApiSource(input, source) {
-	try {
-		return JSON.parse(source.charCodeAt(0) === 65279 ? source.slice(1) : source);
-	} catch (error) {
-		if (path.extname(new URL(input, "file://").pathname).toLowerCase() === ".json") throw error;
-		if (typeof Bun !== "undefined") return Bun.YAML.parse(source);
-		const { parse } = await import("yaml");
-		return parse(source);
-	}
-}
-function getGenerateStats(filesData, config) {
-	const generatedFilesCount = filesData.length;
-	if (generatedFilesCount === 0) return {
-		generatedFilesCount,
-		generatedModulesCount: 0
-	};
-	if (!config.splitByTags) return {
-		generatedFilesCount,
-		generatedModulesCount: 1
-	};
-	const moduleSuffixes = new Set(Object.values(config.configs).map((generateConfig) => generateConfig.outputFileNameSuffix).filter(Boolean));
-	const modules = /* @__PURE__ */ new Set();
-	for (const file of filesData) {
-		const segments = path.relative(config.output, file.fileName).split(path.sep).filter(Boolean);
-		if (segments.length < 2) continue;
-		const moduleName = segments[0];
-		const fileName = segments[segments.length - 1];
-		if (!fileName.startsWith(`${moduleName}.`)) continue;
-		const suffix = fileName.slice(moduleName.length + 1).replace(/\.tsx?$/, "");
-		if (moduleSuffixes.has(suffix)) modules.add(moduleName);
-	}
-	return {
-		generatedFilesCount,
-		generatedModulesCount: modules.size
-	};
-}
-//#endregion
-export { runGenerate as n, resolveConfig as r, getOpenApiDoc as t };