@povio/openapi-codegen-cli 2.0.8-rc.10 → 2.0.8-rc.12

package/dist/{generate.runner-CHLAT44S.mjs → generate.runner-u8B_KeRx.mjs}

@@ -1,4 +1,4 @@
-import { i as writeGenerateFileData, n as DEFAULT_GENERATE_OPTIONS, o as deepMerge, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-CQZ2OLwB.mjs";
+import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-Bn7F_nBN.mjs";
 import fs from "fs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
@@ -30,18 +30,24 @@ async function runGenerate({ fileConfig, params, profiler = new Profiler(process
 		const cached = readCache(cacheFilePath);
 		if (cached && cached.openApiHash === openApiHash && cached.optionsHash === optionsHash) return {
 			skipped: true,
-			config
+			config,
+			stats: {
+				generatedFilesCount: 0,
+				generatedModulesCount: 0
+			}
 		};
 	}
 	const filesData = profiler.runSync("generate.total", () => generateCodeFromOpenAPIDoc(openApiDoc, config, profiler));
 	profiler.runSync("files.write", () => writeGenerateFileData(filesData));
+	const stats = getGenerateStats(filesData, config);
 	if (config.incremental) writeCache(cacheFilePath, {
 		openApiHash,
 		optionsHash
 	});
 	return {
 		skipped: false,
-		config
+		config,
+		stats
 	};
 }
 async function getOpenApiDoc(input, profiler) {
@@ -93,6 +99,32 @@ function stableStringify(input) {
 	const obj = input;
 	return `{${Object.keys(obj).sort((a, b) => a.localeCompare(b)).map((key) => `${JSON.stringify(key)}:${stableStringify(obj[key])}`).join(",")}}`;
 }
+function getGenerateStats(filesData, config) {
+	const generatedFilesCount = filesData.length;
+	if (generatedFilesCount === 0) return {
+		generatedFilesCount,
+		generatedModulesCount: 0
+	};
+	if (!config.splitByTags) return {
+		generatedFilesCount,
+		generatedModulesCount: 1
+	};
+	const moduleSuffixes = new Set(Object.values(config.configs).map((generateConfig) => generateConfig.outputFileNameSuffix).filter(Boolean));
+	const modules = /* @__PURE__ */ new Set();
+	for (const file of filesData) {
+		const segments = path.relative(config.output, file.fileName).split(path.sep).filter(Boolean);
+		if (segments.length < 2) continue;
+		const moduleName = segments[0];
+		const fileName = segments[segments.length - 1];
+		if (!fileName.startsWith(`${moduleName}.`)) continue;
+		const suffix = fileName.slice(moduleName.length + 1).replace(/\.tsx?$/, "");
+		if (moduleSuffixes.has(suffix)) modules.add(moduleName);
+	}
+	return {
+		generatedFilesCount,
+		generatedModulesCount: modules.size
+	};
+}
 
 //#endregion
 export { resolveConfig as n, runGenerate as t };

package/dist/{generateCodeFromOpenAPIDoc-CQZ2OLwB.mjs → generateCodeFromOpenAPIDoc-Bn7F_nBN.mjs}

@@ -606,6 +606,79 @@ const CASL_ABILITY_IMPORT = {
 	from: "@casl/ability"
 };
 
+//#endregion
+//#region src/generators/const/options.const.ts
+const DEFAULT_GENERATE_OPTIONS = {
+	input: "http://localhost:4000/docs-json/",
+	output: "output",
+	incremental: true,
+	splitByTags: true,
+	defaultTag: "Common",
+	excludeTags: [],
+	excludePathRegex: "",
+	excludeRedundantZodSchemas: true,
+	tsNamespaces: true,
+	tsPath: "@/data",
+	importPath: "ts",
+	configs: {
+		[GenerateType.Models]: {
+			outputFileNameSuffix: "models",
+			namespaceSuffix: "Models"
+		},
+		[GenerateType.Endpoints]: {
+			outputFileNameSuffix: "api",
+			namespaceSuffix: "Api"
+		},
+		[GenerateType.Queries]: {
+			outputFileNameSuffix: "queries",
+			namespaceSuffix: "Queries"
+		},
+		[GenerateType.Acl]: {
+			outputFileNameSuffix: "acl",
+			namespaceSuffix: "Acl"
+		},
+		[GenerateType.Configs]: {
+			outputFileNameSuffix: "configs",
+			namespaceSuffix: "Configs"
+		}
+	},
+	baseUrl: "",
+	modelsOnly: false,
+	standalone: false,
+	schemaSuffix: SCHEMA_SUFFIX,
+	enumSuffix: ENUM_SUFFIX,
+	modelsInCommon: false,
+	withDefaultValues: true,
+	extractEnums: true,
+	replaceOptionalWithNullish: false,
+	restClientImportPath: "",
+	errorHandlingImportPath: "",
+	removeOperationPrefixEndingWith: "Controller_",
+	parseRequestParams: true,
+	inlineEndpoints: false,
+	inlineEndpointsExcludeModules: [],
+	queryTypesImportPath: PACKAGE_IMPORT_PATH,
+	axiosRequestConfig: false,
+	mutationEffects: true,
+	workspaceContext: false,
+	infiniteQueries: false,
+	infiniteQueryParamNames: { page: "page" },
+	infiniteQueryResponseParamNames: {
+		page: "page",
+		totalItems: "totalItems",
+		limit: "limit"
+	},
+	acl: true,
+	checkAcl: true,
+	abilityContextGenericAppAbilities: false,
+	abilityContextImportPath: "",
+	builderConfigs: false,
+	filterParamName: "filter",
+	dataResponseParamNames: ["data", "items"],
+	dynamicInputsImportPath: "@povio/ui",
+	dynamicColumnsImportPath: "@povio/ui"
+};
+
 //#endregion
 //#region src/generators/utils/array.utils.ts
 const getUniqueArray = (...arrs) => [...new Set(arrs.flat())];
@@ -780,18 +853,19 @@ function getSchemaDescriptions(schemaObj) {
 //#endregion
 //#region src/generators/utils/generate/generate.zod.utils.ts
 const getZodSchemaInferedTypeName = (zodSchemaName, options) => removeSuffix(zodSchemaName, options.schemaSuffix);
-const getImportedZodSchemaName = (resolver, zodSchemaName) => {
+const getImportedZodSchemaName = (resolver, zodSchemaName, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName;
+	const tag = namespaceTag ?? resolver.getTagByZodSchemaName(zodSchemaName);
 	return `${resolver.options.tsNamespaces ? `${getNamespaceName({
 		type: GenerateType.Models,
-		tag: resolver.getTagByZodSchemaName(zodSchemaName),
+		tag,
 		options: resolver.options
 	})}.` : ""}${zodSchemaName}`;
 };
-const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag) => {
+const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName === VOID_SCHEMA ? "void" : zodSchemaName;
-	const tag = resolver.getTagByZodSchemaName(zodSchemaName);
-	return `${resolver.options.tsNamespaces && tag !== currentTag ? `${getNamespaceName({
+	const tag = namespaceTag ?? resolver.getTagByZodSchemaName(zodSchemaName);
+	return `${resolver.options.tsNamespaces && (Boolean(namespaceTag) || tag !== currentTag) ? `${getNamespaceName({
 		type: GenerateType.Models,
 		tag,
 		options: resolver.options
@@ -987,14 +1061,14 @@ function getTagFileName(...args) {
 	return `${getTagFileNameWithoutExtension(...args)}.ts`;
 }
 function getAppRestClientImportPath(options) {
-	if (!options.restClientImportPath) return `${getImportPath(options)}${APP_REST_CLIENT_FILE.fileName}`;
+	if (options.restClientImportPath === DEFAULT_GENERATE_OPTIONS.restClientImportPath) return `${getImportPath(options)}${APP_REST_CLIENT_FILE.fileName}`;
 	return options.restClientImportPath;
 }
 function getQueryModulesImportPath(options) {
 	return `${getImportPath(options)}${QUERY_MODULES_FILE.fileName}`;
 }
 function getQueryTypesImportPath(options) {
-	return options.queryTypesImportPath || PACKAGE_IMPORT_PATH;
+	return options.queryTypesImportPath;
 }
 function getMutationEffectsImportPath(options) {
 	return `${getImportPath(options)}${MUTATION_EFFECTS_FILE.fileName}`;
@@ -1180,7 +1254,7 @@ const getEndpointPath = (endpoint) => endpoint.path.replace(/:([a-zA-Z0-9_]+)/g,
 function mapEndpointParamsToFunctionParams(resolver, endpoint, options) {
 	const params = endpoint.parameters.map((param) => {
 		let type = "string";
-		if (isNamedZodSchema(param.zodSchema)) type = getImportedZodSchemaInferedTypeName(resolver, param.zodSchema);
+		if (isNamedZodSchema(param.zodSchema)) type = getImportedZodSchemaInferedTypeName(resolver, param.zodSchema, void 0, options?.modelNamespaceTag);
 		else if (param.parameterObject?.schema && isSchemaObject(param.parameterObject.schema)) {
 			const openApiSchemaType = (param.parameterObject?.schema)?.type;
 			if (openApiSchemaType && isPrimitiveType(openApiSchemaType)) type = primitiveTypeToTsType(openApiSchemaType);
@@ -3007,79 +3081,6 @@ function writeGenerateFileData(filesData) {
 	filesData.forEach(writeFileSync$1);
 }
 
-//#endregion
-//#region src/generators/const/options.const.ts
-const DEFAULT_GENERATE_OPTIONS = {
-	input: "http://localhost:4000/docs-json/",
-	output: "output",
-	incremental: true,
-	splitByTags: true,
-	defaultTag: "Common",
-	excludeTags: [],
-	excludePathRegex: "",
-	excludeRedundantZodSchemas: true,
-	tsNamespaces: true,
-	tsPath: "@/data",
-	importPath: "ts",
-	configs: {
-		[GenerateType.Models]: {
-			outputFileNameSuffix: "models",
-			namespaceSuffix: "Models"
-		},
-		[GenerateType.Endpoints]: {
-			outputFileNameSuffix: "api",
-			namespaceSuffix: "Api"
-		},
-		[GenerateType.Queries]: {
-			outputFileNameSuffix: "queries",
-			namespaceSuffix: "Queries"
-		},
-		[GenerateType.Acl]: {
-			outputFileNameSuffix: "acl",
-			namespaceSuffix: "Acl"
-		},
-		[GenerateType.Configs]: {
-			outputFileNameSuffix: "configs",
-			namespaceSuffix: "Configs"
-		}
-	},
-	baseUrl: "",
-	modelsOnly: false,
-	standalone: false,
-	schemaSuffix: SCHEMA_SUFFIX,
-	enumSuffix: ENUM_SUFFIX,
-	modelsInCommon: false,
-	withDefaultValues: true,
-	extractEnums: true,
-	replaceOptionalWithNullish: false,
-	restClientImportPath: "",
-	errorHandlingImportPath: "",
-	removeOperationPrefixEndingWith: "Controller_",
-	parseRequestParams: true,
-	inlineEndpoints: false,
-	inlineEndpointsExcludeModules: [],
-	queryTypesImportPath: PACKAGE_IMPORT_PATH,
-	axiosRequestConfig: false,
-	mutationEffects: true,
-	workspaceContext: false,
-	infiniteQueries: false,
-	infiniteQueryParamNames: { page: "page" },
-	infiniteQueryResponseParamNames: {
-		page: "page",
-		totalItems: "totalItems",
-		limit: "limit"
-	},
-	acl: true,
-	checkAcl: true,
-	abilityContextGenericAppAbilities: false,
-	abilityContextImportPath: "",
-	builderConfigs: false,
-	filterParamName: "filter",
-	dataResponseParamNames: ["data", "items"],
-	dynamicInputsImportPath: "@povio/ui",
-	dynamicColumnsImportPath: "@povio/ui"
-};
-
 //#endregion
 //#region src/generators/generate/generateAcl.ts
 function generateAcl({ resolver, data, tag }) {
@@ -3536,16 +3537,17 @@ function generateEndpoints({ resolver, data, tag }) {
 		options: resolver.options
 	})} {`);
 	for (const endpoint of endpoints) {
-		const endpointParams = renderEndpointParams$1(resolver, endpoint, {});
-		renderEndpointArgs$1(resolver, endpoint, {});
+		const endpointParamOptions = { modelNamespaceTag: tag };
+		const endpointParams = renderEndpointParams$1(resolver, endpoint, endpointParamOptions);
+		renderEndpointArgs$1(resolver, endpoint, endpointParamOptions);
 		const endpointBody = getEndpointBody$1(endpoint);
 		const hasUndefinedEndpointBody = requiresBody(endpoint) && !endpointBody && hasEndpointConfig(endpoint, resolver);
-		const endpointConfig = renderEndpointConfig(resolver, endpoint);
+		const endpointConfig = renderEndpointConfig(resolver, endpoint, tag);
 		lines.push(`export const ${getEndpointName(endpoint)} = (${endpointParams}${hasAxiosRequestConfig ? `${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 		lines.push(`    return ${APP_REST_CLIENT_NAME}.${endpoint.method}(`);
-		lines.push(`        { resSchema: ${getImportedZodSchemaName(resolver, endpoint.response)} },`);
+		lines.push(`        { resSchema: ${getImportedZodSchemaName(resolver, endpoint.response, tag)} },`);
 		lines.push(`        \`${getEndpointPath(endpoint)}\`,`);
-		if (endpointBody) lines.push(`        ${generateParse ? renderEndpointParamParse(resolver, endpointBody, endpointBody.name) : endpointBody.name},`);
+		if (endpointBody) lines.push(`        ${generateParse ? renderEndpointParamParse(resolver, endpointBody, endpointBody.name, tag) : endpointBody.name},`);
 		else if (hasUndefinedEndpointBody) lines.push("        undefined,");
 		lines.push(`        ${endpointConfig}`);
 		lines.push("    )");
@@ -3563,13 +3565,13 @@ function renderEndpointParams$1(resolver, endpoint, options) {
 function renderEndpointArgs$1(resolver, endpoint, options) {
 	return mapEndpointParamsToFunctionParams(resolver, endpoint, options).map((param) => param.name).join(", ");
 }
-function renderEndpointParamParse(resolver, param, paramName) {
+function renderEndpointParamParse(resolver, param, paramName, modelNamespaceTag) {
 	const addOptional = !(param.parameterObject ?? param.bodyObject)?.required && (Boolean(param.parameterSortingEnumSchemaName) || isNamedZodSchema(param.zodSchema));
-	const schemaValue = param.parameterSortingEnumSchemaName ? `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.sortExp}(${getImportedZodSchemaName(resolver, param.parameterSortingEnumSchemaName)})${addOptional ? ".optional()" : ""}` : `${getImportedZodSchemaName(resolver, param.zodSchema)}${addOptional ? ".optional()" : ""}`;
+	const schemaValue = param.parameterSortingEnumSchemaName ? `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.sortExp}(${getImportedZodSchemaName(resolver, param.parameterSortingEnumSchemaName, modelNamespaceTag)})${addOptional ? ".optional()" : ""}` : `${getImportedZodSchemaName(resolver, param.zodSchema, modelNamespaceTag)}${addOptional ? ".optional()" : ""}`;
 	const queryArgs = param.type === "Query" ? `, { type: "query", name: "${paramName}" }` : "";
 	return `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.parse}(${schemaValue}, ${paramName}${queryArgs})`;
 }
-function renderEndpointConfig(resolver, endpoint) {
+function renderEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 	const endpointConfig = getEndpointConfig(endpoint);
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	if (Object.keys(endpointConfig).length === 0) return hasAxiosRequestConfig ? AXIOS_REQUEST_CONFIG_NAME : "";
@@ -3579,7 +3581,7 @@ function renderEndpointConfig(resolver, endpoint) {
 	if (endpointConfig.params) {
 		lines.push("    params: {");
 		for (const param of endpointConfig.params) {
-			const value = resolver.options.parseRequestParams ? renderEndpointParamParse(resolver, param, param.value) : param.value;
+			const value = resolver.options.parseRequestParams ? renderEndpointParamParse(resolver, param, param.value, modelNamespaceTag) : param.value;
 			lines.push(`        ${param.name}: ${value},`);
 		}
 		lines.push("    },");
@@ -3862,7 +3864,8 @@ function generateQueries(params) {
 	if (inlineEndpoints) {
 		lines.push(...renderInlineEndpoints({
 			resolver,
-			endpoints
+			endpoints,
+			tag
 		}));
 		lines.push("");
 	}
@@ -3870,7 +3873,8 @@ function generateQueries(params) {
 	lines.push("");
 	lines.push(renderQueryKeys({
 		resolver,
-		queryEndpoints
+		queryEndpoints,
+		tag
 	}));
 	lines.push("");
 	for (const endpoint of endpoints) {
@@ -4004,33 +4008,37 @@ function renderQueryJsDocs({ resolver, endpoint, mode }) {
 	lines.push(" */");
 	return lines.join("\n");
 }
-function renderQueryKeys({ resolver, queryEndpoints }) {
+function renderQueryKeys({ resolver, queryEndpoints, tag }) {
 	if (queryEndpoints.length === 0) return "";
 	const lines = [];
 	lines.push("export const keys = {");
 	lines.push(`    all: [${QUERIES_MODULE_NAME}] as const,`);
 	for (const endpoint of queryEndpoints) {
-		lines.push(`    ${getEndpointName(endpoint)}: (${renderEndpointParams(resolver, endpoint, { pathParamsRequiredOnly: true })}) => [...keys.all, "${endpoint.path}", ${renderEndpointArgs(resolver, endpoint, {})}] as const,`);
+		lines.push(`    ${getEndpointName(endpoint)}: (${renderEndpointParams(resolver, endpoint, {
+			pathParamsRequiredOnly: true,
+			modelNamespaceTag: tag
+		})}) => [...keys.all, "${endpoint.path}", ${renderEndpointArgs(resolver, endpoint, {})}] as const,`);
 		if (resolver.options.infiniteQueries && isInfiniteQuery(endpoint, resolver.options)) lines.push(`    ${getEndpointName(endpoint)}Infinite: (${renderEndpointParams(resolver, endpoint, {
 			excludePageParam: true,
-			pathParamsRequiredOnly: true
+			pathParamsRequiredOnly: true,
+			modelNamespaceTag: tag
 		})}) => [...keys.all, "${endpoint.path}", "infinite", ${renderEndpointArgs(resolver, endpoint, { excludePageParam: true })}] as const,`);
 	}
 	lines.push("};");
 	return lines.join("\n");
 }
-function renderInlineEndpoints({ resolver, endpoints }) {
+function renderInlineEndpoints({ resolver, endpoints, tag }) {
 	const lines = [];
 	for (const endpoint of endpoints) {
-		const endpointParams = renderEndpointParams(resolver, endpoint, {});
+		const endpointParams = renderEndpointParams(resolver, endpoint, { modelNamespaceTag: tag });
 		const endpointBody = getEndpointBody$1(endpoint);
 		const hasUndefinedEndpointBody = requiresBody(endpoint) && !endpointBody && hasEndpointConfig(endpoint, resolver);
-		const endpointConfig = renderInlineEndpointConfig(resolver, endpoint);
+		const endpointConfig = renderInlineEndpointConfig(resolver, endpoint, tag);
 		lines.push(`const ${getEndpointName(endpoint)} = (${endpointParams}${resolver.options.axiosRequestConfig ? `${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 		lines.push(`  return ${APP_REST_CLIENT_NAME}.${endpoint.method}(`);
-		lines.push(`    { resSchema: ${getImportedZodSchemaName(resolver, endpoint.response)} },`);
+		lines.push(`    { resSchema: ${getImportedZodSchemaName(resolver, endpoint.response, tag)} },`);
 		lines.push(`    \`${getEndpointPath(endpoint)}\`,`);
-		if (endpointBody) lines.push(`    ${resolver.options.parseRequestParams ? renderInlineEndpointParamParse(resolver, endpointBody, endpointBody.name) : endpointBody.name},`);
+		if (endpointBody) lines.push(`    ${resolver.options.parseRequestParams ? renderInlineEndpointParamParse(resolver, endpointBody, endpointBody.name, tag) : endpointBody.name},`);
 		else if (hasUndefinedEndpointBody) lines.push("    undefined,");
 		lines.push(`    ${endpointConfig}`);
 		lines.push("  );");
@@ -4039,13 +4047,13 @@ function renderInlineEndpoints({ resolver, endpoints }) {
 	}
 	return lines;
 }
-function renderInlineEndpointParamParse(resolver, param, paramName) {
+function renderInlineEndpointParamParse(resolver, param, paramName, modelNamespaceTag) {
 	const addOptional = !(param.parameterObject ?? param.bodyObject)?.required && (Boolean(param.parameterSortingEnumSchemaName) || isNamedZodSchema(param.zodSchema));
-	const schemaValue = param.parameterSortingEnumSchemaName ? `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.sortExp}(${getImportedZodSchemaName(resolver, param.parameterSortingEnumSchemaName)})${addOptional ? ".optional()" : ""}` : `${getImportedZodSchemaName(resolver, param.zodSchema)}${addOptional ? ".optional()" : ""}`;
+	const schemaValue = param.parameterSortingEnumSchemaName ? `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.sortExp}(${getImportedZodSchemaName(resolver, param.parameterSortingEnumSchemaName, modelNamespaceTag)})${addOptional ? ".optional()" : ""}` : `${getImportedZodSchemaName(resolver, param.zodSchema, modelNamespaceTag)}${addOptional ? ".optional()" : ""}`;
 	const queryArgs = param.type === "Query" ? `, { type: "query", name: "${paramName}" }` : "";
 	return `${ZOD_EXTENDED.namespace}.${ZOD_EXTENDED.exports.parse}(${schemaValue}, ${paramName}${queryArgs})`;
 }
-function renderInlineEndpointConfig(resolver, endpoint) {
+function renderInlineEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 	const endpointConfig = getEndpointConfig(endpoint);
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	if (Object.keys(endpointConfig).length === 0) return hasAxiosRequestConfig ? AXIOS_REQUEST_CONFIG_NAME : "";
@@ -4055,7 +4063,7 @@ function renderInlineEndpointConfig(resolver, endpoint) {
 	if (endpointConfig.params) {
 		lines.push("      params: {");
 		for (const param of endpointConfig.params) {
-			const value = resolver.options.parseRequestParams ? renderInlineEndpointParamParse(resolver, param, param.value) : param.value;
+			const value = resolver.options.parseRequestParams ? renderInlineEndpointParamParse(resolver, param, param.value, modelNamespaceTag) : param.value;
 			lines.push(`        ${param.name}: ${value},`);
 		}
 		lines.push("      },");
@@ -4269,9 +4277,9 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 //#endregion
 //#region src/generators/generate/generateAclCheck.ts
 function generateAclCheck(resolver) {
-	const abilityContextImportPath = resolver.options.abilityContextImportPath || ABILITY_CONTEXT_IMPORT.from;
+	const abilityContextImportPath = resolver.options.abilityContextImportPath ?? ABILITY_CONTEXT_IMPORT.from;
 	const appAbilitiesImportPath = getAppAbilitiesImportPath(resolver.options);
-	const errorHandlingImportPath = resolver.options.errorHandlingImportPath || ERROR_HANDLING_IMPORT.from;
+	const errorHandlingImportPath = resolver.options.errorHandlingImportPath ?? ERROR_HANDLING_IMPORT.from;
 	const genericAppAbilities = resolver.options.abilityContextGenericAppAbilities ? `<${ACL_APP_ABILITIES}>` : "";
 	return `import { ${CASL_ABILITY_BINDING.abilityTuple} } from "@casl/ability";
 import { type ${ERROR_HANDLERS.ErrorHandler}, ${ERROR_HANDLERS.SharedErrorHandler} } from "${errorHandlingImportPath}";
@@ -4338,7 +4346,7 @@ function generateQueryModules({ resolver, data }) {
 function generateZodExtended(resolver) {
 	const errorHandlingImport = {
 		...ERROR_HANDLING_IMPORT,
-		from: resolver.options.errorHandlingImportPath || ERROR_HANDLING_IMPORT.from
+		from: resolver.options.errorHandlingImportPath ?? ERROR_HANDLING_IMPORT.from
 	};
 	return `${renderImport(ZOD_IMPORT)}
 ${renderImport(errorHandlingImport)}
@@ -4519,4 +4527,4 @@ function generateCodeFromOpenAPIDoc(openApiDoc, options, profiler) {
 }
 
 //#endregion
-export { VALIDATION_ERROR_TYPE_TITLE as S, isMediaTypeAllowed as _, getDataFromOpenAPIDoc as a, formatTag as b, isQuery as c, getTagFileName as d, getTagImportPath as f, groupByType as g, GenerateType as h, writeGenerateFileData as i, getSchemaTsMetaType as l, getNamespaceName as m, DEFAULT_GENERATE_OPTIONS as n, deepMerge as o, getQueryName as p, getOutputFileName as r, isMutation as s, generateCodeFromOpenAPIDoc as t, getTsTypeBase as u, isParamMediaTypeAllowed as v, Profiler as x, invalidVariableNameCharactersToCamel as y };
+export { VALIDATION_ERROR_TYPE_TITLE as S, isMediaTypeAllowed as _, deepMerge as a, formatTag as b, getSchemaTsMetaType as c, getTagImportPath as d, getQueryName as f, groupByType as g, GenerateType as h, getDataFromOpenAPIDoc as i, getTsTypeBase as l, getNamespaceName as m, getOutputFileName as n, isMutation as o, DEFAULT_GENERATE_OPTIONS as p, writeGenerateFileData as r, isQuery as s, generateCodeFromOpenAPIDoc as t, getTagFileName as u, isParamMediaTypeAllowed as v, Profiler as x, invalidVariableNameCharactersToCamel as y };

package/dist/generator.mjs

@@ -1,4 +1,4 @@
-import { _ as isMediaTypeAllowed, a as getDataFromOpenAPIDoc, b as formatTag, c as isQuery, f as getTagImportPath, h as GenerateType, l as getSchemaTsMetaType, m as getNamespaceName, n as DEFAULT_GENERATE_OPTIONS, p as getQueryName, s as isMutation, t as generateCodeFromOpenAPIDoc, u as getTsTypeBase, v as isParamMediaTypeAllowed, y as invalidVariableNameCharactersToCamel } from "./generateCodeFromOpenAPIDoc-CQZ2OLwB.mjs";
+import { _ as isMediaTypeAllowed, b as formatTag, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, h as GenerateType, i as getDataFromOpenAPIDoc, l as getTsTypeBase, m as getNamespaceName, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as isParamMediaTypeAllowed, y as invalidVariableNameCharactersToCamel } from "./generateCodeFromOpenAPIDoc-Bn7F_nBN.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { S as VALIDATION_ERROR_TYPE_TITLE, a as getDataFromOpenAPIDoc, d as getTagFileName, g as groupByType, h as GenerateType, r as getOutputFileName, x as Profiler } from "./generateCodeFromOpenAPIDoc-CQZ2OLwB.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-CHLAT44S.mjs";
+import { S as VALIDATION_ERROR_TYPE_TITLE, g as groupByType, h as GenerateType, i as getDataFromOpenAPIDoc, n as getOutputFileName, u as getTagFileName, x as Profiler } from "./generateCodeFromOpenAPIDoc-Bn7F_nBN.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-u8B_KeRx.mjs";
 import { createRequire } from "node:module";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -39,7 +39,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "2.0.8-rc.10";
+	return "2.0.8-rc.12";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { x as Profiler } from "./generateCodeFromOpenAPIDoc-CQZ2OLwB.mjs";
-import { t as runGenerate } from "./generate.runner-CHLAT44S.mjs";
+import { x as Profiler } from "./generateCodeFromOpenAPIDoc-Bn7F_nBN.mjs";
+import { t as runGenerate } from "./generate.runner-u8B_KeRx.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.10",
+  "version": "2.0.8-rc.12",
   "keywords": [
     "codegen",
     "openapi",