@povio/openapi-codegen-cli 2.0.8-rc.15 → 2.0.8-rc.17

package/dist/acl.d.mts

@@ -1,3 +1,4 @@
+import { r as ErrorHandler } from "./error-handling-p69GkKGP.mjs";
 import * as react from "react";
 import { PropsWithChildren } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
@@ -45,4 +46,14 @@ declare const Can: <TAppAbilities extends AppAbilities = AppAbilities>({
   ...props
 }: CanProps<TAppAbilities>) => react_jsx_runtime0.JSX.Element;
 //#endregion
-export { AbilityContext, type AppAbilities, type AppAbility, Can, createAclGuard };
+//#region src/lib/acl/useAclCheck.d.ts
+interface UseAclCheckProps {
+  errorHandler?: ErrorHandler<never>;
+}
+declare function useAclCheck<TAppAbilities extends AppAbilities = AppAbilities>({
+  errorHandler
+}?: UseAclCheckProps): {
+  checkAcl: (appAbility: TAppAbilities) => void;
+};
+//#endregion
+export { AbilityContext, type AppAbilities, type AppAbility, Can, createAclGuard, useAclCheck };

package/dist/acl.mjs

@@ -1,5 +1,5 @@
-import { n as OpenApiRouter, t as AuthContext } from "./auth.context-DKjzWiaA.mjs";
-import { createContext, useEffect, useState } from "react";
+import { a as SharedErrorHandler, n as OpenApiRouter, t as AuthContext } from "./auth.context-HV1I5QMx.mjs";
+import { createContext, useCallback, useEffect, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 import { AbilityBuilder, createMongoAbility } from "@casl/ability";
 import { unpackRules } from "@casl/ability/extra";
@@ -60,4 +60,14 @@ const Can = ({ use, ...props }) => {
 };
 
 //#endregion
-export { AbilityContext, Can, createAclGuard };
+//#region src/lib/acl/useAclCheck.ts
+function useAclCheck({ errorHandler } = {}) {
+	const ability = AbilityContext.useAbility();
+	return { checkAcl: useCallback((appAbility) => {
+		const can = ability.can;
+		if (!can(...appAbility)) (errorHandler ?? SharedErrorHandler).rethrowError(/* @__PURE__ */ new Error("ACL check failed"));
+	}, [ability, errorHandler]) };
+}
+
+//#endregion
+export { AbilityContext, Can, createAclGuard, useAclCheck };

package/dist/auth.context-HV1I5QMx.mjs

@@ -0,0 +1,244 @@
+import { isAxiosError, isCancel } from "axios";
+import { z } from "zod";
+import i18next from "i18next";
+import { createContext, use, useMemo } from "react";
+import { jsx } from "react/jsx-runtime";
+
+//#region src/lib/assets/locales/en/translation.json
+var translation_default$1 = { openapi: { "sharedErrors": {
+	"dataValidation": "An error occurred while validating the data",
+	"internalError": "An internal error occurred. This is most likely a bug on our end. Please try again later.",
+	"networkError": "A network error occurred. Are you connected to the internet?",
+	"canceledError": "The request was canceled.",
+	"unknownError": "An unknown error occurred. Please try again later.",
+	"unknownErrorWithCode": "An unknown error occurred. Error code: \"{{code}}\""
+} } };
+
+//#endregion
+//#region src/lib/assets/locales/sl/translation.json
+var translation_default = { openapi: { "sharedErrors": {
+	"dataValidation": "Pri preverjanju podatkov je prišlo do napake",
+	"internalError": "Prišlo je do notranje napake.",
+	"networkError": "Prišlo je do napake v omrežju.",
+	"canceledError": "Zahteva je bila preklicana.",
+	"unknownError": "Prišlo je do neznane napake.",
+	"unknownErrorWithCode": "Prišlo je do neznane napake. Koda napake: \"{{code}}\""
+} } };
+
+//#endregion
+//#region src/lib/config/i18n.ts
+const ns = "openapi";
+const resources = {
+	en: { [ns]: translation_default$1 },
+	sl: { [ns]: translation_default }
+};
+const defaultLanguage = "en";
+const i18n = i18next.createInstance();
+i18n.init({
+	compatibilityJSON: "v4",
+	lng: defaultLanguage,
+	fallbackLng: defaultLanguage,
+	resources,
+	ns: Object.keys(resources.en),
+	defaultNS: ns,
+	interpolation: { escapeValue: false }
+});
+const defaultT = i18n.t.bind(i18n);
+
+//#endregion
+//#region src/lib/rest/rest.utils.ts
+let RestUtils;
+(function(_RestUtils) {
+	_RestUtils.extractServerResponseCode = (e) => {
+		if (e instanceof z.ZodError) return "validation-exception";
+		if (!isAxiosError(e)) return null;
+		if (!e.response) return null;
+		const data = e.response.data;
+		if (typeof data?.code === "string") return data.code;
+		return null;
+	};
+	_RestUtils.doesServerErrorMessageContain = (e, text) => {
+		const message = extractServerErrorMessage(e);
+		if (message === null || message === void 0) return false;
+		return message.toLowerCase().includes(text.toLowerCase());
+	};
+	const extractServerErrorMessage = _RestUtils.extractServerErrorMessage = (e) => {
+		if (e instanceof z.ZodError) return e.message;
+		if (!isAxiosError(e)) return null;
+		if (!e.response) return null;
+		const data = e.response.data;
+		if (typeof data?.message === "string") return data.message;
+		return null;
+	};
+	_RestUtils.extractContentDispositionFilename = (headers) => {
+		const contentDisposition = headers["content-disposition"];
+		return contentDisposition ? /filename=["']?([^"';]+)/i.exec(contentDisposition)?.[1] : void 0;
+	};
+})(RestUtils || (RestUtils = {}));
+
+//#endregion
+//#region src/lib/rest/error-handling.ts
+var ApplicationException = class extends Error {
+	code;
+	serverMessage = null;
+	constructor(message, code, serverMessage) {
+		super(message);
+		this.code = code;
+		this.serverMessage = serverMessage;
+	}
+};
+var ErrorHandler = class {
+	entries = [];
+	t;
+	onRethrowError;
+	constructor({ entries, t = defaultT, onRethrowError }) {
+		this.t = t;
+		this.onRethrowError = onRethrowError;
+		const dataValidationError = {
+			code: "DATA_VALIDATION_ERROR",
+			condition: (e) => {
+				return e instanceof z.ZodError;
+			},
+			getMessage: () => this.t("openapi.sharedErrors.dataValidation")
+		};
+		const internalError = {
+			code: "INTERNAL_ERROR",
+			condition: (e) => {
+				if (isAxiosError(e)) return e.response?.status != null && e.response.status >= 500 && e.response.status < 600;
+				return false;
+			},
+			getMessage: () => this.t("openapi.sharedErrors.internalError")
+		};
+		const networkError = {
+			code: "NETWORK_ERROR",
+			condition: (e) => {
+				if (isAxiosError(e)) return e.code === "ERR_NETWORK";
+				return false;
+			},
+			getMessage: () => this.t("openapi.sharedErrors.networkError")
+		};
+		const canceledError = {
+			code: "CANCELED_ERROR",
+			condition: (e) => {
+				if (isCancel(e)) return true;
+				if (isAxiosError(e) && e.code === "ECONNABORTED") return true;
+				return false;
+			},
+			getMessage: () => this.t("openapi.sharedErrors.canceledError")
+		};
+		const unknownError = {
+			code: "UNKNOWN_ERROR",
+			condition: () => true,
+			getMessage: (_, e) => {
+				const code = RestUtils.extractServerResponseCode(e);
+				const serverMessage = RestUtils.extractServerErrorMessage(e);
+				if (code) {
+					let message = `Unknown error, message from server: ${code}`;
+					if (serverMessage) message += ` ${serverMessage}`;
+					return message;
+				}
+				return this.t("openapi.sharedErrors.unknownError");
+			}
+		};
+		this.entries = [
+			...entries,
+			dataValidationError,
+			internalError,
+			networkError,
+			canceledError,
+			unknownError
+		];
+	}
+	matchesEntry(error, entry, code) {
+		if (entry.condition) return entry.condition(error);
+		return code === entry.code;
+	}
+	setTranslateFunction(t) {
+		this.t = t;
+	}
+	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);
+		this.onRethrowError?.(error, exception);
+		throw exception;
+	}
+	getError(error) {
+		if (error instanceof ApplicationException) return error;
+		return null;
+	}
+	getErrorCode(error) {
+		if (error instanceof ApplicationException) return error.code;
+		return null;
+	}
+	static getErrorMessage(error, fallbackToUnknown = true) {
+		if (typeof error === "string") return error;
+		if (error instanceof Error) return error.message;
+		if (error instanceof ApplicationException) {
+			if (error.serverMessage != null) return error.serverMessage;
+			return error.message;
+		}
+		if (fallbackToUnknown) return defaultT("openapi.sharedErrors.unknownError");
+		return null;
+	}
+};
+const SharedErrorHandler = new ErrorHandler({ entries: [] });
+
+//#endregion
+//#region src/lib/config/router.context.tsx
+let OpenApiRouter;
+(function(_OpenApiRouter) {
+	const Context = createContext(null);
+	_OpenApiRouter.Provider = ({ children, replace }) => {
+		return /* @__PURE__ */ jsx(Context, {
+			value: useMemo(() => ({ replace }), [replace]),
+			children
+		});
+	};
+	_OpenApiRouter.useRouter = () => {
+		const context = use(Context);
+		if (!context) throw new Error("useRouter must be used within an OpenApiRouter.Provider");
+		return context;
+	};
+})(OpenApiRouter || (OpenApiRouter = {}));
+
+//#endregion
+//#region src/lib/auth/auth.context.tsx
+let AuthContext;
+(function(_AuthContext) {
+	const Context = createContext({});
+	_AuthContext.Provider = ({ isAuthenticated, isInitializing, logout, updateTokens, accessToken, user, userPromise, routes, loadingState, children }) => {
+		const value = useMemo(() => ({
+			isAuthenticated,
+			isInitializing,
+			logout,
+			updateTokens,
+			accessToken,
+			user,
+			userPromise,
+			routes,
+			loadingState
+		}), [
+			isAuthenticated,
+			isInitializing,
+			logout,
+			updateTokens,
+			accessToken,
+			user,
+			userPromise,
+			routes,
+			loadingState
+		]);
+		return /* @__PURE__ */ jsx(Context.Provider, {
+			value,
+			children
+		});
+	};
+	_AuthContext.useAuth = () => {
+		return use(Context);
+	};
+})(AuthContext || (AuthContext = {}));
+
+//#endregion
+export { SharedErrorHandler as a, resources as c, ErrorHandler as i, OpenApiRouter as n, RestUtils as o, ApplicationException as r, ns as s, AuthContext as t };

