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

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

@@ -1,4 +1,5 @@
-const require_generate_utils = require("./generate.utils-BJxdEik8.cjs");
+const require_generate_utils = require("./generate.utils-BFeGvk98.cjs");
+let openapi_types = require("openapi-types");
 //#region src/generators/const/acl.const.ts
 const ACL_APP_ABILITY_FILE = {
 	fileName: "acl/app.ability",
@@ -24,6 +25,22 @@ const CASL_ABILITY_IMPORT = {
 	from: "@casl/ability"
 };
 //#endregion
+//#region src/generators/utils/endpoint.utils.ts
+const isGetEndpoint = (endpoint) => endpoint.method === openapi_types.OpenAPIV3.HttpMethods.GET;
+const isPaginatedGetEndpoint = (endpoint, options) => isGetEndpoint(endpoint) && Object.values(options.infiniteQueryParamNames).every((infiniteQueryParam) => endpoint.parameters.some((param) => param.name === infiniteQueryParam && param.type === "Query"));
+//#endregion
+//#region src/generators/utils/query.utils.ts
+const isQuery = (endpoint) => isGetEndpoint(endpoint);
+const isMutation = (endpoint) => !isGetEndpoint(endpoint) || !!endpoint.mediaDownload;
+const isInfiniteQuery = (endpoint, options) => isPaginatedGetEndpoint(endpoint, options);
+const getDestructuredVariables = (resolver, endpoint, updateQueryEndpoints) => {
+	const requiredUpdateQueryParams = updateQueryEndpoints.reduce((acc, updateEndpoint) => [...acc, ...require_generate_utils.mapEndpointParamsToFunctionParams(resolver, updateEndpoint, { includeOnlyRequiredParams: true }).map((param) => param.name)], []);
+	return require_generate_utils.mapEndpointParamsToFunctionParams(resolver, endpoint, {
+		includeOnlyRequiredParams: true,
+		excludeBodyParam: true
+	}).filter((param) => requiredUpdateQueryParams.includes(param.name)).map((param) => param.name);
+};
+//#endregion
 //#region src/generators/core/zod/getZodChain.ts
 const zodChainCache = /* @__PURE__ */ new WeakMap();
 function getZodChain({ schema, meta, options }) {
@@ -758,7 +775,7 @@ function getEndpointAclConditionPropertyType({ resolver, endpoint, acl, name })
 		if (matchingMediaType) {
 			schema = bodyParameter?.bodyObject?.content?.[matchingMediaType]?.schema;
 			required = bodyParameter?.bodyObject?.required;
-			info = `${require_generate_utils.isQuery(endpoint) ? "query" : "mutation"} data`;
+			info = `${isQuery(endpoint) ? "query" : "mutation"} data`;
 			if (pathSplits[index]?.startsWith("$")) index++;
 		}
 	}
@@ -1144,7 +1161,7 @@ function isOperationExcluded(operation, options) {
 	const isIncluded = require_generate_utils.isTagIncluded(tag, options);
 	return isDeprecated || !isIncluded;
 }
-function getOperationName({ path, method, operation, options, tag, keepOperationTag, keepOperationPrefix }) {
+function getOperationName$1({ path, method, operation, options, tag, keepOperationTag, keepOperationPrefix }) {
 	return resolveOperationName({
 		path,
 		method,
@@ -1210,13 +1227,13 @@ function getUniqueOperationName({ operationsByTag, nameIndexes, ...params }) {
 	const { operation, options } = params;
 	const tag = options.splitByTags ? require_generate_utils.getOperationTag(operation, options) : options.defaultTag;
 	const operationName = (keepOperationTag, nameIndex) => {
-		const name = getOperationName({
+		const name = getOperationName$1({
 			...params,
 			tag,
 			keepOperationTag
 		});
 		if (nameIndex) {
-			const pathSourceMatches = nameIndex.pathSourceCount > 0 && getOperationName({
+			const pathSourceMatches = nameIndex.pathSourceCount > 0 && getOperationName$1({
 				...params,
 				operation: {},
 				tag,
@@ -1226,7 +1243,7 @@ function getUniqueOperationName({ operationsByTag, nameIndexes, ...params }) {
 			return (nameIndex.stableCounts.get(name) ?? 0) + (pathSourceMatches ? nameIndex.pathSourceCount : 0) + (pathFallbackMatches ? nameIndex.reservedFallbackCount : 0) === 1 ? name : void 0;
 		}
 		let matchingOperations = 0;
-		for (const candidate of operationsByTag[tag]) if (getOperationName({
+		for (const candidate of operationsByTag[tag]) if (getOperationName$1({
 			...params,
 			operation: candidate,
 			tag,
@@ -1237,7 +1254,7 @@ function getUniqueOperationName({ operationsByTag, nameIndexes, ...params }) {
 		}
 		if (matchingOperations === 1) return name;
 	};
-	return operationName(void 0, nameIndexes?.[0]) ?? operationName(true, nameIndexes?.[1]) ?? getOperationName({
+	return operationName(void 0, nameIndexes?.[0]) ?? operationName(true, nameIndexes?.[1]) ?? getOperationName$1({
 		...params,
 		tag,
 		keepOperationTag: true,
@@ -2021,6 +2038,35 @@ function getTagElement$1(tag, data) {
 	return data.get(tag);
 }
 //#endregion
+//#region src/generators/utils/generate/generate.query.utils.ts
+const operationNameByEndpoint = /* @__PURE__ */ new WeakMap();
+const capitalizedOperationNameByEndpoint = /* @__PURE__ */ new WeakMap();
+function getOperationName(endpoint) {
+	let name = operationNameByEndpoint.get(endpoint);
+	if (name === void 0) {
+		name = require_generate_utils.snakeToCamel(endpoint.operationName);
+		operationNameByEndpoint.set(endpoint, name);
+	}
+	return name;
+}
+function getCapitalizedOperationName(endpoint) {
+	let name = capitalizedOperationNameByEndpoint.get(endpoint);
+	if (name === void 0) {
+		name = require_generate_utils.capitalize(getOperationName(endpoint));
+		capitalizedOperationNameByEndpoint.set(endpoint, name);
+	}
+	return name;
+}
+const getQueryName = (endpoint, mutation) => {
+	const addMutationSuffix = isQuery(endpoint) && isMutation(endpoint) && mutation;
+	return `use${getCapitalizedOperationName(endpoint)}${addMutationSuffix ? "Mutation" : ""}`;
+};
+const getInfiniteQueryName = (endpoint) => `use${getCapitalizedOperationName(endpoint)}Infinite`;
+const getQueryOptionsName = (endpoint) => `${getOperationName(endpoint)}QueryOptions`;
+const getInfiniteQueryOptionsName = (endpoint) => `${getOperationName(endpoint)}InfiniteQueryOptions`;
+const getPrefetchQueryName = (endpoint) => `prefetch${getCapitalizedOperationName(endpoint)}`;
+const getPrefetchInfiniteQueryName = (endpoint) => `prefetch${getCapitalizedOperationName(endpoint)}Infinite`;
+//#endregion
 //#region src/generators/generate/generateAcl.ts
 function generateAcl({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedAcl?.(tag);
@@ -2043,9 +2089,9 @@ function generateAcl({ resolver, data, tag }) {
 		from: require_generate_utils.CONFIG_PACKAGE_IMPORT_PATH
 	};
 	const lines = [];
-	lines.push(renderImport$4(caslAbilityTupleImport));
-	if (hasWorkspaceContext) lines.push(renderImport$4(workspaceContextImport));
-	for (const modelsImport of modelsImports) lines.push(renderImport$4(modelsImport));
+	lines.push(renderImport$3(caslAbilityTupleImport));
+	if (hasWorkspaceContext) lines.push(renderImport$3(workspaceContextImport));
+	for (const modelsImport of modelsImports) lines.push(renderImport$3(modelsImport));
 	lines.push("");
 	if (resolver.options.tsNamespaces) lines.push(`export namespace ${require_generate_utils.getNamespaceName({
 		type: "acl",
@@ -2081,8 +2127,8 @@ function generateAppAcl({ resolver, data }) {
 		typeOnly: true
 	};
 	const lines = [];
-	lines.push(renderImport$4(caslAbilityTupleImport));
-	for (const modelsImport of modelsImports) lines.push(renderImport$4(modelsImport));
+	lines.push(renderImport$3(caslAbilityTupleImport));
+	for (const modelsImport of modelsImports) lines.push(renderImport$3(modelsImport));
 	lines.push("");
 	if (appAbilitiesType) {
 		lines.push(`export type ${ACL_APP_ABILITIES} = `);
@@ -2092,7 +2138,7 @@ function generateAppAcl({ resolver, data }) {
 	lines.push(`export type AppAbility = PureAbility<${ACL_APP_ABILITIES}>;`);
 	return lines.join("\n");
 }
-function renderImport$4(importData) {
+function renderImport$3(importData) {
 	const namedImports = [...importData.bindings, ...(importData.typeBindings ?? []).map((binding) => importData.typeOnly ? binding : `type ${binding}`)];
 	const names = [...importData.defaultImport ? [importData.defaultImport] : [], ...namedImports.length > 0 ? [`{ ${namedImports.join(", ")} }`] : []].join(", ");
 	return `import${importData.typeOnly ? " type" : ""} ${names} from "${importData.from}";`;
@@ -2136,7 +2182,7 @@ function renderAbilityFunction({ resolver, endpoint }) {
 	const abilityConditionsTypes = require_generate_utils.getAbilityConditionsTypes(endpoint) ?? [];
 	const hasConditions = require_generate_utils.hasAbilityConditions(endpoint);
 	const lines = [];
-	const abilityQuery = endpoint.method === "get" ? endpoint.mediaDownload ? `\`${require_generate_utils.getQueryName(endpoint)}\` query or \`${require_generate_utils.getQueryName(endpoint, true)}\` mutation` : `\`${require_generate_utils.getQueryName(endpoint)}\` query` : `\`${require_generate_utils.getQueryName(endpoint)}\` mutation`;
+	const abilityQuery = endpoint.method === "get" ? endpoint.mediaDownload ? `\`${getQueryName(endpoint)}\` query or \`${getQueryName(endpoint, true)}\` mutation` : `\`${getQueryName(endpoint)}\` query` : `\`${getQueryName(endpoint)}\` mutation`;
 	lines.push("/**");
 	lines.push(` * Use for ${abilityQuery} ability. ${hasConditions ? "For global ability, omit the object parameter." : ""}${require_generate_utils.getAbilityDescription(endpoint) ? "" : ""}`);
 	if (require_generate_utils.getAbilityDescription(endpoint)) lines.push(` * @description ${require_generate_utils.getAbilityDescription(endpoint)}`);
@@ -2163,495 +2209,6 @@ function renderConditionType(resolver, endpoint, propertyType) {
 	return require_generate_utils.getAbilityConditionType(propertyType, resolver, require_generate_utils.getEndpointTag(endpoint, resolver.options));
 }
 //#endregion
-//#region src/generators/const/buildConfigs.const.ts
-const BUILD_CONFIG_SUFFIX = "config";
-//#endregion
-//#region src/generators/utils/generate/generate.configs.utils.ts
-function getBuilderConfigs({ data, tag, resolver }) {
-	const endpoints = data.get(tag)?.endpoints;
-	if (!endpoints || endpoints.length === 0) return {
-		configs: [],
-		hasZodImport: false,
-		modelsImports: [],
-		queriesImports: [],
-		aclImports: []
-	};
-	const extendedEndpoints = endpoints.map((endpoint) => ({
-		...endpoint,
-		pathSegments: require_generate_utils.getPathSegments(endpoint.path)
-	}));
-	const namedReadAllEndpoints = resolveBuilderConfigNames(extendedEndpoints.filter((endpoint) => require_generate_utils.isReadAllEndpoint(endpoint, resolver.options)));
-	let hasZodImport = false;
-	const importedZodSchemas = [];
-	const importedEndpoints = [];
-	const importedInfiniteEndpoints = [];
-	const configs = Object.entries(namedReadAllEndpoints).map(([name, readAllEndpoint]) => {
-		const columnsConfig = getColumnsConfig(resolver, readAllEndpoint);
-		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.sortableEnumSchemaName) importedZodSchemas.push(columnsConfig.sortableEnumSchemaName);
-		const filter = readAllEndpoint.parameters.find((param) => param.name === resolver.options.filterParamName);
-		if (filter) importedZodSchemas.push(filter.zodSchema);
-		const config = {
-			name,
-			title: require_generate_utils.capitalize(require_generate_utils.camelToSpaceSeparated(name.replace(/config$/i, ""))),
-			readAll: {
-				acl: getAclConfig(readAllEndpoint, resolver.options),
-				paginated: require_generate_utils.getImportedQueryName(readAllEndpoint, resolver.options),
-				infinite: resolver.options.infiniteQueries ? require_generate_utils.getImportedInfiniteQueryName(readAllEndpoint, resolver.options) : void 0,
-				filters: getInputsConfig(resolver, filter),
-				columns: columnsConfig.columns
-			}
-		};
-		const readEndpoint = extendedEndpoints.find((endpoint) => require_generate_utils.isReadEndpoint(endpoint, readAllEndpoint));
-		if (readEndpoint) {
-			importedEndpoints.push(readEndpoint);
-			let responseSchema = readEndpoint.response;
-			if (require_generate_utils.isNamedZodSchema(responseSchema)) {
-				importedZodSchemas.push(responseSchema);
-				responseSchema = require_generate_utils.getImportedZodSchemaName(resolver, responseSchema);
-			} else hasZodImport = true;
-			config.read = {
-				acl: getAclConfig(readEndpoint, resolver.options),
-				schema: responseSchema,
-				query: require_generate_utils.getImportedQueryName(readEndpoint, resolver.options)
-			};
-		}
-		const createEndpoint = extendedEndpoints.find((endpoint) => require_generate_utils.isCreateEndpoint(endpoint, readAllEndpoint));
-		if (createEndpoint) {
-			importedEndpoints.push(createEndpoint);
-			const body = require_generate_utils.getEndpointBody(createEndpoint);
-			if (body) {
-				importedZodSchemas.push(body.zodSchema);
-				config.create = {
-					acl: getAclConfig(createEndpoint, resolver.options),
-					schema: require_generate_utils.getImportedZodSchemaName(resolver, body.zodSchema),
-					mutation: createEndpoint,
-					inputDefs: getInputsConfig(resolver, body)
-				};
-			}
-		}
-		const updateEndpoint = extendedEndpoints.find((endpoint) => require_generate_utils.isUpdateEndpoint(endpoint, readAllEndpoint));
-		if (updateEndpoint) {
-			importedEndpoints.push(updateEndpoint);
-			const body = require_generate_utils.getEndpointBody(updateEndpoint);
-			if (body) {
-				importedZodSchemas.push(body.zodSchema);
-				config.update = {
-					acl: getAclConfig(updateEndpoint, resolver.options),
-					schema: require_generate_utils.getImportedZodSchemaName(resolver, body.zodSchema),
-					mutation: updateEndpoint,
-					inputDefs: getInputsConfig(resolver, body)
-				};
-			}
-		}
-		const deleteEndpoint = extendedEndpoints.find((endpoint) => require_generate_utils.isDeleteEndpoint(endpoint, readAllEndpoint));
-		if (deleteEndpoint) {
-			importedEndpoints.push(deleteEndpoint);
-			const body = require_generate_utils.getEndpointBody(deleteEndpoint);
-			if (body) {
-				importedZodSchemas.push(body.zodSchema);
-				config.delete = {
-					acl: getAclConfig(deleteEndpoint, resolver.options),
-					mutation: deleteEndpoint
-				};
-			}
-		}
-		const bulkDeleteEndpoint = extendedEndpoints.find((endpoint) => require_generate_utils.isBulkDeleteEndpoint(endpoint, readAllEndpoint));
-		if (bulkDeleteEndpoint) {
-			importedEndpoints.push(bulkDeleteEndpoint);
-			const body = require_generate_utils.getEndpointBody(bulkDeleteEndpoint);
-			if (body) {
-				importedZodSchemas.push(body.zodSchema);
-				config.bulkDelete = {
-					acl: getAclConfig(bulkDeleteEndpoint, resolver.options),
-					schema: require_generate_utils.getImportedZodSchemaName(resolver, body.zodSchema),
-					mutation: bulkDeleteEndpoint,
-					inputDefs: getInputsConfig(resolver, body)
-				};
-			}
-		}
-		return config;
-	});
-	const modelsImports = require_generate_utils.getModelsImports({
-		resolver,
-		tag,
-		zodSchemas: importedZodSchemas
-	});
-	const queriesImports = require_generate_utils.getQueriesImports({
-		tag,
-		endpoints: importedEndpoints,
-		options: resolver.options
-	});
-	const infiniteQueriesImports = resolver.options.infiniteQueries ? require_generate_utils.getInfiniteQueriesImports({
-		tag,
-		endpoints: importedInfiniteEndpoints,
-		options: resolver.options
-	}) : [];
-	const aclImports = require_generate_utils.getAclImports({
-		tag,
-		endpoints: importedEndpoints.filter((endpoint) => endpoint.acl),
-		options: resolver.options
-	});
-	return {
-		configs: configs.filter(Boolean),
-		hasZodImport,
-		modelsImports,
-		queriesImports: require_generate_utils.mergeImports(resolver.options, queriesImports, infiniteQueriesImports),
-		aclImports
-	};
-}
-function resolveBuilderConfigNames(endpoints) {
-	const sortedEndpoints = endpoints.map((endpoint) => ({
-		...endpoint,
-		namePathSegments: endpoint.pathSegments.filter((segment) => !require_generate_utils.isPathSegmentParam(segment))
-	})).toSorted((a, b) => a.namePathSegments.length - b.namePathSegments.length);
-	const namedEndpoints = {};
-	for (const endpoint of sortedEndpoints) {
-		const namePathSegments = endpoint.namePathSegments;
-		let name = namePathSegments.length > 0 ? `${require_generate_utils.kebabToCamel(namePathSegments.pop())}${require_generate_utils.capitalize(BUILD_CONFIG_SUFFIX)}` : BUILD_CONFIG_SUFFIX;
-		while (namedEndpoints[name]) {
-			if (namePathSegments.length === 0) throw new Error(`Can't uniquely resolve builder config name: ${name}`);
-			name = `${require_generate_utils.kebabToCamel(namePathSegments.pop())}${require_generate_utils.capitalize(name)}`;
-		}
-		namedEndpoints[name] = endpoint;
-	}
-	return namedEndpoints;
-}
-function getAclConfig(endpoint, options) {
-	return options.acl && endpoint.acl ? require_generate_utils.getImportedAbilityFunctionName(endpoint, options) : void 0;
-}
-function getInputsConfig(resolver, endpointParameter) {
-	if (!endpointParameter) return;
-	let schema;
-	if (endpointParameter.type === "Body") schema = endpointParameter.bodyObject?.content?.[require_generate_utils.JSON_APPLICATION_FORMAT]?.schema;
-	else schema = endpointParameter.parameterObject?.schema;
-	if (!schema) return;
-	const schemaObj = resolver.resolveObject(schema);
-	const inputs = Object.keys(schemaObj?.properties ?? {}).reduce((acc, key) => ({
-		...acc,
-		[key]: true
-	}), {});
-	return {
-		schema: require_generate_utils.getImportedZodSchemaName(resolver, endpointParameter.zodSchema),
-		options: { inputs }
-	};
-}
-function resolveReadAllItemZodSchema(resolver, endpoint, itemSchema, itemsPropertyKey) {
-	if (require_generate_utils.isReferenceObject(itemSchema)) return resolver.getZodSchemaNameByRef(itemSchema.$ref);
-	if (require_generate_utils.isNamedZodSchema(endpoint.response)) return `${require_generate_utils.getImportedZodSchemaName(resolver, endpoint.response)}.shape.${itemsPropertyKey}.element`;
-	return require_generate_utils.ANY_SCHEMA;
-}
-function getColumnsConfig(resolver, endpoint) {
-	const endpointResponse = endpoint.responseObject;
-	if (!endpointResponse) return;
-	const schema = endpointResponse.content?.[require_generate_utils.JSON_APPLICATION_FORMAT]?.schema;
-	if (!schema) return;
-	const properties = getSchemaProperties(resolver, schema);
-	const arrayPropertyKeys = Object.keys(properties).filter((key) => resolver.resolveObject(properties[key]).type === "array");
-	arrayPropertyKeys.sort((a, b) => {
-		const aIndex = resolver.options.dataResponseParamNames.indexOf(a);
-		const bIndex = resolver.options.dataResponseParamNames.indexOf(b);
-		if (aIndex !== -1 && bIndex !== -1) return aIndex - bIndex;
-		if (aIndex !== -1) return -1;
-		if (bIndex !== -1) return 1;
-		return a.localeCompare(b);
-	});
-	const propertyKey = arrayPropertyKeys[0];
-	if (!propertyKey) return;
-	const dataSchemaObj = resolver.resolveObject(properties[propertyKey]);
-	if (!dataSchemaObj || dataSchemaObj.type !== "array") return;
-	const itemSchema = dataSchemaObj.items;
-	const itemSchemaObj = resolver.resolveObject(itemSchema);
-	if (!itemSchemaObj) return;
-	const zodSchema = resolveReadAllItemZodSchema(resolver, endpoint, itemSchema, propertyKey);
-	const columns = Object.keys(itemSchemaObj?.properties ?? {}).reduce((acc, key) => ({
-		...acc,
-		[key]: true
-	}), {});
-	const sortableEnumSchemaName = endpoint.parameters.find((param) => param.parameterSortingEnumSchemaName)?.parameterSortingEnumSchemaName;
-	return {
-		columns: {
-			schema: require_generate_utils.getImportedZodSchemaName(resolver, zodSchema),
-			options: {
-				columns,
-				sortable: sortableEnumSchemaName ? require_generate_utils.getImportedZodSchemaName(resolver, sortableEnumSchemaName) : void 0
-			}
-		},
-		zodSchema,
-		sortableEnumSchemaName
-	};
-}
-function getSchemaProperties(resolver, schema) {
-	const schemaObj = resolver.resolveObject(schema);
-	if (schemaObj.properties) return schemaObj.properties;
-	else if ("allOf" in schemaObj && schemaObj.allOf) return schemaObj.allOf.reduce((acc, cur) => ({
-		...acc,
-		...getSchemaProperties(resolver, cur)
-	}), {});
-	return {};
-}
-//#endregion
-//#region src/generators/const/queries.const.ts
-const QUERY_HOOKS = {
-	query: "useQuery",
-	infiniteQuery: "useInfiniteQuery",
-	mutation: "useMutation"
-};
-const QUERY_IMPORT = {
-	bindings: [
-		QUERY_HOOKS.query,
-		QUERY_HOOKS.infiniteQuery,
-		QUERY_HOOKS.mutation
-	],
-	from: "@tanstack/react-query"
-};
-const QUERIES_MODULE_NAME = "moduleName";
-//#endregion
-//#region src/generators/generate/generateConfigs.ts
-function generateConfigs(generateTypeParams) {
-	const { configs, hasZodImport, modelsImports, queriesImports, aclImports } = getBuilderConfigs(generateTypeParams);
-	if (configs.length === 0) return;
-	const { resolver, tag } = generateTypeParams;
-	const endpoints = configs.flatMap((config) => [
-		config.create?.mutation,
-		config.update?.mutation,
-		config.delete?.mutation,
-		config.bulkDelete?.mutation
-	]).filter((m) => typeof m !== "string" && m !== void 0);
-	const hasMutation = endpoints.length > 0;
-	const hasAclCheck = resolver.options.checkAcl && endpoints.some((e) => e.acl);
-	const hasMutationEffects = resolver.options.mutationEffects && hasMutation;
-	const hasMutationDefaultOnError = resolver.options.mutationDefaultOnError && hasMutation;
-	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
-	const nativeClient = resolver.options.restClient === "native";
-	const hasAxiosDefaultImport = !nativeClient && endpoints.some((e) => e.mediaUpload);
-	const hasAxiosImport = !nativeClient && (hasAxiosRequestConfig || hasAxiosDefaultImport);
-	const axiosImport = {
-		defaultImport: hasAxiosDefaultImport ? require_generate_utils.AXIOS_DEFAULT_IMPORT_NAME : void 0,
-		bindings: [],
-		typeBindings: hasAxiosImport ? [require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE] : [],
-		from: "axios"
-	};
-	const nativeImport = {
-		bindings: [],
-		typeBindings: nativeClient && hasAxiosRequestConfig ? [require_generate_utils.getRequestConfigTypeName("native")] : [],
-		from: require_generate_utils.REST_PACKAGE_IMPORT_PATH
-	};
-	const appRestClientImport = {
-		bindings: [require_generate_utils.APP_REST_CLIENT_NAME],
-		from: require_generate_utils.getAppRestClientImportPath(resolver.options)
-	};
-	const endpointsImports = require_generate_utils.getEndpointsImports({
-		tag,
-		endpoints,
-		options: resolver.options
-	});
-	const queryImport = {
-		bindings: [QUERY_HOOKS.mutation],
-		from: "@tanstack/react-query"
-	};
-	const queryTypesImport = {
-		bindings: [...hasMutationDefaultOnError ? ["OpenApiQueryConfig"] : []],
-		typeBindings: [require_generate_utils.QUERY_OPTIONS_TYPES.mutation],
-		from: require_generate_utils.getQueryTypesImportPath(resolver.options)
-	};
-	const mutationEffectsImport = {
-		bindings: [require_generate_utils.MUTATION_EFFECTS.hookName],
-		typeBindings: [require_generate_utils.MUTATION_EFFECTS.optionsType],
-		from: resolver.options.mutationEffectsImportPath
-	};
-	const queryModulesImport = {
-		bindings: [require_generate_utils.QUERY_MODULE_ENUM],
-		from: require_generate_utils.getQueryModulesImportPath(resolver.options)
-	};
-	const aclCheckImport = {
-		bindings: [ACL_CHECK_HOOK],
-		from: resolver.options.aclCheckImportPath
-	};
-	const hasDynamicInputsImport = configs.some((config) => config.readAll.filters || config.create?.inputDefs || config.update?.inputDefs);
-	const dynamicInputsImport = {
-		bindings: [require_generate_utils.BUILDERS_UTILS.dynamicInputs],
-		from: resolver.options.dynamicInputsImportPath
-	};
-	const hasDynamicColumnsImport = configs.some((config) => config.readAll.columns);
-	const dynamicColumnsImport = {
-		bindings: [require_generate_utils.BUILDERS_UTILS.dynamicColumns],
-		from: resolver.options.dynamicColumnsImportPath
-	};
-	const lines = [];
-	if (hasAxiosImport) lines.push(renderImport$3(axiosImport));
-	if (nativeImport.typeBindings?.length) lines.push(renderImport$3(nativeImport));
-	if (nativeClient && endpoints.some((endpoint) => endpoint.mediaUpload)) lines.push(renderImport$3(appRestClientImport));
-	if (hasZodImport) lines.push(renderImport$3(require_generate_utils.ZOD_IMPORT));
-	if (hasDynamicInputsImport) lines.push(renderImport$3(dynamicInputsImport));
-	if (hasDynamicColumnsImport) lines.push(renderImport$3(dynamicColumnsImport));
-	for (const modelsImport of modelsImports) lines.push(renderImport$3(modelsImport));
-	for (const queriesImport of queriesImports) lines.push(renderImport$3(queriesImport));
-	for (const endpointsImport of endpointsImports) lines.push(renderImport$3(endpointsImport));
-	if (hasMutation) {
-		lines.push(renderImport$3(queryImport));
-		lines.push(renderImport$3(queryTypesImport));
-		if (hasMutationEffects) {
-			lines.push(renderImport$3(queryModulesImport));
-			lines.push(renderImport$3(mutationEffectsImport));
-		}
-		if (hasAclCheck) lines.push(renderImport$3(aclCheckImport));
-	}
-	for (const aclImport of aclImports) lines.push(renderImport$3(aclImport));
-	lines.push("");
-	if (resolver.options.tsNamespaces) lines.push(`export namespace ${require_generate_utils.getNamespaceName({
-		type: "configs",
-		tag,
-		options: resolver.options
-	})} {`);
-	for (const config of configs) {
-		lines.push(renderBuilderConfig(config, generateTypeParams));
-		lines.push("");
-	}
-	if (resolver.options.tsNamespaces) lines.push("}");
-	return lines.join("\n").trimEnd() + "\n";
-}
-function renderImport$3(importData) {
-	const namedImports = [...importData.bindings, ...(importData.typeBindings ?? []).map((binding) => importData.typeOnly ? binding : `type ${binding}`)];
-	const names = [...importData.defaultImport ? [importData.defaultImport] : [], ...namedImports.length > 0 ? [`{ ${namedImports.join(", ")} }`] : []].join(", ");
-	return `import${importData.typeOnly ? " type" : ""} ${names} from "${importData.from}";`;
-}
-function renderInputsConfig(inputsConfig) {
-	const lines = [];
-	lines.push("{");
-	lines.push(`  schema: ${inputsConfig.schema},`);
-	lines.push("  options: {");
-	lines.push("    inputs: {");
-	for (const key of Object.keys(inputsConfig.options.inputs)) lines.push(`      ${key}: true,`);
-	lines.push("    },");
-	lines.push("  },");
-	lines.push("}");
-	return lines.join("\n");
-}
-function renderColumnsConfig(columnsConfig) {
-	const lines = [];
-	lines.push("{");
-	lines.push(`  schema: ${columnsConfig.schema},`);
-	lines.push("  options: {");
-	lines.push("    columns: {");
-	for (const key of Object.keys(columnsConfig.options.columns)) lines.push(`      ${key}: true,`);
-	lines.push("    },");
-	if (columnsConfig.options.sortable) lines.push(`    sortable: ${columnsConfig.options.sortable},`);
-	lines.push("  },");
-	lines.push("}");
-	return lines.join("\n");
-}
-function renderMutationContent(resolver, endpoint, tag) {
-	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
-	const hasMutationEffects = resolver.options.mutationEffects;
-	const hasMutationDefaultOnError = resolver.options.mutationDefaultOnError;
-	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
-	const endpointTag = require_generate_utils.getEndpointTag(endpoint, resolver.options);
-	const endpointParams = require_generate_utils.mapEndpointParamsToFunctionParams(resolver, endpoint, {
-		includeFileParam: true,
-		modelNamespaceTag: endpointTag
-	});
-	const endpointParamsStr = endpointParams.map((p) => `${p.name}${p.required ? "" : "?"}: ${p.type}`).join("; ");
-	const destructuredMutationArgs = endpointParams.map((p) => p.name).join(", ");
-	const resolvedEndpointArgs = require_generate_utils.mapEndpointParamsToFunctionParams(resolver, endpoint, { modelNamespaceTag: endpointTag }).map((p) => p.name).join(", ");
-	const endpointFunction = require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
-	const mutationVariablesType = endpoint.mediaUpload ? `{ ${endpointParamsStr}${endpointParamsStr ? "; " : ""}abortController?: AbortController; onUploadProgress?: (progress: { loaded: number; total: number }) => void }` : `{ ${endpointParamsStr} }`;
-	const lines = [];
-	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 } = ${ACL_CHECK_HOOK}();`);
-	lines.push("");
-	lines.push(`  return ${QUERY_HOOKS.mutation}({`);
-	const mutationFnArg = destructuredMutationArgs ? `{ ${destructuredMutationArgs}${endpoint.mediaUpload ? `${destructuredMutationArgs ? ", " : ""}abortController, onUploadProgress` : ""} }` : "";
-	lines.push(`    mutationFn: ${endpoint.mediaUpload ? "async " : ""}(${mutationFnArg}) => {`);
-	if (hasAclCheck) lines.push(require_generate_utils.renderAclCheckCall(resolver, endpoint, void 0, "      "));
-	if (endpoint.mediaUpload) lines.push(...require_generate_utils.renderMediaUploadMutationBody({
-		resolver,
-		endpointFunction,
-		resolvedEndpointArgs
-	}).map((line) => `      ${line}`));
-	else lines.push(`      return ${endpointFunction}(${destructuredMutationArgs}${hasAxiosRequestConfig ? `${destructuredMutationArgs ? ", " : ""}config` : ""});`);
-	lines.push("    },");
-	lines.push("    ...options,");
-	if (hasMutationDefaultOnError) lines.push("    onError: options?.onError ?? queryConfig.onError,");
-	if (hasMutationEffects) {
-		lines.push("    onSuccess: async (resData, variables, onMutateResult, context) => {");
-		lines.push("      await runMutationEffects(resData, variables, options);");
-		lines.push("      options?.onSuccess?.(resData, variables, onMutateResult, context);");
-		lines.push("    },");
-	}
-	lines.push("  });");
-	lines.push("}");
-	return lines.map((line) => "        " + line).join("\n").trimStart();
-}
-function renderBuilderConfig(config, params) {
-	const { resolver, tag } = params;
-	const lines = [];
-	lines.push(`export const ${config.name} = {`);
-	lines.push("    meta: {");
-	lines.push(`        title: "${config.title}",`);
-	lines.push("    },");
-	lines.push("    readAll: {");
-	if (config.readAll.acl) lines.push(`        acl: ${config.readAll.acl},`);
-	lines.push(`        schema: ${config.readAll.columns.schema},`);
-	lines.push(`        paginated: ${config.readAll.paginated},`);
-	if (config.readAll.infinite) lines.push(`        infinite: ${config.readAll.infinite},`);
-	if (config.readAll.filters) {
-		lines.push("        filters: {");
-		lines.push(`            schema: ${config.readAll.filters.schema},`);
-		lines.push(`            filterDefs: ${require_generate_utils.BUILDERS_UTILS.dynamicInputs}(${renderInputsConfig(config.readAll.filters)})`);
-		lines.push("        },");
-	}
-	lines.push(`        columns: ${require_generate_utils.BUILDERS_UTILS.dynamicColumns}(${renderColumnsConfig(config.readAll.columns)}),`);
-	lines.push("    },");
-	if (config.read) {
-		lines.push("    read: {");
-		if (config.read.acl) lines.push(`        acl: ${config.read.acl},`);
-		lines.push(`        schema: ${config.read.schema},`);
-		lines.push(`        query: ${config.read.query},`);
-		lines.push("    },");
-	}
-	if (config.create) {
-		lines.push("    create: {");
-		if (config.create.acl) lines.push(`        acl: ${config.create.acl},`);
-		if (config.create.schema) lines.push(`        schema: ${config.create.schema},`);
-		lines.push(`        mutation: ${typeof config.create.mutation === "string" ? config.create.mutation : renderMutationContent(resolver, config.create.mutation, tag)},`);
-		if (config.create.inputDefs) lines.push(`        inputDefs: ${require_generate_utils.BUILDERS_UTILS.dynamicInputs}(${renderInputsConfig(config.create.inputDefs)})`);
-		lines.push("    },");
-	}
-	if (config.update) {
-		lines.push("    update: {");
-		if (config.update.acl) lines.push(`        acl: ${config.update.acl},`);
-		if (config.update.schema) lines.push(`        schema: ${config.update.schema},`);
-		lines.push(`        mutation: ${typeof config.update.mutation === "string" ? config.update.mutation : renderMutationContent(resolver, config.update.mutation, tag)},`);
-		if (config.update.inputDefs) lines.push(`        inputDefs: ${require_generate_utils.BUILDERS_UTILS.dynamicInputs}(${renderInputsConfig(config.update.inputDefs)})`);
-		lines.push("    },");
-	}
-	if (config.delete) {
-		lines.push("    delete: {");
-		if (config.delete.acl) lines.push(`        acl: ${config.delete.acl},`);
-		lines.push(`        mutation: ${typeof config.delete.mutation === "string" ? config.delete.mutation : renderMutationContent(resolver, config.delete.mutation, tag)},`);
-		lines.push("    },");
-	}
-	if (config.bulkDelete) {
-		lines.push("    bulkDelete: {");
-		if (config.bulkDelete.acl) lines.push(`        acl: ${config.bulkDelete.acl},`);
-		if (config.bulkDelete.schema) lines.push(`        schema: ${config.bulkDelete.schema},`);
-		lines.push(`        mutation: ${typeof config.bulkDelete.mutation === "string" ? config.bulkDelete.mutation : renderMutationContent(resolver, config.bulkDelete.mutation, tag)},`);
-		if (config.bulkDelete.inputDefs) lines.push(`        inputDefs: ${require_generate_utils.BUILDERS_UTILS.dynamicInputs}(${renderInputsConfig(config.bulkDelete.inputDefs)})`);
-		lines.push("    },");
-	}
-	lines.push("};");
-	return lines.join("\n");
-}
-//#endregion
 //#region src/generators/generate/generateEndpoints.ts
 function generateEndpoints({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedEndpoints?.(tag);
@@ -2784,6 +2341,83 @@ function renderEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 	return lines.join("\n        ");
 }
 //#endregion
+//#region src/generators/utils/generate/generate.lazy.utils.ts
+const ONCE_HELPER_LINES = [
+	"const once = <T>(create: () => T) => {",
+	"  let value: T | undefined;",
+	"  return () => (value ??= create());",
+	"};"
+];
+const isIdentifierChar = (char) => /[A-Za-z0-9_$]/.test(char);
+const findLiteralEnd = (code, start, quote) => {
+	let index = start + 1;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\\") {
+			index += 2;
+			continue;
+		}
+		index += 1;
+		if (char === quote) break;
+	}
+	return Math.min(index, code.length);
+};
+const findRegexEnd = (code, start) => {
+	let escaped = false;
+	let characterClass = false;
+	for (let index = start + 1; index < code.length; index += 1) {
+		const char = code[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (char === "[") characterClass = true;
+		if (char === "]") characterClass = false;
+		if (char === "/" && !characterClass) return index + 1;
+	}
+	return code.length;
+};
+/**
+* Rewrites bare references to sibling schemas (`PetSchema`) into factory calls (`PetSchema()`).
+* Member accesses (`CommonModels.PetSchema`, `.enum`), object keys and literal values are left alone.
+*/
+function callLazySchemaReferences(code, schemaNames) {
+	let output = "";
+	let index = 0;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "\"" || char === "'" || char === "`") {
+			const end = findLiteralEnd(code, index, char);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (char === "/" && output.trimEnd().endsWith(".regex(")) {
+			const end = findRegexEnd(code, index);
+			output += code.slice(index, end);
+			index = end;
+			continue;
+		}
+		if (isIdentifierChar(char)) {
+			let end = index + 1;
+			while (end < code.length && isIdentifierChar(code[end])) end += 1;
+			const identifier = code.slice(index, end);
+			const isMemberAccess = output.endsWith(".");
+			const isObjectKey = code.slice(end).trimStart().startsWith(":");
+			output += schemaNames.has(identifier) && !isMemberAccess && !isObjectKey ? `${identifier}()` : identifier;
+			index = end;
+			continue;
+		}
+		output += char;
+		index += 1;
+	}
+	return output;
+}
+//#endregion
 //#region src/generators/generate/generateModels.ts
 function generateModels({ resolver, data, tag }) {
 	const nativeContent = resolver.getNativeRenderedModels?.(tag);
@@ -2819,6 +2453,12 @@ function generateModels({ resolver, data, tag }) {
 	lines.push(renderImport$1(require_generate_utils.ZOD_IMPORT));
 	for (const modelsImport of modelsImports) lines.push(renderImport$1(modelsImport));
 	lines.push("");
+	if (resolver.options.lazySchemas && resolver.options.tsNamespaces) return renderLazyModels({
+		resolver,
+		tag,
+		zodSchemasData,
+		lines
+	});
 	if (resolver.options.tsNamespaces) lines.push(`export namespace ${require_generate_utils.getNamespaceName({
 		type: "models",
 		tag,
@@ -2843,6 +2483,50 @@ function generateModels({ resolver, data, tag }) {
 	if (resolver.options.tsNamespaces) lines.push("}");
 	return lines.join("\n").trimEnd() + "\n";
 }
+function renderLazyModels({ resolver, tag, zodSchemasData, lines }) {
+	const namespace = require_generate_utils.getNamespaceName({
+		type: "models",
+		tag,
+		options: resolver.options
+	});
+	const schemaNames = new Set(Object.keys(zodSchemasData));
+	const members = [];
+	const types = [];
+	lines.push(...ONCE_HELPER_LINES, "");
+	for (const [name, zodSchema] of Object.entries(zodSchemasData)) {
+		const inferredTypeName = require_generate_utils.getZodSchemaInferedTypeName(name, resolver.options);
+		const typeAnnotation = zodSchema.isCircular ? `: () => z.ZodObject<z.ZodRawShape> & z.ZodType<${namespace}.${inferredTypeName}>` : "";
+		const schemaCode = resolver.options.compileSchemas && !zodSchema.isCircular ? `z.compile(${zodSchema.code})` : zodSchema.code;
+		lines.push(`const ${name}${typeAnnotation} = once(() => ${callLazySchemaReferences(schemaCode, schemaNames)});`);
+		members.push(...indent(renderModelJsDocs({
+			name,
+			zodSchema,
+			tag,
+			resolver
+		}).split("\n")));
+		members.push(...renderLazyMember(name, `${name}()`));
+		if (zodSchema.isCircular && zodSchema.schemaObj) types.push(`  export type ${inferredTypeName} = ${renderSchemaType(zodSchema.schemaObj, resolver)};`);
+		else types.push(`  export type ${inferredTypeName} = z.infer<typeof ${namespace}.${name}>;`);
+		if (zodSchema.isEnum) {
+			lines.push(`const ${inferredTypeName} = once(() => ${name}().enum);`);
+			members.push(...renderLazyMember(inferredTypeName, `${inferredTypeName}()`));
+		}
+	}
+	lines.push("");
+	lines.push(`export const ${namespace} = {`, ...members, "};");
+	lines.push(`export declare namespace ${namespace} {`, ...types, "}");
+	return lines.join("\n") + "\n";
+}
+function renderLazyMember(name, value) {
+	return [
+		`  get ${name}() {`,
+		`    return ${value};`,
+		`  },`
+	];
+}
+function indent(lines) {
+	return lines.map((line) => `  ${line}`);
+}
 function renderSchemaType(schema, resolver) {
 	if (require_generate_utils.isReferenceObject(schema)) {
 		const schemaName = resolver.getZodSchemaNameByRef(schema.$ref);
@@ -2901,6 +2585,20 @@ function renderModelsProxy({ resolver, data, tag }) {
 	})}`;
 	const inferredTypeNames = schemaNames.map((schemaName) => require_generate_utils.getZodSchemaInferedTypeName(schemaName, resolver.options));
 	const enumInferredTypeNames = schemaNames.filter((schemaName) => require_generate_utils.isEnumZodSchema(commonZodSchemas[schemaName] ?? "")).map((schemaName) => require_generate_utils.getZodSchemaInferedTypeName(schemaName, resolver.options));
+	if (resolver.options.tsNamespaces && resolver.options.lazySchemas) {
+		const lines = [];
+		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);
+		lines.push("");
+		lines.push(`export const ${modelsNamespace} = {`);
+		for (const schemaName of schemaNames) lines.push(...renderLazyMember(schemaName, `${commonNamespace}.${schemaName}`));
+		for (const enumName of enumInferredTypeNames) lines.push(...renderLazyMember(enumName, `${commonNamespace}.${enumName}`));
+		lines.push("};");
+		lines.push(`export declare namespace ${modelsNamespace} {`);
+		for (const typeName of inferredTypeNames) lines.push(`  export type ${typeName} = ${commonNamespace}.${typeName};`);
+		lines.push("}");
+		lines.push("");
+		return lines.join("\n");
+	}
 	if (resolver.options.tsNamespaces) {
 		const lines = [];
 		lines.push(`import { ${commonNamespace} } from "${commonModelsPath}";`);
@@ -2963,6 +2661,22 @@ function renderModelJsDocs({ name, zodSchema, tag, resolver }) {
 	return lines.join("\n");
 }
 //#endregion
+//#region src/generators/const/queries.const.ts
+const QUERY_HOOKS = {
+	query: "useQuery",
+	infiniteQuery: "useInfiniteQuery",
+	mutation: "useMutation"
+};
+const QUERY_IMPORT = {
+	bindings: [
+		QUERY_HOOKS.query,
+		QUERY_HOOKS.infiniteQuery,
+		QUERY_HOOKS.mutation
+	],
+	from: "@tanstack/react-query"
+};
+const QUERIES_MODULE_NAME = "moduleName";
+//#endregion
 //#region src/generators/generate/generateQueries.ts
 const endpointParamMappingCache = /* @__PURE__ */ new WeakMap();
 const workspaceParamNamesCache = /* @__PURE__ */ new WeakMap();
@@ -3294,9 +3008,9 @@ function addAsteriskAfterNewLine(str) {
 }
 function renderQueryJsDocs({ resolver, endpoint, mode, tag }) {
 	const lines = ["/** "];
-	if (mode === "infiniteQuery") lines.push(` * Infinite query \`${require_generate_utils.getInfiniteQueryName(endpoint)}${endpoint.summary ? "" : ""}`);
-	else if (mode === "query") lines.push(` * Query \`${require_generate_utils.getQueryName(endpoint)}\`${endpoint.summary && endpoint.mediaDownload ? " - recommended when file should be cached" : ""}`);
-	else lines.push(` * Mutation \`${require_generate_utils.getQueryName(endpoint, true)}\`${endpoint.summary && endpoint.mediaDownload ? " - recommended when file should not be cached" : ""}`);
+	if (mode === "infiniteQuery") lines.push(` * Infinite query \`${getInfiniteQueryName(endpoint)}${endpoint.summary ? "" : ""}`);
+	else if (mode === "query") lines.push(` * Query \`${getQueryName(endpoint)}\`${endpoint.summary && endpoint.mediaDownload ? " - recommended when file should be cached" : ""}`);
+	else lines.push(` * Mutation \`${getQueryName(endpoint, true)}\`${endpoint.summary && endpoint.mediaDownload ? " - recommended when file should not be cached" : ""}`);
 	if (endpoint.summary) lines.push(` * @summary ${addAsteriskAfterNewLine(endpoint.summary)}`);
 	if (endpoint.description) lines.push(` * @description ${addAsteriskAfterNewLine(endpoint.description)}`);
 	if (endpoint.acl) lines.push(` * @permission Requires \`${require_generate_utils.getAbilityFunctionName(endpoint)}\` ability `);
@@ -3328,7 +3042,7 @@ function renderQueryKeys({ resolver, queryEndpoints, tag }) {
 			pathParamsRequiredOnly: true,
 			modelNamespaceTag: tag
 		})}) => [...keys.all, "${endpoint.path}", ${renderEndpointArgs(resolver, endpoint, {})}] as const,`);
-		if (resolver.options.infiniteQueries && require_generate_utils.isInfiniteQuery(endpoint, resolver.options)) lines.push(`    ${require_generate_utils.getEndpointName(endpoint)}Infinite: (${renderEndpointParams(resolver, endpoint, {
+		if (resolver.options.infiniteQueries && isInfiniteQuery(endpoint, resolver.options)) lines.push(`    ${require_generate_utils.getEndpointName(endpoint)}Infinite: (${renderEndpointParams(resolver, endpoint, {
 			excludePageParam: true,
 			pathParamsRequiredOnly: true,
 			modelNamespaceTag: tag
@@ -3411,7 +3125,7 @@ function renderQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const endpointFunction = inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const lines = [];
-	lines.push(`const ${require_generate_utils.getQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
+	lines.push(`const ${getQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
 	lines.push(`  queryKey: keys.${require_generate_utils.getEndpointName(endpoint)}(${endpointArgs}),`);
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ signal }: { signal: AbortSignal }) => ${endpointFunction}(${endpointArgs}${hasRequestConfigParam ? `${endpointArgs ? ", " : ""}${requestConfigWithSignal}` : ""}),`);
@@ -3428,7 +3142,7 @@ function renderInfiniteQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const endpointArgsWithPage = renderEndpointArgs(resolver, endpoint, { replacePageParam: true });
 	const endpointFunction = inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const lines = [];
-	lines.push(`const ${require_generate_utils.getInfiniteQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
+	lines.push(`const ${getInfiniteQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
 	lines.push(`  queryKey: keys.${require_generate_utils.getEndpointName(endpoint)}Infinite(${endpointArgsWithoutPage}),`);
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ pageParam, signal }: { pageParam: number; signal: AbortSignal }) => ${endpointFunction}(${endpointArgsWithPage}${hasRequestConfigParam ? `, ${requestConfigWithSignal}` : ""}),`);
@@ -3446,8 +3160,8 @@ function renderPrefetchQuery({ resolver, endpoint }) {
 	const endpointParams = renderEndpointParams(resolver, endpoint, { modelNamespaceTag: require_generate_utils.getEndpointTag(endpoint, resolver.options) });
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const lines = [];
-	lines.push(`export const ${require_generate_utils.getPrefetchQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchQuery"]>[0], "queryKey" | "queryFn">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
-	lines.push(`  const queryOptions = { ...${require_generate_utils.getQueryOptionsName(endpoint)}(${endpointParams ? `{ ${endpointArgs} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}` : ""}), ...options };`);
+	lines.push(`export const ${getPrefetchQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchQuery"]>[0], "queryKey" | "queryFn">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
+	lines.push(`  const queryOptions = { ...${getQueryOptionsName(endpoint)}(${endpointParams ? `{ ${endpointArgs} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}` : ""}), ...options };`);
 	lines.push(`  return throwOnError ? queryClient.fetchQuery(queryOptions) : queryClient.prefetchQuery(queryOptions);`);
 	lines.push("};");
 	return lines.join("\n");
@@ -3461,8 +3175,8 @@ function renderPrefetchInfiniteQuery({ resolver, endpoint }) {
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
 	const optionsArgs = `${endpointParams ? `{ ${endpointArgs} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}` : ""}`;
 	const lines = [];
-	lines.push(`export const ${require_generate_utils.getPrefetchInfiniteQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchInfiniteQuery"]>[0], "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
-	lines.push(`  const queryOptions = { ...${require_generate_utils.getInfiniteQueryOptionsName(endpoint)}(${optionsArgs}), ...(options as {}) };`);
+	lines.push(`export const ${getPrefetchInfiniteQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchInfiniteQuery"]>[0], "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
+	lines.push(`  const queryOptions = { ...${getInfiniteQueryOptionsName(endpoint)}(${optionsArgs}), ...(options as {}) };`);
 	lines.push(`  return throwOnError ? queryClient.fetchInfiniteQuery(queryOptions) : queryClient.prefetchInfiniteQuery(queryOptions);`);
 	lines.push("};");
 	return lines.join("\n");
@@ -3479,7 +3193,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 		optionalPathParams: resolver.options.workspaceContext,
 		modelNamespaceTag: tag
 	});
-	const queryOptionsName = require_generate_utils.getQueryOptionsName(endpoint);
+	const queryOptionsName = getQueryOptionsName(endpoint);
 	const hasQueryFnOverride = hasAclCheck;
 	const requestConfig = `{ ${hasAxiosRequestConfig ? `...${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}, ` : ""}allowInvalidResponseData: queryConfig.allowInvalidResponseData }`;
 	const queryOptionsArgs = `${resolvedEndpointArgs ? `{ ${resolvedEndpointArgs} }, ` : ""}${requestConfig}`;
@@ -3490,7 +3204,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 		mode: "query",
 		tag
 	}));
-	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(`export const ${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 } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
@@ -3529,7 +3243,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	const destructuredMutationArgs = renderEndpointArgs(resolver, endpoint, { includeFileParam: true });
 	const endpointFunction = inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const updateQueryEndpoints = precomputed?.updateQueryEndpoints ?? [];
-	const destructuredVariables = precomputed?.destructuredVariables ?? require_generate_utils.getDestructuredVariables(resolver, endpoint, updateQueryEndpoints);
+	const destructuredVariables = precomputed?.destructuredVariables ?? getDestructuredVariables(resolver, endpoint, updateQueryEndpoints);
 	const hasMutationFnBody = endpoint.mediaUpload || hasAclCheck || Object.keys(workspaceParamReplacements).length > 0;
 	const mutationVariablesType = endpoint.mediaUpload ? `${endpointParams}${endpointParams ? "; " : ""}abortController?: AbortController; onUploadProgress?: (progress: { loaded: number; total: number }) => void` : endpointParams;
 	const isPost = endpoint.method === "post";
@@ -3560,7 +3274,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		mode: "mutation",
 		tag
 	}));
-	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)}` : ""}) => {`);
+	lines.push(`export const ${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 } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceContextDestructure({
@@ -3626,9 +3340,9 @@ function groupEndpoints(endpoints, resolver) {
 	const infoByEndpoint = /* @__PURE__ */ new Map();
 	const mutationDataByEndpoint = /* @__PURE__ */ new Map();
 	for (const endpoint of endpoints) {
-		const query = require_generate_utils.isQuery(endpoint);
-		const mutation = require_generate_utils.isMutation(endpoint);
-		const infiniteQuery = Boolean(resolver.options.infiniteQueries && query && require_generate_utils.isInfiniteQuery(endpoint, resolver.options));
+		const query = isQuery(endpoint);
+		const mutation = isMutation(endpoint);
+		const infiniteQuery = Boolean(resolver.options.infiniteQueries && query && isInfiniteQuery(endpoint, resolver.options));
 		if (query) queryEndpoints.push(endpoint);
 		if (mutation) mutationEndpoints.push(endpoint);
 		if (infiniteQuery) infiniteQueryEndpoints.push(endpoint);
@@ -3643,7 +3357,7 @@ function groupEndpoints(endpoints, resolver) {
 		const updateQueryEndpoints = queryEndpoints.filter((queryEndpoint) => queryEndpoint.parameters.filter((param) => param.parameterObject?.required).every((pathParam) => endpoint.parameters.some((param) => param.name === pathParam.name)) && queryEndpoint.response === endpoint.response);
 		mutationDataByEndpoint.set(endpoint, {
 			updateQueryEndpoints,
-			destructuredVariables: require_generate_utils.getDestructuredVariables(resolver, endpoint, updateQueryEndpoints)
+			destructuredVariables: getDestructuredVariables(resolver, endpoint, updateQueryEndpoints)
 		});
 	}
 	return {
@@ -3668,7 +3382,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	});
 	const endpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
 	const resolvedEndpointArgsWithoutPage = renderEndpointObjectArgs(resolver, endpoint, { excludePageParam: true }, workspaceParamReplacements);
-	const queryOptionsName = require_generate_utils.getInfiniteQueryOptionsName(endpoint);
+	const queryOptionsName = getInfiniteQueryOptionsName(endpoint);
 	const requestConfig = `{ ${hasAxiosRequestConfig ? `...${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}, ` : ""}allowInvalidResponseData: queryConfig.allowInvalidResponseData }`;
 	const queryOptionsArgs = `${resolvedEndpointArgsWithoutPage ? `{ ${resolvedEndpointArgsWithoutPage} }, ` : ""}${requestConfig}`;
 	const hasQueryFnOverride = hasAclCheck;
@@ -3679,7 +3393,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 		mode: "infiniteQuery",
 		tag
 	}));
-	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(`export const ${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 } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
@@ -3771,7 +3485,7 @@ function generateQueryModules({ resolver, data }) {
 				tag,
 				options: resolver.options
 			}),
-			mutationHooks: endpoints.filter(require_generate_utils.isMutation).map((endpoint) => require_generate_utils.getQueryName(endpoint, true))
+			mutationHooks: endpoints.filter(isMutation).map((endpoint) => getQueryName(endpoint, true))
 		});
 	});
 	const mutationModules = modules.filter((module) => module.mutationHooks.length > 0);
@@ -3800,6 +3514,7 @@ function generateQueryModules({ resolver, data }) {
 	lines.push("}");
 	lines.push("");
 	lines.push("declare global {");
+	lines.push("   interface OpenApiCodegenQueryModules { queryModule: QueryModule }");
 	lines.push("   interface OpenApiCodegenQueryModuleMutations extends QueryModuleMutations {}");
 	lines.push("}");
 	return lines.join("\n");
@@ -4067,15 +3782,13 @@ function generateCodeFromOpenAPIDoc(openApiDoc, options, profiler, nativeSource)
 		"models",
 		...shouldGenerateEndpoints ? ["endpoints"] : [],
 		"queries",
-		...resolver.options.acl ? ["acl"] : [],
-		...resolver.options.builderConfigs ? ["configs"] : []
+		...resolver.options.acl ? ["acl"] : []
 	];
 	const generateFunctions = {
 		["models"]: generateModels,
 		["endpoints"]: generateEndpoints,
 		["queries"]: generateQueries,
-		["acl"]: generateAcl,
-		["configs"]: generateConfigs
+		["acl"]: generateAcl
 	};
 	data.forEach((_, tag) => {
 		generateTypes.forEach((type) => {