@povio/openapi-codegen-cli 3.0.0-rc.3 → 3.0.0-rc.4

package/dist/acl.d.mts

@@ -1,4 +1,4 @@
-import { r as ErrorHandler } from "./error-handling-CvW_FecB.mjs";
+import { a as ErrorHandler } from "./error-handling-B4aYKmyL.mjs";
 import * as react from "react";
 import { PropsWithChildren } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";

package/dist/acl.mjs

@@ -1,4 +1,4 @@
-import { r as SharedErrorHandler } from "./error-handling-DkPY7Asf.mjs";
+import { i as SharedErrorHandler } from "./error-handling-nneQaE1_.mjs";
 import { n as OpenApiRouter, t as AuthContext } from "./auth.context-Bu5KW2sI.mjs";
 import { createContext, useCallback, useEffect, useState } from "react";
 import { jsx } from "react/jsx-runtime";

package/dist/{config-1XCOTZ4a.d.mts → config-C1ME3Ay4.d.mts}

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

package/dist/{error-handling-CvW_FecB.d.mts → error-handling-B4aYKmyL.d.mts}

@@ -12,13 +12,28 @@ interface ErrorEntry<CodeT> {
   condition?: (error: unknown) => boolean;
   getMessage: (t: TFunction<string, undefined>, error: unknown) => string;
 }