package/dist/{config-Cu_GYfai.d.mts → config-B4HK4BLi.d.mts}

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

package/dist/error-handling-p69GkKGP.d.mts

@@ -0,0 +1,38 @@
+import { TFunction } from "i18next";
+
+//#region src/lib/rest/error-handling.d.ts
+type GeneralErrorCodes = "DATA_VALIDATION_ERROR" | "NETWORK_ERROR" | "CANCELED_ERROR" | "INTERNAL_ERROR" | "UNKNOWN_ERROR";
+declare class ApplicationException<CodeT> extends Error {
+  code: CodeT;
+  serverMessage: string | null;
+  constructor(message: string, code: CodeT, serverMessage: string | null);
+}
+interface ErrorEntry<CodeT> {
+  code: CodeT;
+  condition?: (error: unknown) => boolean;
+  getMessage: (t: TFunction, error: unknown) => string;
+}
+interface ErrorHandlerOptions<CodeT extends string> {
+  entries: ErrorEntry<CodeT>[];
+  t?: TFunction;
+  onRethrowError?: (error: unknown, exception: ApplicationException<CodeT | GeneralErrorCodes>) => void;
+}
+declare class ErrorHandler<CodeT extends string> {
+  entries: ErrorEntry<CodeT | GeneralErrorCodes>[];
+  private t;
+  private onRethrowError?;
+  constructor({
+    entries,
+    t,
+    onRethrowError
+  }: ErrorHandlerOptions<CodeT>);
+  private matchesEntry;
+  setTranslateFunction(t: TFunction): void;
+  rethrowError(error: unknown): ApplicationException<CodeT | GeneralErrorCodes>;
+  getError(error: unknown): ApplicationException<CodeT | GeneralErrorCodes> | null;
+  getErrorCode(error: unknown): CodeT | GeneralErrorCodes | null;
+  static getErrorMessage(error: unknown, fallbackToUnknown?: boolean): string | null;
+}
+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 };

