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

package/README.md

@@ -283,6 +283,24 @@ import { OpenApiQueryConfig } from "@povio/openapi-codegen-cli/query";
 </OpenApiQueryConfig.Provider>;
 ```
 
+### Typed invalidation maps
+
+With `mutationEffects` (the default), `queryModules.ts` exports `QueryModuleMutations` (for each module, the `data` and `variables` of its mutation hooks) and registers it globally, so `InvalidationMap<QueryModule>` types each module's callback from the spec:
+
+```ts
+import type { InvalidationMap } from "@povio/openapi-codegen-cli/query";
+import { QueryModule } from "@/data/queryModules";
+
+export const invalidationMap: InvalidationMap<QueryModule> = {
+  // `data` is any of the module's mutation responses; variables that only some
+  // of its mutations take (here `id`) are optional.
+  [QueryModule.Items]: (data, { officeId, id }) => [["items", officeId, id]],
+};
+```
+
+The registration is global, so a program with several generated clients should pass the mutations explicitly
+instead: `InvalidationMap<QueryModule, QueryModuleMutations>`.
+
 ### Runtime response validation
 
 Use `OpenApiQueryConfig.Provider` to allow generated GET query hooks to return invalid response data while still logging the response Zod error to the console. Non-GET requests still throw on invalid response data.

package/dist/acl.d.mts

@@ -1,4 +1,4 @@
-import { a as ErrorHandler } from "./error-handling-LPEPQV1V.mjs";
+import { a as ErrorHandler } from "./error-handling-BpAQHWrU.mjs";
 import { PropsWithChildren } from "react";
 import { AbilityTuple, PureAbility, RawRuleOf, Subject } from "@casl/ability";
 import { PackRule } from "@casl/ability/extra";

package/dist/axios.d.mts

@@ -1,2 +1,2 @@
-import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-BSXsrOff.mjs";
+import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-CbS77dei.mjs";
 export { type RestClient as IRestClient, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor };

package/dist/config.d.mts

@@ -1,4 +1,4 @@
 import { i as resources, n as configureTranslations, r as ns, t as TranslateFunction } from "./i18n-B_brQh4X.mjs";
 import { n as useWorkspaceContext, r as OpenApiRouter, t as OpenApiWorkspaceContext } from "./workspace.context-isVY9ves.mjs";
-import { i as QueryModule, n as InvalidationMapFunc, r as OpenApiQueryConfig, t as InvalidationMap } from "./queryConfig.context-aO4QOLru.mjs";
-export { type InvalidationMap, type InvalidationMapFunc, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type TranslateFunction, configureTranslations, ns, resources, useWorkspaceContext };
+import { a as MutationEffectsTypes, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-DjhzewdL.mjs";
+export { type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsTypes, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type TranslateFunction, configureTranslations, ns, resources, useWorkspaceContext };

package/dist/{error-handling-LPEPQV1V.d.mts → error-handling-BpAQHWrU.d.mts}

@@ -43,5 +43,7 @@ declare class ErrorHandler<CodeT extends string | number> {
   static getErrorMessage(error: unknown, fallbackToUnknown?: boolean): string | null;
 }
 declare const SharedErrorHandler: ErrorHandler<never>;
+/** What a REST client needs from an error handler; every `ErrorHandler<Codes>` satisfies it. */
+type ErrorRethrower = Pick<ErrorHandler<string | number>, "rethrowError">;
 //#endregion
-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 };
+export { ErrorHandler as a, GeneralErrorCodes as c, ErrorEntry as i, SharedErrorHandler as l, DomainErrorEntry as n, ErrorHandlerOptions as o, DomainErrorRegistry as r, ErrorRethrower as s, ApplicationException as t };

package/dist/errors.d.mts

@@ -1,3 +1,3 @@
-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-LPEPQV1V.mjs";
+import { a as ErrorHandler, c as GeneralErrorCodes, i as ErrorEntry, l as SharedErrorHandler, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as ErrorRethrower, t as ApplicationException } from "./error-handling-BpAQHWrU.mjs";
 import { t as RestUtils } from "./rest.utils-DpiFIdhF.mjs";
-export { ApplicationException, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, RestUtils, SharedErrorHandler };
+export { ApplicationException, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type ErrorRethrower, type GeneralErrorCodes, RestUtils, SharedErrorHandler };

package/dist/{generate.runner-BtPpBVj9.mjs → generate.runner-Sh0Ps6AW.mjs}

@@ -1576,7 +1576,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-D1H6MZiS.mjs").then((n) => n.n);
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-B8FAsxWE.mjs").then((n) => n.n);
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/{generateCodeFromOpenAPIDoc-D1H6MZiS.mjs → generateCodeFromOpenAPIDoc-B8FAsxWE.mjs}

@@ -1,5 +1,5 @@
-import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fJCwtr-2.mjs";
-import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as NATIVE_PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as AXIOS_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, an as wrapWithQuotesIfNeeded, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as CONFIG_PACKAGE_IMPORT_PATH } from "./generate.runner-BtPpBVj9.mjs";
+import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-CXYNMMMt.mjs";
+import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as NATIVE_PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as AXIOS_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, an as wrapWithQuotesIfNeeded, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as CONFIG_PACKAGE_IMPORT_PATH } from "./generate.runner-Sh0Ps6AW.mjs";
 import "node:module";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -1787,13 +1787,38 @@ function generateQueryModules({ resolver, data }) {
 				type: "queries",
 				tag,
 				options: resolver.options
-			})
+			}),
+			mutationHooks: endpoints.filter(isMutation).map((endpoint) => getQueryName(endpoint, true))
 		});
 	});
+	const mutationModules = modules.filter((module) => module.mutationHooks.length > 0);
 	const lines = [];
+	if (mutationModules.length > 0) {
+		lines.push(`import type { MutationEffectsOf } from "${getQueryTypesImportPath(resolver.options)}";`);
+		for (const module of mutationModules) {
+			const from = `${getImportPath(resolver.options, true)}${getTagImportPath({
+				type: "queries",
+				tag: module.tag,
+				options: resolver.options
+			})}`;
+			lines.push(resolver.options.tsNamespaces ? `import type { ${module.namespace} } from "${from}";` : `import type * as ${module.namespace} from "${from}";`);
+		}
+		lines.push("");
+	}
 	lines.push("export const enum QueryModule {");
 	for (const module of modules) lines.push(`   ${module.tag} = "${module.namespace}",`);
 	lines.push("}");
+	lines.push("");
+	lines.push("export interface QueryModuleMutations {");
+	for (const module of mutationModules) {
+		const hooks = module.mutationHooks.map((hook) => `typeof ${module.namespace}.${hook}`).join(" | ");
+		lines.push(`   [QueryModule.${module.tag}]: MutationEffectsOf<${hooks}>;`);
+	}
+	lines.push("}");
+	lines.push("");
+	lines.push("declare global {");
+	lines.push("   interface OpenApiCodegenQueryModuleMutations extends QueryModuleMutations {}");
+	lines.push("}");
 	return lines.join("\n");
 }
 //#endregion

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

@@ -3770,13 +3770,38 @@ function generateQueryModules({ resolver, data }) {
 				type: "queries",
 				tag,
 				options: resolver.options
-			})
+			}),
+			mutationHooks: endpoints.filter(require_generate_utils.isMutation).map((endpoint) => require_generate_utils.getQueryName(endpoint, true))
 		});
 	});
+	const mutationModules = modules.filter((module) => module.mutationHooks.length > 0);
 	const lines = [];
+	if (mutationModules.length > 0) {
+		lines.push(`import type { MutationEffectsOf } from "${require_generate_utils.getQueryTypesImportPath(resolver.options)}";`);
+		for (const module of mutationModules) {
+			const from = `${require_generate_utils.getImportPath(resolver.options, true)}${require_generate_utils.getTagImportPath({
+				type: "queries",
+				tag: module.tag,
+				options: resolver.options
+			})}`;
+			lines.push(resolver.options.tsNamespaces ? `import type { ${module.namespace} } from "${from}";` : `import type * as ${module.namespace} from "${from}";`);
+		}
+		lines.push("");
+	}
 	lines.push("export const enum QueryModule {");
 	for (const module of modules) lines.push(`   ${module.tag} = "${module.namespace}",`);
 	lines.push("}");
+	lines.push("");
+	lines.push("export interface QueryModuleMutations {");
+	for (const module of mutationModules) {
+		const hooks = module.mutationHooks.map((hook) => `typeof ${module.namespace}.${hook}`).join(" | ");
+		lines.push(`   [QueryModule.${module.tag}]: MutationEffectsOf<${hooks}>;`);
+	}
+	lines.push("}");
+	lines.push("");
+	lines.push("declare global {");
+	lines.push("   interface OpenApiCodegenQueryModuleMutations extends QueryModuleMutations {}");
+	lines.push("}");
 	return lines.join("\n");
 }
 //#endregion

package/dist/generator.mjs

@@ -1,6 +1,6 @@
-import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-D1H6MZiS.mjs";
-import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fJCwtr-2.mjs";
-import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-BtPpBVj9.mjs";
+import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-B8FAsxWE.mjs";
+import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-CXYNMMMt.mjs";
+import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-Sh0Ps6AW.mjs";
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts
 async function getMetadataFromOpenAPIDoc(openApiDoc, options) {
 	const { resolver, data } = await getDataFromOpenAPIDoc(openApiDoc, options);

package/dist/{getDataFromOpenAPIDoc-fJCwtr-2.mjs → getDataFromOpenAPIDoc-CXYNMMMt.mjs}

@@ -1,4 +1,4 @@
-import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./generate.runner-BtPpBVj9.mjs";
+import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./generate.runner-Sh0Ps6AW.mjs";
 //#region src/generators/const/validation.const.ts
 const HTTP_STATUS_CODES = {
 	"100": "Continue",

package/dist/index.d.mts

@@ -1,12 +1,12 @@
 import { i as resources, n as configureTranslations, r as ns, t as TranslateFunction } from "./i18n-B_brQh4X.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-LPEPQV1V.mjs";
+import { a as ErrorHandler, c as GeneralErrorCodes, i as ErrorEntry, l as SharedErrorHandler, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as ErrorRethrower, t as ApplicationException } from "./error-handling-BpAQHWrU.mjs";
 import { n as AuthGuardProps, r as AuthContext, t as AuthGuard } from "./AuthGuard-GbtTDXs0.mjs";
-import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-BSXsrOff.mjs";
+import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-CbS77dei.mjs";
 import { n as useWorkspaceContext, r as OpenApiRouter, t as OpenApiWorkspaceContext } from "./workspace.context-isVY9ves.mjs";
-import { i as QueryModule, n as InvalidationMapFunc, r as OpenApiQueryConfig, t as InvalidationMap } from "./queryConfig.context-aO4QOLru.mjs";
+import { a as MutationEffectsTypes, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-DjhzewdL.mjs";
 import { t as RestUtils } from "./rest.utils-DpiFIdhF.mjs";
 import { t as OpenAPICodegenConfig } from "./config-CiLFKLAY.mjs";
 import { d as TransportResponse, l as TransportRequest, n as HttpError, p as UploadProgress, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
-import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-BX45GDWd.mjs";
-import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-D_wEEF6-.mjs";
-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, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequestConfig as NativeRequestConfig, type TransportResponse as NativeResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, type TranslateFunction, configureTranslations, ns, resources, useMutationEffects, useWorkspaceContext };
+import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-DZxdDcpz.mjs";
+import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-CJJuL9Ak.mjs";
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type ErrorRethrower, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequestConfig as NativeRequestConfig, type TransportResponse as NativeResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, type TranslateFunction, configureTranslations, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { t as HttpError } from "./rest-transport.types-DxitRtsB.mjs";
 import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-Dm9DFErh.mjs";
 import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-Np4Ov54n.mjs";
 import { t as OpenApiQueryConfig } from "./queryConfig.context-CldQ5YL9.mjs";
-import { t as useMutationEffects } from "./useMutationEffects-PB1fvKWM.mjs";
+import { t as useMutationEffects } from "./useMutationEffects-CNVMVAbn.mjs";
 import { t as OpenApiRouter } from "./router.context-EPlMBk3G.mjs";
 import { n as useWorkspaceContext, t as OpenApiWorkspaceContext } from "./workspace.context-XWvQ_7Hg.mjs";
 import { t as AuthContext } from "./auth.context-COWO6ssl.mjs";

package/dist/metro.cjs

@@ -102,7 +102,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-CGoR73wh.cjs"));
+		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-Bbi8fYi2.cjs"));
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/metro.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BpykceyD.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-bJTFHTdn.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-DPUNTduQ.mjs";
 import fs from "fs";
 import path from "path";

package/dist/{native-rest-interceptor-BX45GDWd.d.mts → native-rest-interceptor-DZxdDcpz.d.mts}

@@ -1,4 +1,4 @@
-import { a as ErrorHandler } from "./error-handling-LPEPQV1V.mjs";
+import { s as ErrorRethrower } from "./error-handling-BpAQHWrU.mjs";
 import { a as RestTransport, c as TransportFetch, d as TransportResponse, l as TransportRequest, o as RestTransportInterceptor, r as RestRequestInfo, s as TransportErrorContext, t as GeneralTransportErrorCode, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
 //#region src/lib/rest/native-rest-client.d.ts
 type NativeResult<T, IsRawRes extends boolean> = IsRawRes extends true ? TransportResponse<T> : T;
@@ -13,7 +13,7 @@ declare class NativeRestClient implements RestTransport {
       fetch?: TransportFetch;
     };
     interceptors?: RestTransportInterceptor[];
-    errorHandler?: ErrorHandler<never>;
+    errorHandler?: ErrorRethrower;
   });
   private readonly baseURL;
   private readonly headers?;

package/dist/native.d.mts

@@ -1,3 +1,3 @@
 import { a as RestTransport, d as TransportResponse, f as TransportResult, i as RestResponseType, l as TransportRequest, n as HttpError, o as RestTransportInterceptor, p as UploadProgress, r as RestRequestInfo, t as GeneralTransportErrorCode, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
-import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-BX45GDWd.mjs";
+import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-DZxdDcpz.mjs";
 export { type GeneralTransportErrorCode, HttpError, HttpError as NativeHttpError, type NativeInterceptor, type TransportRequest as NativeRequest, type TransportRequest, type TransportRequestConfig as NativeRequestConfig, type TransportRequestConfig, type TransportResponse as NativeResponse, type TransportResponse, NativeRestClient, NativeRestInterceptor, type UploadProgress as NativeUploadProgress, type UploadProgress, type RestRequestInfo, type RestResponseType, type RestTransport, type RestTransportInterceptor, type TransportResult };

package/dist/{openapi-codegen.runner-BpykceyD.mjs → openapi-codegen.runner-bJTFHTdn.mjs}

@@ -1,4 +1,4 @@
-import { Wn as Profiler, n as runGenerate } from "./generate.runner-BtPpBVj9.mjs";
+import { Wn as Profiler, n as runGenerate } from "./generate.runner-Sh0Ps6AW.mjs";
 import path from "path";
 //#region src/plugins/openapi-codegen.runner.ts
 function createOpenApiCodegenRunner(config, options = {}) {

package/dist/query.d.mts

@@ -1,3 +1,3 @@
-import { i as QueryModule, n as InvalidationMapFunc, r as OpenApiQueryConfig, t as InvalidationMap } from "./queryConfig.context-aO4QOLru.mjs";
-import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-D_wEEF6-.mjs";
-export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, OpenApiQueryConfig, type QueryModule, useMutationEffects };
+import { a as MutationEffectsTypes, i as MutationEffectsOf, n as InvalidationMapFunc, o as OpenApiQueryConfig, r as MergedMutationVariables, s as QueryModule, t as InvalidationMap } from "./queryConfig.context-DjhzewdL.mjs";
+import { a as AppQueryOptions, i as AppMutationOptions, n as useMutationEffects, r as AppInfiniteQueryOptions, t as MutationEffectsOptions } from "./useMutationEffects-CJJuL9Ak.mjs";
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, type InvalidationMap, type InvalidationMapFunc, type MergedMutationVariables, type MutationEffectsOf, type MutationEffectsOptions, type MutationEffectsTypes, OpenApiQueryConfig, type QueryModule, useMutationEffects };

package/dist/query.mjs

@@ -1,3 +1,3 @@
 import { t as OpenApiQueryConfig } from "./queryConfig.context-CldQ5YL9.mjs";
-import { t as useMutationEffects } from "./useMutationEffects-PB1fvKWM.mjs";
+import { t as useMutationEffects } from "./useMutationEffects-CNVMVAbn.mjs";
 export { OpenApiQueryConfig, useMutationEffects };

package/dist/queryConfig.context-DjhzewdL.d.mts

@@ -0,0 +1,56 @@
+import { PropsWithChildren } from "react";
+import { QueryKey, UseMutationResult } from "@tanstack/react-query";
+//#region src/lib/config/queryConfig.context.d.ts
+type QueryModule = string | number | symbol;
+type InvalidationMapFunc<TData = unknown, TVariables = unknown> = {
+  invalidate(data: TData, variables: TVariables): QueryKey[];
+}["invalidate"];
+/** The `data` and `variables` one mutation passes to its module's invalidation callback. */
+interface MutationEffectsTypes {
+  data: unknown;
+  variables: unknown;
+}
+/** `data` and `variables` of mutation hooks, e.g. `MutationEffectsOf<typeof useCreate | typeof useUpdate>`. */
+type MutationEffectsOf<THook> = THook extends ((...args: never) => UseMutationResult<infer TData, infer _TError, infer TVariables, infer _TOnMutateResult>) ? {
+  data: TData;
+  variables: TVariables;
+} : never;
+type ObjectMembers<T> = T extends object ? T : never;
+type KeysOfUnion<T> = T extends unknown ? keyof T : never;
+type ValueOfUnion<T, K extends PropertyKey> = T extends unknown ? (K extends keyof T ? T[K] : undefined) : never;
+type MergedObjects<T> = { [K in keyof T]: ValueOfUnion<T, K>; } & { [K in Exclude<KeysOfUnion<T>, keyof T>]?: ValueOfUnion<T, K>; };
+/**
+ * The variables of a module's mutations as one object: keys some mutations lack become optional.
+ * Mutations without variables (`void`) stay in the union, as their callbacks receive `undefined`.
+ */
+type MergedMutationVariables<T> = [ObjectMembers<T>] extends [never] ? T : MergedObjects<ObjectMembers<T>> | Exclude<T, object>;
+type InvalidationMapFuncFor<T> = InvalidationMapFunc<T extends MutationEffectsTypes ? T["data"] : never, MergedMutationVariables<T extends MutationEffectsTypes ? T["variables"] : never>>;
+/**
+ * Query keys to invalidate after a module's mutations. Pass the generated `QueryModuleMutations` as
+ * `TMutations` to type each module's callback with its mutations' `data` and `variables`.
+ */
+declare global {
+  /**
+   * Mutation types per module. The generated `queryModules.ts` extends it with `QueryModuleMutations`, so
+   * `InvalidationMap<QueryModule>` types its callbacks from the spec. Global, because interfaces re-exported
+   * from bundled declaration chunks can't be augmented through the package's entry points.
+   */
+  interface OpenApiCodegenQueryModuleMutations {}
+}
+type InvalidationMap<TQueryModule extends QueryModule = QueryModule, TMutations extends { [K in TQueryModule]?: MutationEffectsTypes; } = OpenApiCodegenQueryModuleMutations> = { [K in TQueryModule]?: K extends keyof TMutations ? InvalidationMapFuncFor<TMutations[K]> : InvalidationMapFunc; };
+declare namespace OpenApiQueryConfig {
+  export interface Type<TQueryModule extends QueryModule = QueryModule> {
+    preferUpdate?: boolean;
+    invalidateCurrentModule?: boolean;
+    invalidationMap?: InvalidationMap<TQueryModule>;
+    crossTabInvalidation?: boolean;
+    allowInvalidResponseData?: boolean;
+    onError?: (error: unknown) => void;
+  }
+  type ProviderProps<TQueryModule extends QueryModule = QueryModule> = Type<TQueryModule>;
+  export function Provider<TQueryModule extends QueryModule = QueryModule>({ preferUpdate, invalidateCurrentModule, invalidationMap, crossTabInvalidation, allowInvalidResponseData, onError, children }: PropsWithChildren<ProviderProps<TQueryModule>>): import("react").JSX.Element;
+  export const useConfig: <TQueryModule extends QueryModule = QueryModule>() => Type<TQueryModule>;
+  export {};
+}
+//#endregion
+export { MutationEffectsTypes as a, MutationEffectsOf as i, InvalidationMapFunc as n, OpenApiQueryConfig as o, MergedMutationVariables as r, QueryModule as s, InvalidationMap as t };

package/dist/{rest-client-BSXsrOff.d.mts → rest-client-CbS77dei.d.mts}

@@ -1,4 +1,4 @@
-import { a as ErrorHandler, s as GeneralErrorCodes$1 } from "./error-handling-LPEPQV1V.mjs";
+import { a as ErrorHandler, c as GeneralErrorCodes$1, s as ErrorRethrower } from "./error-handling-BpAQHWrU.mjs";
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
 //#region src/lib/rest/rest-interceptor.d.ts
@@ -39,7 +39,7 @@ declare class RestClient implements RestClient$1 {
   constructor({ config, interceptors, errorHandler }?: {
     config?: CreateAxiosDefaults;
     interceptors?: RestInterceptor<[]>[];
-    errorHandler?: ErrorHandler<never>;
+    errorHandler?: ErrorRethrower;
   });
   attachInterceptors<T extends unknown[]>(interceptors?: RestInterceptor<T>[], ...args: T): void;
   attachInterceptor<T extends unknown[]>(interceptor: RestInterceptor<T>, ...args: T): void;

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
-import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fJCwtr-2.mjs";
-import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-BtPpBVj9.mjs";
+import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-CXYNMMMt.mjs";
+import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-Sh0Ps6AW.mjs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { styleText } from "node:util";
@@ -31,7 +31,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "4.0.0-rc.1";
+	return "4.0.0-rc.3";
 }
 //#endregion
 //#region src/helpers/yargs.helper.ts

package/dist/{useMutationEffects-D_wEEF6-.d.mts → useMutationEffects-CJJuL9Ak.d.mts}

@@ -1,5 +1,5 @@
-import { s as GeneralErrorCodes, t as ApplicationException } from "./error-handling-LPEPQV1V.mjs";
-import { i as QueryModule, t as InvalidationMap } from "./queryConfig.context-aO4QOLru.mjs";
+import { c as GeneralErrorCodes, t as ApplicationException } from "./error-handling-BpAQHWrU.mjs";
+import { s as QueryModule, t as InvalidationMap } from "./queryConfig.context-DjhzewdL.mjs";
 import { InfiniteData, QueryKey, UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
 //#region src/lib/react-query.types.d.ts
 type Function = (...args: never) => unknown;

package/dist/{useMutationEffects-PB1fvKWM.mjs → useMutationEffects-CNVMVAbn.mjs}

@@ -36,7 +36,7 @@ function useMutationEffects({ currentModule }) {
 		const shouldInvalidateCurrentModule = invalidateCurrentModule ?? config.invalidateCurrentModule ?? true;
 		const isQueryKeyEqual = (keyA, keyB) => keyA.length === keyB.length && keyA.every((item, index) => item === keyB[index]);
 		const isQueryKeyPrefix = (queryKey, prefixKey) => prefixKey.length <= queryKey.length && prefixKey.every((item, index) => item === queryKey[index]);
-		const mappedInvalidationKeys = invalidationMap?.[currentModule]?.(data, variables) ?? config.invalidationMap?.[currentModule]?.(data, variables);
+		const mappedInvalidationKeys = (invalidationMap?.[currentModule] ?? config.invalidationMap?.[currentModule])?.(data, variables);
 		const shouldInvalidateQuery = (queryKey) => {
 			const isUpdateKey = updateKeys?.some((key) => isQueryKeyEqual(queryKey, key));
 			if (shouldUpdate && isUpdateKey) return false;

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BpykceyD.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-bJTFHTdn.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-DPUNTduQ.mjs";
 import path from "path";
 //#region src/vite/openapi-codegen.plugin.ts

package/dist/zod.d.mts

@@ -1,4 +1,4 @@
-import { a as ErrorHandler } from "./error-handling-LPEPQV1V.mjs";
+import { a as ErrorHandler } from "./error-handling-BpAQHWrU.mjs";
 import { z } from "zod";
 //#region src/zod.d.ts
 declare namespace ZodExtended {

package/package.json

@@ -187,5 +187,5 @@
     "node": ">= 18"
   },
   "packageManager": "bun@1.4.3",
-  "version": "4.0.0-rc.1"
+  "version": "4.0.0-rc.3"
 }

package/dist/queryConfig.context-aO4QOLru.d.mts

@@ -1,24 +0,0 @@
-import { PropsWithChildren } from "react";
-import { QueryKey } from "@tanstack/react-query";
-//#region src/lib/config/queryConfig.context.d.ts
-type QueryModule = string | number | symbol;
-type InvalidationMapFunc<TData = unknown, TVariables = unknown> = {
-  invalidate(data: TData, variables: TVariables): QueryKey[];
-}["invalidate"];
-type InvalidationMap<TQueryModule extends QueryModule = QueryModule, TData = unknown, TVariables = unknown> = Partial<Record<TQueryModule, InvalidationMapFunc<TData, TVariables>>>;
-declare namespace OpenApiQueryConfig {
-  export interface Type<TQueryModule extends QueryModule = QueryModule> {
-    preferUpdate?: boolean;
-    invalidateCurrentModule?: boolean;
-    invalidationMap?: InvalidationMap<TQueryModule>;
-    crossTabInvalidation?: boolean;
-    allowInvalidResponseData?: boolean;
-    onError?: (error: unknown) => void;
-  }
-  type ProviderProps<TQueryModule extends QueryModule = QueryModule> = Type<TQueryModule>;
-  export function Provider<TQueryModule extends QueryModule = QueryModule>({ preferUpdate, invalidateCurrentModule, invalidationMap, crossTabInvalidation, allowInvalidResponseData, onError, children }: PropsWithChildren<ProviderProps<TQueryModule>>): import("react").JSX.Element;
-  export const useConfig: <TQueryModule extends QueryModule = QueryModule>() => Type<TQueryModule>;
-  export {};
-}
-//#endregion
-export { QueryModule as i, InvalidationMapFunc as n, OpenApiQueryConfig as r, InvalidationMap as t };