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

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

@@ -1,4 +1,29 @@
-const require_generate_utils = require("./generate.utils-CH2U2Dpr.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",
+	extension: "ts"
+};
+const ACL_APP_ABILITIES = "AppAbilities";
+const ACL_CHECK_HOOK = "useAclCheck";
+const CASL_ABILITY_BINDING = {
+	abilityTuple: "AbilityTuple",
+	pureAbility: "PureAbility",
+	forcedSubject: "ForcedSubject",
+	subjectType: "Subject",
+	subject: "subject"
+};
+const CASL_ABILITY_IMPORT = {
+	bindings: [
+		CASL_ABILITY_BINDING.abilityTuple,
+		CASL_ABILITY_BINDING.pureAbility,
+		CASL_ABILITY_BINDING.forcedSubject,
+		CASL_ABILITY_BINDING.subjectType,
+		CASL_ABILITY_BINDING.subject
+	],
+	from: "@casl/ability"
+};
+//#endregion
 //#region src/generators/core/zod/getZodChain.ts
 const zodChainCache = /* @__PURE__ */ new WeakMap();
 function getZodChain({ schema, meta, options }) {
@@ -56,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(".");
 }
@@ -136,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;
 }
@@ -321,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,
@@ -529,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(", ")}])`;
@@ -2004,13 +2034,13 @@ function generateAcl({ resolver, data, tag }) {
 	const { hasAdditionalAbilityImports, modelsImports, endpoints } = aclData;
 	const hasWorkspaceContext = endpoints.some((endpoint) => getWorkspaceConditionNames(resolver, endpoint).length > 0);
 	const caslAbilityTupleImport = {
-		bindings: [...hasAdditionalAbilityImports ? [require_generate_utils.CASL_ABILITY_BINDING.forcedSubject, require_generate_utils.CASL_ABILITY_BINDING.subject] : []],
-		typeBindings: [require_generate_utils.CASL_ABILITY_BINDING.abilityTuple],
-		from: require_generate_utils.CASL_ABILITY_IMPORT.from
+		bindings: [...hasAdditionalAbilityImports ? [CASL_ABILITY_BINDING.forcedSubject, CASL_ABILITY_BINDING.subject] : []],
+		typeBindings: [CASL_ABILITY_BINDING.abilityTuple],
+		from: CASL_ABILITY_IMPORT.from
 	};
 	const workspaceContextImport = {
 		bindings: ["useWorkspaceContext"],
-		from: require_generate_utils.PACKAGE_IMPORT_PATH
+		from: require_generate_utils.CONFIG_PACKAGE_IMPORT_PATH
 	};
 	const lines = [];
 	lines.push(renderImport$4(caslAbilityTupleImport));
@@ -2042,12 +2072,12 @@ function generateAppAcl({ resolver, data }) {
 	const caslAbilityTupleImport = {
 		bindings: [],
 		typeBindings: [
-			require_generate_utils.CASL_ABILITY_BINDING.pureAbility,
-			require_generate_utils.CASL_ABILITY_BINDING.abilityTuple,
-			...!appAbilitiesType ? [require_generate_utils.CASL_ABILITY_BINDING.subjectType] : [],
-			...hasAdditionalAbilityImports ? [require_generate_utils.CASL_ABILITY_BINDING.forcedSubject] : []
+			CASL_ABILITY_BINDING.pureAbility,
+			CASL_ABILITY_BINDING.abilityTuple,
+			...!appAbilitiesType ? [CASL_ABILITY_BINDING.subjectType] : [],
+			...hasAdditionalAbilityImports ? [CASL_ABILITY_BINDING.forcedSubject] : []
 		],
-		from: require_generate_utils.CASL_ABILITY_IMPORT.from,
+		from: CASL_ABILITY_IMPORT.from,
 		typeOnly: true
 	};
 	const lines = [];
@@ -2055,11 +2085,11 @@ function generateAppAcl({ resolver, data }) {
 	for (const modelsImport of modelsImports) lines.push(renderImport$4(modelsImport));
 	lines.push("");
 	if (appAbilitiesType) {
-		lines.push(`export type ${require_generate_utils.ACL_APP_ABILITIES} = `);
-		for (const [action, subjects] of Object.entries(appAbilitiesType)) lines.push(`| ${require_generate_utils.CASL_ABILITY_BINDING.abilityTuple}<"${action}", ${subjects.join(" | ")}>`);
-	} else lines.push(`export type ${require_generate_utils.ACL_APP_ABILITIES} = ${require_generate_utils.CASL_ABILITY_BINDING.abilityTuple}<string, ${require_generate_utils.CASL_ABILITY_BINDING.subjectType}>;`);
+		lines.push(`export type ${ACL_APP_ABILITIES} = `);
+		for (const [action, subjects] of Object.entries(appAbilitiesType)) lines.push(`| ${CASL_ABILITY_BINDING.abilityTuple}<"${action}", ${subjects.join(" | ")}>`);
+	} else lines.push(`export type ${ACL_APP_ABILITIES} = ${CASL_ABILITY_BINDING.abilityTuple}<string, ${CASL_ABILITY_BINDING.subjectType}>;`);
 	lines.push("");
-	lines.push(`export type AppAbility = PureAbility<${require_generate_utils.ACL_APP_ABILITIES}>;`);
+	lines.push(`export type AppAbility = PureAbility<${ACL_APP_ABILITIES}>;`);
 	return lines.join("\n");
 }
 function renderImport$4(importData) {
@@ -2118,7 +2148,7 @@ function renderAbilityFunction({ resolver, endpoint }) {
 	lines.push(") => [");
 	lines.push(`  "${require_generate_utils.getAbilityAction(endpoint)}",`);
 	lines.push(`  ${hasConditions ? `object ? subject("${require_generate_utils.getAbilitySubject(endpoint)}", object) : "${require_generate_utils.getAbilitySubject(endpoint)}"` : `"${require_generate_utils.getAbilitySubject(endpoint)}"`}`);
-	lines.push(`] as ${require_generate_utils.CASL_ABILITY_BINDING.abilityTuple}<"${require_generate_utils.getAbilityAction(endpoint)}", ${require_generate_utils.getAbilitySubjectTypes(endpoint, resolver, require_generate_utils.getEndpointTag(endpoint, resolver.options)).join(" | ")}>;`);
+	lines.push(`] as ${CASL_ABILITY_BINDING.abilityTuple}<"${require_generate_utils.getAbilityAction(endpoint)}", ${require_generate_utils.getAbilitySubjectTypes(endpoint, resolver, require_generate_utils.getEndpointTag(endpoint, resolver.options)).join(" | ")}>;`);
 	const workspaceAclHook = renderWorkspaceAclHook({
 		resolver,
 		endpoint
@@ -2160,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);
@@ -2439,7 +2471,7 @@ function generateConfigs(generateTypeParams) {
 		from: require_generate_utils.getQueryModulesImportPath(resolver.options)
 	};
 	const aclCheckImport = {
-		bindings: [require_generate_utils.ACL_CHECK_HOOK],
+		bindings: [ACL_CHECK_HOOK],
 		from: resolver.options.aclCheckImportPath
 	};
 	const hasDynamicInputsImport = configs.some((config) => config.readAll.filters || config.create?.inputDefs || config.update?.inputDefs);
@@ -2534,7 +2566,7 @@ function renderMutationContent(resolver, endpoint, tag) {
 	lines.push(`(options?: AppMutationOptions<typeof ${endpointFunction}, ${mutationVariablesType}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, config?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<${require_generate_utils.QUERY_MODULE_ENUM}.${endpointTag}>({ currentModule: ${require_generate_utils.QUERY_MODULE_ENUM}.${tag} });`);
-	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
+	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push("");
 	lines.push(`  return ${QUERY_HOOKS.mutation}({`);
 	const mutationFnArg = destructuredMutationArgs ? `{ ${destructuredMutationArgs}${endpoint.mediaUpload ? `${destructuredMutationArgs ? ", " : ""}abortController, onUploadProgress` : ""} }` : "";
@@ -2777,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)
 		};
@@ -2799,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({
@@ -2952,7 +3021,7 @@ function generateQueries(params) {
 	};
 	const hasAclCheck = resolver.options.checkAcl && aclEndpoints.length > 0;
 	const aclCheckImport = {
-		bindings: [require_generate_utils.ACL_CHECK_HOOK],
+		bindings: [ACL_CHECK_HOOK],
 		from: resolver.options.aclCheckImportPath
 	};
 	const queryTypesImport = {
@@ -2967,7 +3036,7 @@ function generateQueries(params) {
 	const hasWorkspaceContext = resolver.options.workspaceContext && endpoints.some((endpoint) => getWorkspaceParamNames(resolver, endpoint).length > 0);
 	const workspaceContextImport = {
 		bindings: ["useWorkspaceContext"],
-		from: require_generate_utils.PACKAGE_IMPORT_PATH
+		from: require_generate_utils.CONFIG_PACKAGE_IMPORT_PATH
 	};
 	const endpointParams = endpoints.flatMap((endpoint) => endpoint.parameters);
 	const endpointParamsParseSchemas = endpointParams.filter((param) => !["Path", "Header"].includes(param.type)).map((param) => param.parameterSortingEnumSchemaName ?? param.zodSchema);
@@ -3364,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");
@@ -3422,7 +3492,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	}));
 	lines.push(`export const ${require_generate_utils.getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
-	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
+	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -3492,7 +3562,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	}));
 	lines.push(`export const ${require_generate_utils.getQueryName(endpoint, true)} = (${pathParamFirstArg}options?: AppMutationOptions<typeof ${endpointFunction}${mutationOptionsTypeArg}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
-	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
+	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceContextDestructure({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -3611,7 +3681,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	}));
 	lines.push(`export const ${require_generate_utils.getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
-	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
+	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -3716,7 +3786,7 @@ function getAclFiles(data, resolver) {
 	return [{
 		fileName: require_generate_utils.getOutputFileName({
 			output: resolver.options.output,
-			fileName: require_generate_utils.getFileNameWithExtension(require_generate_utils.ACL_APP_ABILITY_FILE)
+			fileName: require_generate_utils.getFileNameWithExtension(ACL_APP_ABILITY_FILE)
 		}),
 		content: generateAppAcl({
 			resolver,

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

@@ -1,5 +1,5 @@
-import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-7RxjULpB.mjs";
-import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as AXIOS_REQUEST_CONFIG_NAME, B as getPrefetchInfiniteQueryName, Bn as shouldInlineEndpointsForTag, Bt as QUERY_MODULE_ENUM, C as getAppRestClientImportPath, Ct as isReadEndpoint, D as getTagFileName, Dn as ZOD_IMPORT, E as getQueryTypesImportPath, F as mergeImports, Fn as getRequestConfigTypeName, Ft as APP_REST_CLIENT_NAME, G as getAbilityConditionType, Gn as kebabToCamel, Gt as REST_PACKAGE_IMPORT_PATH, H as getQueryName, Hn as capitalize, Ht as ZOD_EXTENDED, I as getImportedInfiniteQueryName, It as BUILDERS_UTILS, J as getAbilityFunctionName, Jn as Profiler, K as getAbilityConditionsTypes, Kt as getNamespaceName, L as getImportedQueryName, Ln as getEndpointTag, Lt as DOMAIN_ERRORS_FILE, M as getInfiniteQueriesImports, Mt as isEnumZodSchema, N as getModelsImports, Nn as JSON_APPLICATION_FORMAT, Nt as isNamedZodSchema, O as getTagImportPath, On as AXIOS_DEFAULT_IMPORT_NAME, P as getQueriesImports, Pn as NATIVE_RESPONSE_TYPE, Pt as APP_REST_CLIENT_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rt as MUTATION_EFFECTS, St as isReadAllEndpoint, T as getQueryModulesImportPath, Tt as invalidVariableNameCharactersToCamel, U as getQueryOptionsName, Ut as NATIVE_PACKAGE_IMPORT_PATH, V as getPrefetchQueryName, Vn as camelToSpaceSeparated, Vt as QUERY_OPTIONS_TYPES, W as getAbilityAction, Wt as PACKAGE_IMPORT_PATH, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, _ as hasEndpointConfig, _t as getPathSegments, at as getZodSchemaInferedTypeName, b as requiresBody, bt as isDeleteEndpoint, c as getDestructuredVariables, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as isReferenceObject, ft as ACL_APP_ABILITIES, g as getImportedEndpointName, gn as ANY_SCHEMA, gt as CASL_ABILITY_IMPORT, h as getEndpointPath, ht as CASL_ABILITY_BINDING, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as AXIOS_REQUEST_CONFIG_TYPE, k as getAclImports, kn as AXIOS_IMPORT, l as isInfiniteQuery, m as getEndpointName, mt as ACL_CHECK_HOOK, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pn as isSchemaObject, pt as ACL_APP_ABILITY_FILE, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tn as isParamMediaTypeAllowed, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isBulkDeleteEndpoint, w as getFileNameWithExtension, wt as isUpdateEndpoint, xt as isPathSegmentParam, y as renderMediaUploadMutationBody, yt as isCreateEndpoint, z as getInfiniteQueryOptionsName, zt as QUERY_MODULES_FILE } from "./generate.runner-BvSprH6D.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;
@@ -13,6 +13,31 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
+//#region src/generators/const/acl.const.ts
+const ACL_APP_ABILITY_FILE = {
+	fileName: "acl/app.ability",
+	extension: "ts"
+};
+const ACL_APP_ABILITIES = "AppAbilities";
+const ACL_CHECK_HOOK = "useAclCheck";
+const CASL_ABILITY_BINDING = {
+	abilityTuple: "AbilityTuple",
+	pureAbility: "PureAbility",
+	forcedSubject: "ForcedSubject",
+	subjectType: "Subject",
+	subject: "subject"
+};
+const CASL_ABILITY_IMPORT = {
+	bindings: [
+		CASL_ABILITY_BINDING.abilityTuple,
+		CASL_ABILITY_BINDING.pureAbility,
+		CASL_ABILITY_BINDING.forcedSubject,
+		CASL_ABILITY_BINDING.subjectType,
+		CASL_ABILITY_BINDING.subject
+	],
+	from: "@casl/ability"
+};
+//#endregion
 //#region src/generators/generate/generateAcl.ts
 function generateAcl({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedAcl?.(tag);
@@ -32,7 +57,7 @@ function generateAcl({ resolver, data, tag }) {
 	};
 	const workspaceContextImport = {
 		bindings: ["useWorkspaceContext"],
-		from: PACKAGE_IMPORT_PATH
+		from: CONFIG_PACKAGE_IMPORT_PATH
 	};
 	const lines = [];
 	lines.push(renderImport$4(caslAbilityTupleImport));
@@ -182,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);
@@ -799,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)
 		};
@@ -821,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({
@@ -989,7 +1053,7 @@ function generateQueries(params) {
 	const hasWorkspaceContext = resolver.options.workspaceContext && endpoints.some((endpoint) => getWorkspaceParamNames(resolver, endpoint).length > 0);
 	const workspaceContextImport = {
 		bindings: ["useWorkspaceContext"],
-		from: PACKAGE_IMPORT_PATH
+		from: CONFIG_PACKAGE_IMPORT_PATH
 	};
 	const endpointParams = endpoints.flatMap((endpoint) => endpoint.parameters);
 	const endpointParamsParseSchemas = endpointParams.filter((param) => !["Path", "Header"].includes(param.type)).map((param) => param.parameterSortingEnumSchemaName ?? param.zodSchema);
@@ -1386,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,6 +1,6 @@
-import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-glAKBEGP.mjs";
-import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-7RxjULpB.mjs";
-import { H as getQueryName, In as formatTag, Kt as getNamespaceName, O as getTagImportPath, S as getTsTypeBase, Tt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, en as isMediaTypeAllowed, t as getOpenApiDoc, tn as isParamMediaTypeAllowed, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-BvSprH6D.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-7RxjULpB.mjs → getDataFromOpenAPIDoc-Cyrm3VKA.mjs}

@@ -1,4 +1,4 @@
-import { $t as isMainResponseStatus, At as getZodSchemaName, Cn as STRING_SCHEMA, Dt as getEnumZodSchemaName, En as VOID_SCHEMA, Et as getBodyZodSchemaName, Hn as capitalize, In as formatTag, Jn as Profiler, Jt as escapeControlCharacters, Kn as removeWord, Kt as getNamespaceName, Ln as getEndpointTag, Mn as BODY_PARAMETER_NAME, Nn as JSON_APPLICATION_FORMAT, Nt as isNamedZodSchema, Ot as getParamZodSchemaName, Qt as isErrorStatus, Rn as getOperationTag, Sn as NUMBER_SCHEMA, Tn as UUID_SCHEMA, Tt as invalidVariableNameCharactersToCamel, Un as decapitalize, Wn as getMostCommonAdjacentCombinationSplit, Xt as getSchemaNameByRef, Yt as getParameterEnumNames, Zt as getSchemaRef, _n as BLOB_SCHEMA, an as pathParamToVariableName, bn as ENUM_SCHEMA, cn as unwrapQuotesIfNeeded, d as isQuery, dn as isArraySchemaObject, en as isMediaTypeAllowed, fn as isReferenceObject, gn as ANY_SCHEMA, hn as ALLOWED_PATH_IN, in as isSortingParameterObject, jt as getZodSchemaOperationName, kt as getResponseZodSchemaName, ln as wrapWithQuotesIfNeeded, lt as iterateSchema, mn as ALLOWED_METHODS, nn as isPathExcluded, on as pathToVariableName, pn as isSchemaObject, qn as snakeToCamel, qt as autocorrectRef, rn as isPrimitiveType, s as pick, sn as replaceHyphenatedPath, tn as isParamMediaTypeAllowed, un as inferRequiredSchema, ut as getUniqueArray, vn as DATETIME_SCHEMA, wn as URL_SCHEMA, xn as INT_SCHEMA, yn as EMAIL_SCHEMA, zn as isTagIncluded } from "./generate.runner-BvSprH6D.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/i18n-B_brQh4X.d.mts

@@ -0,0 +1,38 @@
+//#region src/lib/config/i18n.d.ts
+declare const ns = "openapi";
+declare const resources: {
+  readonly en: {
+    readonly openapi: {
+      openapi: {
+        sharedErrors: {
+          dataValidation: string;
+          internalError: string;
+          networkError: string;
+          canceledError: string;
+          unknownError: string;
+          unknownErrorWithCode: string;
+        };
+      };
+    };
+  };
+  readonly sl: {
+    readonly openapi: {
+      openapi: {
+        sharedErrors: {
+          dataValidation: string;
+          internalError: string;
+          networkError: string;
+          canceledError: string;
+          unknownError: string;
+          unknownErrorWithCode: string;
+        };
+      };
+    };
+  };
+};
+type TranslateFunction = (key: string, options?: {
+  ns?: string;
+}) => string;
+declare function configureTranslations<T>(getter: () => T): void;
+//#endregion
+export { resources as i, configureTranslations as n, ns as r, TranslateFunction as t };

package/dist/i18n-D-FesqFb.mjs

@@ -0,0 +1,36 @@
+//#region src/lib/assets/locales/en/translation.json
+var translation_default$1 = { openapi: { "sharedErrors": {
+	"dataValidation": "An error occurred while validating the data",
+	"internalError": "An internal error occurred. This is most likely a bug on our end. Please try again later.",
+	"networkError": "A network error occurred. Are you connected to the internet?",
+	"canceledError": "The request was canceled.",
+	"unknownError": "An unknown error occurred. Please try again later.",
+	"unknownErrorWithCode": "An unknown error occurred. Error code: \"{{code}}\""
+} } };
+//#endregion
+//#region src/lib/assets/locales/sl/translation.json
+var translation_default = { openapi: { "sharedErrors": {
+	"dataValidation": "Pri preverjanju podatkov je prišlo do napake",
+	"internalError": "Prišlo je do notranje napake.",
+	"networkError": "Prišlo je do napake v omrežju.",
+	"canceledError": "Zahteva je bila preklicana.",
+	"unknownError": "Prišlo je do neznane napake.",
+	"unknownErrorWithCode": "Prišlo je do neznane napake. Koda napake: \"{{code}}\""
+} } };
+//#endregion
+//#region src/lib/config/i18n.ts
+const ns = "openapi";
+const resources = {
+	en: { [ns]: translation_default$1 },
+	sl: { [ns]: translation_default }
+};
+let getT = null;
+function configureTranslations(getter) {
+	getT = () => getter();
+}
+function resolveT() {
+	if (!getT) throw new Error("Translations not configured. Call configureTranslations() at app startup.");
+	return getT();
+}
+//#endregion
+export { resources as i, ns as n, resolveT as r, configureTranslations as t };