package/dist/{generate.runner-tAVdp_fl.mjs → generate.runner-CU-WCMgQ.mjs}

@@ -1,4 +1,4 @@
-import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs";
+import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-CV_esDUW.mjs";
 import fs from "fs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";

package/dist/{generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs → generateCodeFromOpenAPIDoc-CV_esDUW.mjs}

@@ -488,11 +488,6 @@ const ERROR_HANDLING_IMPORT = {
 	bindings: [ERROR_HANDLERS.ErrorHandler, ERROR_HANDLERS.SharedErrorHandler],
 	from: PACKAGE_IMPORT_PATH
 };
-const ABILITY_CONTEXT = "AbilityContext";
-const ABILITY_CONTEXT_IMPORT = {
-	bindings: [ABILITY_CONTEXT],
-	from: ACL_PACKAGE_IMPORT_PATH
-};
 const BUILDERS_UTILS = {
 	dynamicInputs: "dynamicInputs",
 	dynamicColumns: "dynamicColumns"
@@ -583,10 +578,6 @@ const ACL_APP_ABILITY_FILE = {
 	extension: "ts"
 };
 const ACL_APP_ABILITIES = "AppAbilities";
-const ACL_CHECK_FILE = {
-	fileName: "acl/useAclCheck",
-	extension: "ts"
-};
 const ACL_CHECK_HOOK = "useAclCheck";
 const CASL_ABILITY_BINDING = {
 	abilityTuple: "AbilityTuple",
@@ -1073,15 +1064,9 @@ function getQueryTypesImportPath(options) {
 function getMutationEffectsImportPath(options) {
 	return `${getImportPath(options)}${MUTATION_EFFECTS_FILE.fileName}`;
 }
-function getAclCheckImportPath(options) {
-	return `${getImportPath(options)}${ACL_CHECK_FILE.fileName}`;
-}
 function getZodExtendedImportPath(options) {
 	return `${getImportPath(options)}${ZOD_EXTENDED_FILE.fileName}`;
 }
-function getAppAbilitiesImportPath(options) {
-	return `${getImportPath(options)}${ACL_APP_ABILITY_FILE.fileName}`;
-}
 
 //#endregion
 //#region src/generators/utils/ts.utils.ts
@@ -3773,11 +3758,8 @@ function generateQueries(params) {
 	const queryImport = {
 		bindings: [
 			...queryEndpoints.length > 0 ? [QUERY_HOOKS.query] : [],
-			...queryEndpoints.length > 0 ? ["UseQueryResult"] : [],
 			...resolver.options.infiniteQueries && infiniteQueryEndpoints.length > 0 ? [QUERY_HOOKS.infiniteQuery] : [],
-			...resolver.options.infiniteQueries && infiniteQueryEndpoints.length > 0 ? ["UseInfiniteQueryResult"] : [],
-			...mutationEndpoints.length > 0 ? [QUERY_HOOKS.mutation] : [],
-			...mutationEndpoints.length > 0 ? ["UseMutationResult"] : []
+			...mutationEndpoints.length > 0 ? [QUERY_HOOKS.mutation] : []
 		],
 		from: QUERY_IMPORT.from
 	};
@@ -3794,7 +3776,7 @@ function generateQueries(params) {
 	const hasAclCheck = resolver.options.checkAcl && aclEndpoints.length > 0;
 	const aclCheckImport = {
 		bindings: [ACL_CHECK_HOOK],
-		from: getAclCheckImportPath(resolver.options)
+		from: ACL_PACKAGE_IMPORT_PATH
 	};
 	const queryTypesImport = {
 		bindings: [
@@ -3986,7 +3968,7 @@ function renderAclCheckCall(resolver, endpoint, replacements, indent = "") {
 function addAsteriskAfterNewLine(str) {
 	return str.replace(/\n/g, "\n *");
 }
-function renderQueryJsDocs({ resolver, endpoint, mode }) {
+function renderQueryJsDocs({ resolver, endpoint, mode, tag }) {
 	const lines = ["/** "];
 	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" : ""}`);
@@ -3994,13 +3976,16 @@ function renderQueryJsDocs({ resolver, endpoint, mode }) {
 	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 \`${getAbilityFunctionName(endpoint)}\` ability `);
-	const params = getEndpointParamMapping(resolver, endpoint, { ...mode !== "infiniteQuery" ? { includeFileParam: true } : {} });
+	const params = getEndpointParamMapping(resolver, endpoint, {
+		...mode !== "infiniteQuery" ? { includeFileParam: true } : {},
+		modelNamespaceTag: tag
+	});
 	for (const endpointParam of params) lines.push(` * @param { ${endpointParam.type} } ${endpointParam.name} ${renderEndpointParamDescription(endpointParam)}`);
 	if (mode === "query") lines.push(" * @param { AppQueryOptions } options Query options");
 	else if (mode === "mutation") lines.push(` * @param { AppMutationOptions${resolver.options.mutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""} } options Mutation options`);
 	else lines.push(" * @param { AppInfiniteQueryOptions } options Infinite query options");
 	const withAxiosResponse = endpoint.mediaDownload && mode !== "infiniteQuery";
-	const resultType = `${withAxiosResponse ? "AxiosResponse<" : ""}${getImportedZodSchemaInferedTypeName(resolver, endpoint.response)}${withAxiosResponse ? ">" : ""}`;
+	const resultType = `${withAxiosResponse ? "AxiosResponse<" : ""}${getImportedZodSchemaInferedTypeName(resolver, endpoint.response, void 0, tag)}${withAxiosResponse ? ">" : ""}`;
 	if (mode === "query") lines.push(` * @returns { UseQueryResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
 	else if (mode === "mutation") lines.push(` * @returns { UseMutationResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
 	else lines.push(` * @returns { UseInfiniteQueryResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
@@ -4081,10 +4066,14 @@ function renderInlineEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const resolvedEndpointArgs = renderEndpointArgs(resolver, endpoint, {}, workspaceParamReplacements);
-	const endpointParams = renderEndpointParams(resolver, endpoint, { optionalPathParams: resolver.options.workspaceContext });
+	const endpointParams = renderEndpointParams(resolver, endpoint, {
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
+	});
 	const hasQueryFn = endpointArgs.length > 0 || hasAxiosRequestConfig || hasAclCheck;
 	const hasQueryFnBody = Boolean(hasAclCheck) || Object.keys(workspaceParamReplacements).length > 0;
 	const importedEndpoint = inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options);
@@ -4092,7 +4081,8 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "query"
+		mode: "query",
+		tag
 	}));
 	lines.push(`export const ${getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${importedEndpoint}, TData>${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
@@ -4117,10 +4107,12 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 	const hasMutationEffects = resolver.options.mutationEffects;
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		includeFileParam: true,
-		optionalPathParams: resolver.options.workspaceContext
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
 	});
 	const resolvedEndpointArgs = renderEndpointArgs(resolver, endpoint, {}, workspaceParamReplacements);
 	const destructuredMutationArgs = renderEndpointArgs(resolver, endpoint, { includeFileParam: true });
@@ -4133,7 +4125,8 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "mutation"
+		mode: "mutation",
+		tag
 	}));
 	lines.push(`export const ${getQueryName(endpoint, true)} = (options?: AppMutationOptions<typeof ${endpointFunction}, { ${mutationVariablesType} }>${hasMutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
@@ -4233,14 +4226,15 @@ function groupEndpoints(endpoints, resolver) {
 function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		excludePageParam: true,
-		optionalPathParams: resolver.options.workspaceContext
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
 	});
 	const endpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
 	const resolvedEndpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true }, workspaceParamReplacements);
-	renderEndpointArgs(resolver, endpoint, { replacePageParam: true });
 	const resolvedEndpointArgsWithPage = renderEndpointArgs(resolver, endpoint, { replacePageParam: true }, workspaceParamReplacements);
 	const endpointFunction = inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options);
 	const hasQueryFnBody = Boolean(hasAclCheck) || Object.keys(workspaceParamReplacements).length > 0;
@@ -4248,10 +4242,10 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "infiniteQuery"
+		mode: "infiniteQuery",
+		tag
 	}));
 	lines.push(`export const ${getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${endpointFunction}, TData>${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
-	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
@@ -4269,43 +4263,11 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(`      return pageParam * limitParam < ${resolver.options.infiniteQueryResponseParamNames.totalItems} ? pageParam + 1 : null;`);
 	lines.push("    },");
 	lines.push("    ...options,");
-	lines.push("    onError: options?.onError ?? queryConfig.onError,");
 	lines.push("  });");
 	lines.push("};");
 	return lines.join("\n");
 }
 
-//#endregion
-//#region src/generators/generate/generateAclCheck.ts
-function generateAclCheck(resolver) {
-	const abilityContextImportPath = resolver.options.abilityContextImportPath ?? ABILITY_CONTEXT_IMPORT.from;
-	const appAbilitiesImportPath = getAppAbilitiesImportPath(resolver.options);
-	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}";
-import { ${ABILITY_CONTEXT} } from "${abilityContextImportPath}";
-import { useCallback } from "react";
-import { ${ACL_APP_ABILITIES} } from "${appAbilitiesImportPath}";
-
-interface UseAclCheckProps {
-  errorHandler?: ${ERROR_HANDLERS.ErrorHandler}<never>;
-}
-
-export function ${ACL_CHECK_HOOK}({ errorHandler }: UseAclCheckProps = {}) {
-  const ability = ${ABILITY_CONTEXT}.useAbility${genericAppAbilities}();
-
-  const checkAcl = useCallback((appAbility: ${ACL_APP_ABILITIES}) => {
-    if (!ability.can(...(appAbility as ${CASL_ABILITY_BINDING.abilityTuple}))) {
-      (errorHandler ?? ${ERROR_HANDLERS.SharedErrorHandler}).rethrowError(new Error("ACL check failed"));
-    }
-  }, [ability, errorHandler]);
-
-  return { checkAcl };
-}
-`;
-}
-
 //#endregion
 //#region src/generators/generate/generateAppRestClient.ts
 function generateAppRestClient(resolver) {
@@ -4415,13 +4377,7 @@ function getAclFiles(data, resolver) {
 			resolver,
 			data
 		})
-	}, ...resolver.options.checkAcl ? [{
-		fileName: getOutputFileName({
-			output: resolver.options.output,
-			fileName: getFileNameWithExtension(ACL_CHECK_FILE)
-		}),
-		content: generateAclCheck(resolver)
-	}] : []];
+	}];
 }
 function getMutationEffectsFiles(data, resolver) {
 	if (!resolver.options.mutationEffects) return [];

package/dist/generator.d.mts

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

package/dist/generator.mjs

@@ -1,4 +1,4 @@
-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-CxXf-IaZ.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-CV_esDUW.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts

package/dist/index.d.mts

@@ -1,48 +1,14 @@
-import "./options-DBz5YE3s.mjs";
-import { t as OpenAPICodegenConfig } from "./config-Cu_GYfai.mjs";
+import { a as GeneralErrorCodes, i as ErrorHandlerOptions, n as ErrorEntry, o as SharedErrorHandler, r as ErrorHandler, t as ApplicationException } from "./error-handling-p69GkKGP.mjs";
+import "./options-Bvmh6rai.mjs";
+import { t as OpenAPICodegenConfig } from "./config-B4HK4BLi.mjs";
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
-import { TFunction } from "i18next";
+import "i18next";
 import * as react from "react";
 import { PropsWithChildren, ReactNode } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { InfiniteData, QueryKey, UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
 
-//#region src/lib/rest/error-handling.d.ts
-type GeneralErrorCodes = "DATA_VALIDATION_ERROR" | "NETWORK_ERROR" | "CANCELED_ERROR" | "INTERNAL_ERROR" | "UNKNOWN_ERROR";
-declare class ApplicationException<CodeT> extends Error {
-  code: CodeT;
-  serverMessage: string | null;
-  constructor(message: string, code: CodeT, serverMessage: string | null);
-}
-interface ErrorEntry<CodeT> {
-  code: CodeT;
-  condition?: (error: unknown) => boolean;
-  getMessage: (t: TFunction, error: unknown) => string;
-}
-interface ErrorHandlerOptions<CodeT extends string> {
-  entries: ErrorEntry<CodeT>[];
-  t?: TFunction;
-  onRethrowError?: (error: unknown, exception: ApplicationException<CodeT | GeneralErrorCodes>) => void;
-}
-declare class ErrorHandler<CodeT extends string> {
-  entries: ErrorEntry<CodeT | GeneralErrorCodes>[];
-  private t;
-  private onRethrowError?;
-  constructor({
-    entries,
-    t,
-    onRethrowError
-  }: ErrorHandlerOptions<CodeT>);
-  private matchesEntry;
-  setTranslateFunction(t: TFunction): void;
-  rethrowError(error: unknown): ApplicationException<CodeT | GeneralErrorCodes>;
-  getError(error: unknown): ApplicationException<CodeT | GeneralErrorCodes> | null;
-  getErrorCode(error: unknown): CodeT | GeneralErrorCodes | null;
-  static getErrorMessage(error: unknown, fallbackToUnknown?: boolean): string | null;
-}
-declare const SharedErrorHandler: ErrorHandler<never>;
-//#endregion
 //#region src/lib/rest/rest-interceptor.d.ts
 declare class RestInterceptor<T extends any[]> {
   private applyInterceptor;

package/dist/index.mjs

@@ -1,192 +1,9 @@
-import { n as OpenApiRouter, t as AuthContext } from "./auth.context-DKjzWiaA.mjs";
-import axios, { isAxiosError, isCancel } from "axios";
+import { a as SharedErrorHandler, c as resources, i as ErrorHandler, n as OpenApiRouter, o as RestUtils, r as ApplicationException, s as ns, t as AuthContext } from "./auth.context-HV1I5QMx.mjs";
+import axios from "axios";
 import { z } from "zod";
-import i18next from "i18next";
 import { createContext, use, useEffect, useMemo, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 
-//#region src/lib/assets/locales/en/translation.json
-var translation_default$1 = { openapi: { "sharedErrors": {
-	"dataValidation": "An error occurred while validating the data",
-	"internalError": "An internal error occurred. This is most likely a bug on our end. Please try again later.",
-	"networkError": "A network error occurred. Are you connected to the internet?",
-	"canceledError": "The request was canceled.",
-	"unknownError": "An unknown error occurred. Please try again later.",
-	"unknownErrorWithCode": "An unknown error occurred. Error code: \"{{code}}\""
-} } };
-
-//#endregion
-//#region src/lib/assets/locales/sl/translation.json
-var translation_default = { openapi: { "sharedErrors": {
-	"dataValidation": "Pri preverjanju podatkov je prišlo do napake",
-	"internalError": "Prišlo je do notranje napake.",
-	"networkError": "Prišlo je do napake v omrežju.",
-	"canceledError": "Zahteva je bila preklicana.",
-	"unknownError": "Prišlo je do neznane napake.",
-	"unknownErrorWithCode": "Prišlo je do neznane napake. Koda napake: \"{{code}}\""
-} } };
-
-//#endregion
-//#region src/lib/config/i18n.ts
-const ns = "openapi";
-const resources = {
-	en: { [ns]: translation_default$1 },
-	sl: { [ns]: translation_default }
-};
-const defaultLanguage = "en";
-const i18n = i18next.createInstance();
-i18n.init({
-	compatibilityJSON: "v4",
-	lng: defaultLanguage,
-	fallbackLng: defaultLanguage,
-	resources,
-	ns: Object.keys(resources.en),
-	defaultNS: ns,
-	interpolation: { escapeValue: false }
-});
-const defaultT = i18n.t.bind(i18n);
-
-//#endregion
-//#region src/lib/rest/rest.utils.ts
-let RestUtils;
-(function(_RestUtils) {
-	_RestUtils.extractServerResponseCode = (e) => {
-		if (e instanceof z.ZodError) return "validation-exception";
-		if (!isAxiosError(e)) return null;
-		if (!e.response) return null;
-		const data = e.response.data;
-		if (typeof data?.code === "string") return data.code;
-		return null;
-	};
-	_RestUtils.doesServerErrorMessageContain = (e, text) => {
-		const message = extractServerErrorMessage(e);
-		if (message === null || message === void 0) return false;
-		return message.toLowerCase().includes(text.toLowerCase());
-	};
-	const extractServerErrorMessage = _RestUtils.extractServerErrorMessage = (e) => {
-		if (e instanceof z.ZodError) return e.message;
-		if (!isAxiosError(e)) return null;
-		if (!e.response) return null;
-		const data = e.response.data;
-		if (typeof data?.message === "string") return data.message;
-		return null;
-	};
-	_RestUtils.extractContentDispositionFilename = (headers) => {
-		const contentDisposition = headers["content-disposition"];
-		return contentDisposition ? /filename=["']?([^"';]+)/i.exec(contentDisposition)?.[1] : void 0;
-	};
-})(RestUtils || (RestUtils = {}));
-
-//#endregion
-//#region src/lib/rest/error-handling.ts
-var ApplicationException = class extends Error {
-	code;
-	serverMessage = null;
-	constructor(message, code, serverMessage) {
-		super(message);
-		this.code = code;
-		this.serverMessage = serverMessage;
-	}
-};
-var ErrorHandler = class {
-	entries = [];
-	t;
-	onRethrowError;
-	constructor({ entries, t = defaultT, onRethrowError }) {
-		this.t = t;
-		this.onRethrowError = onRethrowError;
-		const dataValidationError = {
-			code: "DATA_VALIDATION_ERROR",
-			condition: (e) => {
-				return e instanceof z.ZodError;
-			},
-			getMessage: () => this.t("openapi.sharedErrors.dataValidation")
-		};
-		const internalError = {
-			code: "INTERNAL_ERROR",
-			condition: (e) => {
-				if (isAxiosError(e)) return e.response?.status != null && e.response.status >= 500 && e.response.status < 600;
-				return false;
-			},
-			getMessage: () => this.t("openapi.sharedErrors.internalError")
-		};
-		const networkError = {
-			code: "NETWORK_ERROR",
-			condition: (e) => {
-				if (isAxiosError(e)) return e.code === "ERR_NETWORK";
-				return false;
-			},
-			getMessage: () => this.t("openapi.sharedErrors.networkError")
-		};
-		const canceledError = {
-			code: "CANCELED_ERROR",
-			condition: (e) => {
-				if (isCancel(e)) return true;
-				if (isAxiosError(e) && e.code === "ECONNABORTED") return true;
-				return false;
-			},
-			getMessage: () => this.t("openapi.sharedErrors.canceledError")
-		};
-		const unknownError = {
-			code: "UNKNOWN_ERROR",
-			condition: () => true,
-			getMessage: (_, e) => {
-				const code = RestUtils.extractServerResponseCode(e);
-				const serverMessage = RestUtils.extractServerErrorMessage(e);
-				if (code) {
-					let message = `Unknown error, message from server: ${code}`;
-					if (serverMessage) message += ` ${serverMessage}`;
-					return message;
-				}
-				return this.t("openapi.sharedErrors.unknownError");
-			}
-		};
-		this.entries = [
-			...entries,
-			dataValidationError,
-			internalError,
-			networkError,
-			canceledError,
-			unknownError
-		];
-	}
-	matchesEntry(error, entry, code) {
-		if (entry.condition) return entry.condition(error);
-		return code === entry.code;
-	}
-	setTranslateFunction(t) {
-		this.t = t;
-	}
-	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);
-		this.onRethrowError?.(error, exception);
-		throw exception;
-	}
-	getError(error) {
-		if (error instanceof ApplicationException) return error;
-		return null;
-	}
-	getErrorCode(error) {
-		if (error instanceof ApplicationException) return error.code;
-		return null;
-	}
-	static getErrorMessage(error, fallbackToUnknown = true) {
-		if (typeof error === "string") return error;
-		if (error instanceof Error) return error.message;
-		if (error instanceof ApplicationException) {
-			if (error.serverMessage != null) return error.serverMessage;
-			return error.message;
-		}
-		if (fallbackToUnknown) return defaultT("openapi.sharedErrors.unknownError");
-		return null;
-	}
-};
-const SharedErrorHandler = new ErrorHandler({ entries: [] });
-
-//#endregion
 //#region src/lib/rest/rest-client.ts
 var RestClient = class {
 	client;

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-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-CxXf-IaZ.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-tAVdp_fl.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-CV_esDUW.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-CU-WCMgQ.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.15";
+	return "2.0.8-rc.17";
 }
 
 //#endregion

package/dist/vite.d.mts

@@ -1,5 +1,5 @@
-import "./options-DBz5YE3s.mjs";
-import { t as OpenAPICodegenConfig } from "./config-Cu_GYfai.mjs";
+import "./options-Bvmh6rai.mjs";
+import { t as OpenAPICodegenConfig } from "./config-B4HK4BLi.mjs";
 import { Plugin } from "vite";
 
 //#region src/vite/openapi-codegen.plugin.d.ts

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { x as Profiler } from "./generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs";
-import { t as runGenerate } from "./generate.runner-tAVdp_fl.mjs";
+import { x as Profiler } from "./generateCodeFromOpenAPIDoc-CV_esDUW.mjs";
+import { t as runGenerate } from "./generate.runner-CU-WCMgQ.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.15",
+  "version": "2.0.8-rc.17",
   "keywords": [
     "codegen",
     "openapi",

package/dist/auth.context-DKjzWiaA.mjs

@@ -1,59 +0,0 @@
-import { createContext, use, useMemo } from "react";
-import { jsx } from "react/jsx-runtime";
-
-//#region src/lib/config/router.context.tsx
-let OpenApiRouter;
-(function(_OpenApiRouter) {
-	const Context = createContext(null);
-	_OpenApiRouter.Provider = ({ children, replace }) => {
-		return /* @__PURE__ */ jsx(Context, {
-			value: useMemo(() => ({ replace }), [replace]),
-			children
-		});
-	};
-	_OpenApiRouter.useRouter = () => {
-		const context = use(Context);
-		if (!context) throw new Error("useRouter must be used within an OpenApiRouter.Provider");
-		return context;
-	};
-})(OpenApiRouter || (OpenApiRouter = {}));
-
-//#endregion
-//#region src/lib/auth/auth.context.tsx
-let AuthContext;
-(function(_AuthContext) {
-	const Context = createContext({});
-	_AuthContext.Provider = ({ isAuthenticated, isInitializing, logout, updateTokens, accessToken, user, userPromise, routes, loadingState, children }) => {
-		const value = useMemo(() => ({
-			isAuthenticated,
-			isInitializing,
-			logout,
-			updateTokens,
-			accessToken,
-			user,
-			userPromise,
-			routes,
-			loadingState
-		}), [
-			isAuthenticated,
-			isInitializing,
-			logout,
-			updateTokens,
-			accessToken,
-			user,
-			userPromise,
-			routes,
-			loadingState
-		]);
-		return /* @__PURE__ */ jsx(Context.Provider, {
-			value,
-			children
-		});
-	};
-	_AuthContext.useAuth = () => {
-		return use(Context);
-	};
-})(AuthContext || (AuthContext = {}));
-
-//#endregion
-export { OpenApiRouter as n, AuthContext as t };