-interface ErrorHandlerOptions<CodeT extends string> {
+interface DomainErrorEntry {
+  code: string | number;
+  condition?: (error: unknown) => boolean;
+  getMessage: (t: TFunction<string, undefined>, error: unknown) => string;
+}
+declare class DomainErrorRegistry {
+  private static readonly entries;
+  static register(entry: DomainErrorEntry): void;
+  static register(entries: DomainErrorEntry[]): void;
+  static unregister(code: string | number): void;
+  static clear(): void;
+  static getEntry(code: string | number): DomainErrorEntry | undefined;
+}
+interface ErrorHandlerOptions<CodeT extends string | number> {
   entries: ErrorEntry<CodeT>[];
   t?: TFunction<string, undefined>;
   onRethrowError?: (error: unknown, exception: ApplicationException<CodeT | GeneralErrorCodes>) => void;
 }
-declare class ErrorHandler<CodeT extends string> {
+declare class ErrorHandler<CodeT extends string | number> {
   entries: ErrorEntry<CodeT | GeneralErrorCodes>[];
+  private readonly userEntries;
+  private readonly generalEntries;
   private t;
   private onRethrowError?;
   constructor({
@@ -35,4 +50,4 @@ declare class ErrorHandler<CodeT extends string> {
 }
 declare const SharedErrorHandler: ErrorHandler<never>;
 //#endregion
-export { GeneralErrorCodes as a, ErrorHandlerOptions as i, ErrorEntry as n, SharedErrorHandler as o, ErrorHandler as r, ApplicationException as t };
+export { ErrorHandler as a, SharedErrorHandler as c, ErrorEntry as i, DomainErrorEntry as n, ErrorHandlerOptions as o, DomainErrorRegistry as r, GeneralErrorCodes as s, ApplicationException as t };

package/dist/{error-handling-DkPY7Asf.mjs → error-handling-nneQaE1_.mjs}

@@ -53,6 +53,7 @@ let RestUtils;
 		if (!e.response) return null;
 		const data = e.response.data;
 		if (typeof data?.code === "string") return data.code;
+		if (typeof data?.code === "number") return data.code;
 		return null;
 	};
 	_RestUtils.doesServerErrorMessageContain = (e, text) => {
@@ -85,8 +86,26 @@ var ApplicationException = class extends Error {
 		this.serverMessage = serverMessage;
 	}
 };
+var DomainErrorRegistry = class {
+	static entries = /* @__PURE__ */ new Map();
+	static register(entryOrEntries) {
+		const items = Array.isArray(entryOrEntries) ? entryOrEntries : [entryOrEntries];
+		for (const item of items) this.entries.set(item.code, item);
+	}
+	static unregister(code) {
+		this.entries.delete(code);
+	}
+	static clear() {
+		this.entries.clear();
+	}
+	static getEntry(code) {
+		return this.entries.get(code);
+	}
+};
 var ErrorHandler = class {
 	entries = [];
+	userEntries;
+	generalEntries;
 	t;
 	onRethrowError;
 	constructor({ entries, t = defaultT, onRethrowError }) {
@@ -138,14 +157,15 @@ var ErrorHandler = class {
 				return this.t("openapi.sharedErrors.unknownError");
 			}
 		};
-		this.entries = [
-			...entries,
+		this.userEntries = [...entries];
+		this.generalEntries = [
 			dataValidationError,
 			internalError,
 			networkError,
 			canceledError,
 			unknownError
 		];
+		this.entries = [...this.userEntries, ...this.generalEntries];
 	}
 	matchesEntry(error, entry, code) {
 		if (entry.condition) return entry.condition(error);
@@ -156,9 +176,23 @@ var ErrorHandler = class {
 	}
 	rethrowError(error) {
 		const code = RestUtils.extractServerResponseCode(error);
-		const errorEntry = this.entries.find((entry) => this.matchesEntry(error, entry, code));
 		const serverMessage = RestUtils.extractServerErrorMessage(error);
-		const exception = new ApplicationException(errorEntry.getMessage(this.t, error), errorEntry.code, serverMessage);
+		const userEntry = this.userEntries.find((entry) => this.matchesEntry(error, entry, code));
+		if (userEntry) {
+			const exception = new ApplicationException(userEntry.getMessage(this.t, error), userEntry.code, serverMessage);
+			this.onRethrowError?.(error, exception);
+			throw exception;
+		}
+		if (code !== null) {
+			const registryEntry = DomainErrorRegistry.getEntry(code);
+			if (registryEntry && (!registryEntry.condition || registryEntry.condition(error))) {
+				const exception = new ApplicationException(registryEntry.getMessage(this.t, error), registryEntry.code, serverMessage);
+				this.onRethrowError?.(error, exception);
+				throw exception;
+			}
+		}
+		const generalEntry = this.generalEntries.find((entry) => this.matchesEntry(error, entry, code));
+		const exception = new ApplicationException(generalEntry.getMessage(this.t, error), generalEntry.code, serverMessage);
 		this.onRethrowError?.(error, exception);
 		throw exception;
 	}
@@ -184,4 +218,4 @@ var ErrorHandler = class {
 const SharedErrorHandler = new ErrorHandler({ entries: [] });
 
 //#endregion
-export { ns as a, RestUtils as i, ErrorHandler as n, resources as o, SharedErrorHandler as r, ApplicationException as t };
+export { RestUtils as a, SharedErrorHandler as i, DomainErrorRegistry as n, ns as o, ErrorHandler as r, resources as s, ApplicationException as t };

package/dist/{generate.runner-CioDqx6u.mjs → generate.runner-DaqNnVkP.mjs}

@@ -1,4 +1,4 @@
-import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-D-UDIQX5.mjs";
+import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-CjVJQDyw.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 

package/dist/{generateCodeFromOpenAPIDoc-D-UDIQX5.mjs → generateCodeFromOpenAPIDoc-CjVJQDyw.mjs}

@@ -915,6 +915,10 @@ const APP_REST_CLIENT_FILE = {
 	fileName: "app-rest-client",
 	extension: "ts"
 };
+const DOMAIN_ERRORS_FILE = {
+	fileName: "domain-errors",
+	extension: "ts"
+};
 const QUERY_OPTIONS_TYPES = {
 	query: "AppQueryOptions",
 	infiniteQuery: "AppInfiniteQueryOptions",
@@ -1717,26 +1721,12 @@ function getAclImports({ tag, endpoints, options }) {
 		options
 	});
 }
-function normalizeOutputPath(output) {
-	return output.replace(/\\/g, "/").replace(/\/$/, "");
-}
-function outputMatchesTsPath(options) {
-	const normalizedOutput = normalizeOutputPath(options.output);
-	if (options.tsPath.startsWith("@/")) {
-		const physicalPath = `src/${options.tsPath.slice(2)}`;
-		return normalizedOutput === physicalPath || normalizedOutput.endsWith(`/${physicalPath}`);
-	}
-	return normalizedOutput === options.tsPath;
-}
-function shouldUseRelativeImports(options) {
-	return options.importPath === "ts" && options.tsPath === "@/data" && !outputMatchesTsPath(options);
-}
 function getImportPath(options, fromRoot = false) {
-	if (options.importPath === "relative") return `${fromRoot ? "./" : "../"}`.replace(/\/\//g, "/");
-	if (options.importPath === "absolute") return `${options.output}/`.replace(/\/\//g, "/");
-	if (new RegExp(`${TEMPLATE_DATA_FILE_PATH}`, "g").test(options.output)) return `${options.output.replace(new RegExp(`.*${TEMPLATE_DATA_FILE_PATH}`, "g"), options.tsPath)}/`.replace(/\/\//g, "/");
-	if (shouldUseRelativeImports(options)) return `${fromRoot ? "./" : "../"}`.replace(/\/\//g, "/");
-	return `${options.tsPath}/`.replace(/\/\//g, "/");
+	let importPath = options.tsPath;
+	if (options.importPath === "relative") importPath = fromRoot ? "./" : "../";
+	else if (options.importPath === "absolute") importPath = options.output;
+	else if (new RegExp(`${TEMPLATE_DATA_FILE_PATH}`, "g").test(options.output)) importPath = options.output.replace(new RegExp(`.*${TEMPLATE_DATA_FILE_PATH}`, "g"), options.tsPath);
+	return `${importPath}/`.replace(/\/\//g, "/");
 }
 function getImports({ type = GenerateType.Models, tag: currentTag, entities, getTag, getEntityName, options }) {
 	const imports = /* @__PURE__ */ new Map();
@@ -2221,16 +2211,9 @@ function getEndpointBody({ resolver, operation, operationName, isUniqueOperation
 	};
 }
 
-//#endregion
-//#region src/generators/utils/query-filter-component-names.utils.ts
-function resolveQueryFilterComponentName(operationId, queryFilterComponentNames) {
-	if (!operationId || !queryFilterComponentNames) return;
-	return queryFilterComponentNames[operationId];
-}
-
 //#endregion
 //#region src/generators/core/endpoints/getEndpointParameter.ts
-function getEndpointParameter({ resolver, param, operationName, operationId, isUniqueOperationName, tag }) {
+function getEndpointParameter({ resolver, param, operationName, isUniqueOperationName, tag }) {
 	const paramObj = resolver.resolveObject(param);
 	if (!ALLOWED_PATH_IN.includes(paramObj.in)) return;
 	let schema = {};
@@ -2243,8 +2226,7 @@ function getEndpointParameter({ resolver, param, operationName, operationId, isU
 		schema = mediaTypeObject?.schema ?? mediaTypeObject;
 	} else if (paramObj.schema) schema = paramObj.schema;
 	if (resolver.options.withDescription && schema) schema.description = (paramObj.description ?? "").trim();
-	const zodSchemaOperationName = getZodSchemaOperationName(operationName, isUniqueOperationName, tag);
-	const fallbackName = (paramObj.name === resolver.options.filterParamName && !isReferenceObject(schema) && resolver.options.queryFilterComponentNames ? resolveQueryFilterComponentName(operationId, resolver.options.queryFilterComponentNames) : void 0) ?? getParamZodSchemaName(zodSchemaOperationName, paramObj.name);
+	const fallbackName = getParamZodSchemaName(getZodSchemaOperationName(operationName, isUniqueOperationName, tag), paramObj.name);
 	let parameterSortingEnumSchemaName = void 0;
 	if (isSortingParameterObject(paramObj)) {
 		const enumZodSchemaName = getEnumZodSchemaName(fallbackName, resolver.options.enumSuffix, resolver.options.schemaSuffix);
@@ -2343,7 +2325,6 @@ function getEndpointsFromOpenAPIDoc(resolver) {
 					resolver,
 					param,
 					operationName,
-					operationId: operation.operationId,
 					isUniqueOperationName,
 					tag
 				});
@@ -2402,11 +2383,21 @@ function getEndpointsFromOpenAPIDoc(resolver) {
 						endpoint.response = responseZodSchema;
 						endpoint.responseObject = responseObj;
 						endpoint.responseDescription = responseObj?.description;
-					} else if (statusCode !== "default" && !Number.isNaN(status) && isErrorStatus(status)) endpoint.errors.push({
-						zodSchema: responseZodSchema,
-						status,
-						description: responseObj?.description
-					});
+					} else if (statusCode !== "default" && !Number.isNaN(status) && isErrorStatus(status)) {
+						const rawSchema = schemaObject;
+						const domainStr = rawSchema["x-domain-error-domain"];
+						const codeEnumArr = ((rawSchema?.properties)?.code)?.enum;
+						const domainCode = Array.isArray(codeEnumArr) && codeEnumArr.length === 1 && typeof codeEnumArr[0] === "number" ? codeEnumArr[0] : void 0;
+						endpoint.errors.push({
+							zodSchema: responseZodSchema,
+							status,
+							description: responseObj?.description,
+							...typeof domainStr === "string" && domainCode !== void 0 ? { domainError: {
+								domain: domainStr,
+								code: domainCode
+							} } : {}
+						});
+					}
 				} else {
 					const status = Number(statusCode);
 					const responseZodSchema = VOID_SCHEMA;
@@ -4475,7 +4466,7 @@ function renderInfiniteQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(`  queryKey: keys.${getEndpointName(endpoint)}Infinite(${endpointArgsWithoutPage}),`);
 	lines.push(`  queryFn: ({ pageParam }: { pageParam: number }) => ${endpointFunction}(${endpointArgsWithPage}${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}` : ""}),`);
 	lines.push("  initialPageParam: 1,");
-	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }) => {`);
+	lines.push(`  getNextPageParam: ({ ${resolver.options.infiniteQueryResponseParamNames.page}, ${resolver.options.infiniteQueryResponseParamNames.totalItems}, ${resolver.options.infiniteQueryResponseParamNames.limit}: limitParam }: Awaited<ReturnType<typeof ${endpointFunction}>>) => {`);
 	lines.push(`    const pageParam = ${resolver.options.infiniteQueryResponseParamNames.page} ?? 1;`);
 	lines.push(`    return pageParam * limitParam < ${resolver.options.infiniteQueryResponseParamNames.totalItems} ? pageParam + 1 : null;`);
 	lines.push("  },");
@@ -4499,9 +4490,10 @@ function renderPrefetchInfiniteQuery({ resolver, endpoint }) {
 		modelNamespaceTag: getEndpointTag(endpoint, resolver.options)
 	});
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
+	const optionsArgs = `${endpointParams ? `{ ${endpointArgs} }` : ""}${hasAxiosRequestConfig ? `${endpointParams ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""}`;
 	const lines = [];
 	lines.push(`export const ${getPrefetchInfiniteQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}${hasAxiosRequestConfig ? `${AXIOS_REQUEST_CONFIG_NAME}: ${AXIOS_REQUEST_CONFIG_TYPE}, ` : ""}options?: Omit<Parameters<QueryClient["prefetchInfiniteQuery"]>[0], "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">): void => {`);
-	lines.push(`  void queryClient.prefetchInfiniteQuery({ ...${getInfiniteQueryOptionsName(endpoint)}(${endpointParams ? `{ ${endpointArgs} }` : ""}${hasAxiosRequestConfig ? `${endpointParams ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""}), ...options });`);
+	lines.push(`  void queryClient.prefetchInfiniteQuery({ ...${getInfiniteQueryOptionsName(endpoint)}(${optionsArgs}), ...(options as {}) });`);
 	lines.push("};");
 	return lines.join("\n");
 }
@@ -4604,7 +4596,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		paramTypes: workspaceParamTypes,
 		indent: "  "
 	}));
-	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<typeof ${QUERY_MODULE_ENUM}.${tag}>({ currentModule: ${QUERIES_MODULE_NAME} });`);
+	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<${QUERY_MODULE_ENUM}.${tag}>({ currentModule: ${QUERIES_MODULE_NAME} });`);
 	lines.push("");
 	lines.push(`  return ${QUERY_HOOKS.mutation}({`);
 	const nonPathDestructuredArgs = isScoped ? renderEndpointArgs(resolver, endpoint, {
@@ -4771,6 +4763,36 @@ export const ${APP_REST_CLIENT_NAME} = new RestClient({
 `;
 }
 
+//#endregion
+//#region src/generators/generate/generateDomainErrors.ts
+function domainToPascalCase(domain) {
+	return domain.split(/[-_]/).map(capitalize).join("");
+}
+function generateDomainErrors({ data }) {
+	const byDomain = /* @__PURE__ */ new Map();
+	for (const { endpoints } of data.values()) for (const endpoint of endpoints) for (const error of endpoint.errors) {
+		if (!error.domainError) continue;
+		const { domain, code } = error.domainError;
+		if (!byDomain.has(domain)) byDomain.set(domain, /* @__PURE__ */ new Map());
+		const domainMap = byDomain.get(domain);
+		if (!domainMap.has(code)) domainMap.set(code, {
+			code,
+			description: error.description
+		});
+	}
+	if (byDomain.size === 0) return void 0;
+	const blocks = [];
+	for (const [domain, codes] of [...byDomain.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+		const pascalName = domainToPascalCase(domain);
+		const entries = [...codes.values()].sort((a, b) => a.code - b.code).map(({ code, description }) => {
+			return `${description ? `  /** ${description} */\n  ` : "  "}ERROR_${code}: ${code}`;
+		}).join(",\n");
+		blocks.push(`export const ${pascalName}DomainErrors = {\n${entries},\n} as const;`);
+		blocks.push(`export type ${pascalName}DomainErrorCode = (typeof ${pascalName}DomainErrors)[keyof typeof ${pascalName}DomainErrors];`);
+	}
+	return blocks.join("\n\n") + "\n";
+}
+
 //#endregion
 //#region src/generators/generate/generateQueryModules.ts
 function generateQueryModules({ resolver, data }) {
@@ -4825,6 +4847,20 @@ function getMutationEffectsFiles(data, resolver) {
 function getZodExtendedFiles(_data, _resolver) {
 	return [];
 }
+function getDomainErrorsFiles(data, resolver) {
+	const content = generateDomainErrors({
+		resolver,
+		data
+	});
+	if (!content) return [];
+	return [{
+		fileName: getOutputFileName({
+			output: resolver.options.output,
+			fileName: getFileNameWithExtension(DOMAIN_ERRORS_FILE)
+		}),
+		content
+	}];
+}
 function getAppRestClientFiles(resolver) {
 	if (resolver.options.restClientImportPath !== DEFAULT_GENERATE_OPTIONS.restClientImportPath) return [];
 	return [{
@@ -4887,7 +4923,7 @@ function generateCodeFromOpenAPIDoc(openApiDoc, options, profiler) {
 			}
 		});
 	});
-	if (!modelsOnly) generateFilesData.push(...p.runSync("render.AclShared", () => getAclFiles(data, resolver)), ...p.runSync("render.MutationEffects", () => getMutationEffectsFiles(data, resolver)), ...p.runSync("render.ZodExtended", () => getZodExtendedFiles(data, resolver)), ...p.runSync("render.Standalone", () => getAppRestClientFiles(resolver)));
+	if (!modelsOnly) generateFilesData.push(...p.runSync("render.AclShared", () => getAclFiles(data, resolver)), ...p.runSync("render.MutationEffects", () => getMutationEffectsFiles(data, resolver)), ...p.runSync("render.ZodExtended", () => getZodExtendedFiles(data, resolver)), ...p.runSync("render.Standalone", () => getAppRestClientFiles(resolver)), ...p.runSync("render.DomainErrors", () => getDomainErrorsFiles(data, resolver)));
 	return generateFilesData;
 }
 

package/dist/generator.d.mts

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

package/dist/generator.mjs

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

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { a as GeneralErrorCodes, i as ErrorHandlerOptions, n as ErrorEntry, o as SharedErrorHandler, r as ErrorHandler, t as ApplicationException } from "./error-handling-CvW_FecB.mjs";
-import "./options-saKmD8s1.mjs";
-import { t as OpenAPICodegenConfig } from "./config-1XCOTZ4a.mjs";
+import { a as ErrorHandler, c as SharedErrorHandler, i as ErrorEntry, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as GeneralErrorCodes, t as ApplicationException } from "./error-handling-B4aYKmyL.mjs";
+import "./options-BPAjzilp.mjs";
+import { t as OpenAPICodegenConfig } from "./config-C1ME3Ay4.mjs";
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
 import "i18next";
@@ -65,7 +65,7 @@ declare class RestClient$1 implements RestClient {
 //#endregion
 //#region src/lib/rest/rest.utils.d.ts
 declare namespace RestUtils {
-  const extractServerResponseCode: (e: unknown) => string | null;
+  const extractServerResponseCode: (e: unknown) => string | number | null;
   const doesServerErrorMessageContain: (e: AxiosError, text: string) => boolean;
   const extractServerErrorMessage: (e: unknown) => string | null;
   const extractContentDispositionFilename: (headers: AxiosResponseHeaders) => string | undefined;
@@ -110,7 +110,7 @@ interface MutationEffectsOptions<TQueryModule extends QueryModule = QueryModule>
   invalidateCurrentModule?: boolean;
   crossTabInvalidation?: boolean;
   invalidationMap?: InvalidationMap<TQueryModule>;
-  invalidateModules?: TQueryModule[];
+  invalidateModules?: QueryModule[];
   invalidateKeys?: QueryKey[];
   preferUpdate?: boolean;
 }
@@ -228,4 +228,4 @@ declare const AuthGuard: ({
   children
 }: PropsWithChildren<AuthGuardProps>) => react.ReactNode;
 //#endregion
-export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as ns, i as RestUtils, n as ErrorHandler, o as resources, r as SharedErrorHandler, t as ApplicationException } from "./error-handling-DkPY7Asf.mjs";
+import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, o as ns, r as ErrorHandler, s as resources, t as ApplicationException } from "./error-handling-nneQaE1_.mjs";
 import { n as OpenApiRouter, t as AuthContext } from "./auth.context-Bu5KW2sI.mjs";
 import axios from "axios";
 import { z } from "zod";
@@ -250,4 +250,4 @@ const AuthGuard = ({ type, redirectTo, children }) => {
 };
 
 //#endregion
-export { ApplicationException, AuthContext, AuthGuard, ErrorHandler, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };
+export { ApplicationException, AuthContext, AuthGuard, DomainErrorRegistry, ErrorHandler, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/{options-saKmD8s1.d.mts → options-BPAjzilp.d.mts}

@@ -72,13 +72,6 @@ interface BuilderConfigsGenerateOptions {
   dynamicInputsImportPath: string;
   dynamicColumnsImportPath: string;
 }
-interface QueryFilterComponentNameOptions {
-  /**
-   * Optional map of OpenAPI operationId to stable filter schema names.
-   * Used for inline `filter` query objects when migrating away from named filter DTO refs.
-   */
-  queryFilterComponentNames?: Record<string, string>;
-}
 interface GenerateConfig {
   outputFileNameSuffix: string;
   namespaceSuffix: string;
@@ -89,8 +82,6 @@ interface BaseGenerateOptions {
   clearOutput?: boolean;
   incremental?: boolean;
   splitByTags: boolean;
-  /** When true, non-default tags emit proxy models that re-export from CommonModels. */
-  modelsInCommon?: boolean;
   defaultTag: string;
   includeTags: string[];
   excludeTags: string[];
@@ -104,6 +95,6 @@ interface BaseGenerateOptions {
   modelsOnly?: boolean;
   standalone?: boolean;
 }
-interface GenerateOptions extends BaseGenerateOptions, ZodGenerateOptions, EndpointsGenerateOptions, QueriesGenerateOptions, InfiniteQueriesGenerateOptions, ACLGenerateOptions, BuilderConfigsGenerateOptions, QueryFilterComponentNameOptions {}
+interface GenerateOptions extends BaseGenerateOptions, ZodGenerateOptions, EndpointsGenerateOptions, QueriesGenerateOptions, InfiniteQueriesGenerateOptions, ACLGenerateOptions, BuilderConfigsGenerateOptions {}
 //#endregion
 export { GenerateFileData as n, GenerateFileFormatter as r, GenerateOptions as t };

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-D-UDIQX5.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-CioDqx6u.mjs";
+import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-CjVJQDyw.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-DaqNnVkP.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 "3.0.0-rc.3";
+	return "3.0.0-rc.4";
 }
 
 //#endregion

package/dist/vite.d.mts

@@ -1,5 +1,5 @@
-import { r as GenerateFileFormatter } from "./options-saKmD8s1.mjs";
-import { t as OpenAPICodegenConfig } from "./config-1XCOTZ4a.mjs";
+import { r as GenerateFileFormatter } from "./options-BPAjzilp.mjs";
+import { t as OpenAPICodegenConfig } from "./config-C1ME3Ay4.mjs";
 import { Plugin } from "vite";
 
 //#region src/vite/openapi-codegen.plugin.d.ts

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-D-UDIQX5.mjs";
-import { t as runGenerate } from "./generate.runner-CioDqx6u.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-CjVJQDyw.mjs";
+import { t as runGenerate } from "./generate.runner-DaqNnVkP.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts

package/dist/zod.d.mts

@@ -1,4 +1,4 @@
-import { r as ErrorHandler } from "./error-handling-CvW_FecB.mjs";
+import { a as ErrorHandler } from "./error-handling-B4aYKmyL.mjs";
 import { z } from "zod";
 
 //#region src/zod.d.ts

package/dist/zod.mjs

@@ -1,4 +1,4 @@
-import { r as SharedErrorHandler } from "./error-handling-DkPY7Asf.mjs";
+import { i as SharedErrorHandler } from "./error-handling-nneQaE1_.mjs";
 import { z } from "zod";
 
 //#region src/zod.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "3.0.0-rc.3",
+  "version": "3.0.0-rc.4",
   "keywords": [
     "codegen",
     "openapi",