@txo/service-graphql-react 2.6.32 → 3.0.1

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [3.0.1](https://github.com/technology-studio/service-graphql-react/compare/v3.0.0...v3.0.1) (2024-10-30)
+
+
+### Bug fixes
+
+* **deps:** update dependency @txo/service-graphql to ^5.0.2 ([629a134](https://github.com/technology-studio/service-graphql-react/commit/629a13450c00124c79011fd9528df77530cf5115))
+
+## [3.0.0](https://github.com/technology-studio/service-graphql-react/compare/v2.6.32...v3.0.0) (2024-10-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* - Renamed exception to the error on useServiceQuery
+- Requires packages:
+  - @txo/service-prop@^3.0.0
+  - @txo-peer-dep/service-error-handler-react@^2.0.0
+  - @txo/service-error-handler-react@^2.0.0
+
+### Bug fixes
+
+* use `ServiceOperationError` and remove context ([#839](https://github.com/technology-studio/service-graphql-react/issues/839)) ([256a8c0](https://github.com/technology-studio/service-graphql-react/commit/256a8c04a30148906a2b785e0847c0a667a14c92))
+
 ## [2.6.32](https://github.com/technology-studio/service-graphql-react/compare/v2.6.31...v2.6.32) (2024-10-29)
 
 

package/lib/Api/VoidError.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @Author: Erik Slovak <erik.slovak@technologystudio.sk>
+ * @Date: 2024-10-25T22:32:09+02:00
+ * @Copyright: Technology Studio
+**/
+export declare class VoidError extends Error {
+    constructor();
+}

package/lib/Api/VoidError.js

@@ -0,0 +1,15 @@
+"use strict";
+/**
+ * @Author: Erik Slovak <erik.slovak@technologystudio.sk>
+ * @Date: 2024-10-25T22:32:09+02:00
+ * @Copyright: Technology Studio
+**/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VoidError = void 0;
+class VoidError extends Error {
+    constructor() {
+        super('Void validation error');
+    }
+}
+exports.VoidError = VoidError;
+//# sourceMappingURL=VoidError.js.map

package/lib/Api/VoidError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VoidError.js","sourceRoot":"","sources":["../../src/Api/VoidError.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,MAAa,SAAU,SAAQ,KAAK;IAClC;QACE,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAChC,CAAC;CACF;AAJD,8BAIC"}

package/lib/Hooks/UseServiceMutation.d.ts

@@ -7,7 +7,7 @@ import type { DependencyList } from 'react';
 import type { CallAttributes, ServiceProp } from '@txo/service-prop';
 import type { MutationOptions as ApolloMutationOptions, TypedDocumentNode, MutationResult, MutationFunctionOptions as MutateFunctionOptions, FetchResult } from '@apollo/client';
 import type { ErrorMap } from '../Model/Types';
-export type MutationServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> = Omit<ServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES, FetchResult<DATA>>, 'clear' | 'options' | 'clearException' | 'exception'> & {
+export type MutationServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> = Omit<ServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES, FetchResult<DATA>>, 'options' | 'error'> & {
     mutation: MutationResult<DATA>;
 };
 export type MutateFunction<DATA, ATTRIBUTES> = (options?: MutateFunctionOptions<DATA, ATTRIBUTES>) => Promise<FetchResult<DATA>>;

package/lib/Hooks/UseServiceMutation.js

@@ -9,15 +9,14 @@ exports.useServiceMutation = void 0;
 const react_1 = require("react");
 const hooks_react_1 = require("@txo/hooks-react");
 const client_1 = require("@apollo/client");
-const service_error_handler_react_1 = require("@txo-peer-dep/service-error-handler-react");
 const service_graphql_1 = require("@txo/service-graphql");
 const ContextHelper_1 = require("../Api/ContextHelper");
 const OperationHelper_1 = require("../Api/OperationHelper");
 const ErrorMapHelper_1 = require("../Api/ErrorMapHelper");
+const VoidError_1 = require("../Api/VoidError");
 const calculateContext = (mutation, variables) => ((0, ContextHelper_1.serviceContext)((0, OperationHelper_1.getName)(mutation), variables ?? {}));
 const useServiceMutation = (mutationDocument, options) => {
     const { onFieldErrors: defaultOnFieldErrors, onFieldErrorsDependencyList, errorMap, errorMapDependencyList, options: mutationOptions, mutateFactory, } = options ?? {};
-    const exceptionRef = (0, react_1.useRef)(null);
     const memoizedErrorMap = (0, react_1.useMemo)(() => errorMap, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     errorMapDependencyList ?? []);
@@ -25,15 +24,12 @@ const useServiceMutation = (mutationDocument, options) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     onFieldErrorsDependencyList ?? []);
     const [mutate, mutation] = (0, client_1.useMutation)(mutationDocument, mutationOptions);
-    const { addServiceErrorException, removeServiceErrorException, } = (0, react_1.useContext)(service_error_handler_react_1.ErrorHandlerContext);
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const memoizedOptions = (0, hooks_react_1.useMemoObject)(mutationOptions);
     const wrappedCall = (0, react_1.useCallback)(async (variables, callAttributes) => {
         const attributes = { variables, mutation: mutationDocument, ...memoizedOptions };
         const onFieldErrors = callAttributes?.onFieldErrors ?? memoizedDefaultOnFieldErrors;
         const context = calculateContext(mutationDocument, variables);
-        (exceptionRef.current != null) && removeServiceErrorException(context);
-        exceptionRef.current = null;
         const operationName = (0, OperationHelper_1.getName)(mutationDocument);
         const mutateWithErrorProcessor = async (options) => (await (0, service_graphql_1.operationPromiseProcessor)(mutate(options), {
             operationName,
@@ -44,15 +40,16 @@ const useServiceMutation = (mutationDocument, options) => {
             operationName,
             context,
         })
-            .catch(async (serviceErrorException) => {
+            .catch(async (serviceOperationError) => {
             if (memoizedErrorMap != null) {
-                serviceErrorException.serviceErrorList = (0, ErrorMapHelper_1.applyErrorMap)(serviceErrorException.serviceErrorList, memoizedErrorMap, onFieldErrors);
+                serviceOperationError.serviceErrorList = (0, ErrorMapHelper_1.applyErrorMap)(serviceOperationError.serviceErrorList, memoizedErrorMap, onFieldErrors);
             }
-            addServiceErrorException(serviceErrorException);
-            exceptionRef.current = serviceErrorException;
-            throw serviceErrorException;
+            if (serviceOperationError.serviceErrorList.length === 0) {
+                throw new VoidError_1.VoidError();
+            }
+            throw serviceOperationError;
         });
-    }, [mutationDocument, memoizedOptions, memoizedDefaultOnFieldErrors, removeServiceErrorException, mutateFactory, mutate, memoizedErrorMap, addServiceErrorException]);
+    }, [mutationDocument, memoizedOptions, memoizedDefaultOnFieldErrors, mutateFactory, mutate, memoizedErrorMap]);
     const memoizedMutation = (0, hooks_react_1.useMemoObject)(mutation);
     return (0, react_1.useMemo)(() => ({
         mutation: memoizedMutation,

package/lib/Hooks/UseServiceMutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseServiceMutation.js","sourceRoot":"","sources":["../../src/Hooks/UseServiceMutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UseServiceMutation.js","sourceRoot":"","sources":["../../src/Hooks/UseServiceMutation.ts"],"names":[],"mappings":"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"}

package/lib/Hooks/UseServiceQuery.d.ts

@@ -6,7 +6,7 @@
 import type { QueryHookOptions, TypedDocumentNode, QueryResult, OperationVariables } from '@apollo/client';
 import type { Get } from 'type-fest';
 import type { CallAttributes, ServiceProp } from '@txo/service-prop';
-export type QueryServiceProp<ATTRIBUTES extends OperationVariables, DATA, MAPPED_DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> = Omit<ServiceProp<ATTRIBUTES, MAPPED_DATA, CALL_ATTRIBUTES>, 'call' | 'clear' | 'options' | 'clearException'> & {
+export type QueryServiceProp<ATTRIBUTES extends OperationVariables, DATA, MAPPED_DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> = Omit<ServiceProp<ATTRIBUTES, MAPPED_DATA, CALL_ATTRIBUTES>, 'call' | 'options'> & {
     query: QueryResult<DATA, ATTRIBUTES>;
     promiselessRefetch: (variables?: Partial<ATTRIBUTES>) => void;
     fetchMore: QueryResult<DATA, ATTRIBUTES>['fetchMore'];

package/lib/Hooks/UseServiceQuery.js

@@ -15,21 +15,12 @@ const lodash_get_1 = __importDefault(require("lodash.get"));
 const service_prop_1 = require("@txo/service-prop");
 const service_graphql_1 = require("@txo-peer-dep/service-graphql");
 const hooks_react_1 = require("@txo/hooks-react");
-const service_error_handler_react_1 = require("@txo-peer-dep/service-error-handler-react");
+const error_handler_1 = require("@txo-peer-dep/error-handler");
 const ContextHelper_1 = require("../Api/ContextHelper");
 const OperationHelper_1 = require("../Api/OperationHelper");
 const PromiseHelper_1 = require("../Api/PromiseHelper");
 const ObservableContext_1 = require("../Api/ObservableContext");
 const calculateContext = (query, variables) => ((0, ContextHelper_1.serviceContext)((0, OperationHelper_1.getName)(query), variables ?? {}));
-const isServiceErrorListEqual = (a, b) => {
-    if (a.length !== b.length) {
-        return false;
-    }
-    if (a.every((error, index) => (b[index].key === error.key) && (b[index].message === error.message))) {
-        return true;
-    }
-    return false;
-};
 // TODO: find a better way to parse type of dataPath (from attribute)
 const useServiceQuery = (queryDocument, options) => {
     const { dataPath, options: _queryOptions, } = options;
@@ -40,46 +31,48 @@ const useServiceQuery = (queryDocument, options) => {
         skip: isSkipped,
     });
     const query = (0, client_1.useQuery)(queryDocument, queryOptions);
-    const shownExceptionListRef = (0, react_1.useRef)([]);
-    const { addServiceErrorException, removeServiceErrorException, } = (0, react_1.useContext)(service_error_handler_react_1.ErrorHandlerContext);
+    const reportedOperationErrorListRef = (0, react_1.useRef)([]);
     const [fetchMoreFetching, setFetchMoreFetching] = (0, react_1.useState)(false);
     const memoizedVariables = (0, hooks_react_1.useMemoObject)(queryOptions?.variables);
     const memoizedQuery = (0, hooks_react_1.useMemoObject)(query);
+    (0, react_1.useMemo)(() => {
+        reportedOperationErrorListRef.current = [];
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [memoizedQuery, queryDocument]);
     const recentData = (0, react_1.useRef)(memoizedQuery.data);
     if (!isSkipped) {
         recentData.current = memoizedQuery.data;
     }
     const data = recentData.current ?? null;
     const context = (0, react_1.useMemo)(() => (calculateContext(queryDocument, memoizedVariables)), [queryDocument, memoizedVariables]);
-    const exception = (0, react_1.useMemo)(() => {
+    const error = (0, react_1.useMemo)(() => {
         const operationName = (0, OperationHelper_1.getName)(queryDocument);
         if (memoizedQuery.error != null) {
-            const errorList = service_graphql_1.configManager.config.errorResponseTranslator(memoizedQuery.error, {
+            const serviceErrorList = service_graphql_1.configManager.config.errorResponseTranslator(memoizedQuery.error, {
                 context,
                 operationName,
             });
-            const exception = new service_prop_1.ServiceErrorException({
-                serviceErrorList: errorList,
-                serviceName: operationName,
+            const serviceOperationError = new service_prop_1.ServiceOperationError({
+                serviceErrorList,
+                operationName,
                 context,
             });
-            return exception;
+            return serviceOperationError;
         }
         return null;
-    }, [context, memoizedQuery, queryDocument]);
+    }, [context, memoizedQuery.error, queryDocument]);
     (0, react_1.useLayoutEffect)(() => {
-        if ((exception != null) && (shownExceptionListRef.current.find(shownException => (isServiceErrorListEqual(shownException.serviceErrorList, exception.serviceErrorList))) == null)) {
-            addServiceErrorException(exception);
-            shownExceptionListRef.current.push(exception);
+        if ((error != null) && !reportedOperationErrorListRef.current.includes(error)) {
+            (0, error_handler_1.reportError)(error);
+            reportedOperationErrorListRef.current.push(error);
         }
-        return () => {
-            (exception != null) && removeServiceErrorException(context);
-        };
-    }, [addServiceErrorException, context, exception, memoizedVariables, queryDocument, removeServiceErrorException]);
+    }, [context, error, memoizedVariables, queryDocument]);
     const promiselessRefetch = (0, react_1.useCallback)((...args) => {
+        reportedOperationErrorListRef.current = [];
         (0, PromiseHelper_1.asyncToCallback)(memoizedQuery.refetch(...args));
     }, [memoizedQuery]);
     const fetchMore = (0, react_1.useCallback)(async (...args) => {
+        reportedOperationErrorListRef.current = [];
         setFetchMoreFetching(true);
         return (await memoizedQuery.fetchMore(...args)
             .catch((error) => {
@@ -88,18 +81,17 @@ const useServiceQuery = (queryDocument, options) => {
                 context,
                 operationName,
             });
-            const exception = new service_prop_1.ServiceErrorException({
+            const serviceOperationError = new service_prop_1.ServiceOperationError({
                 serviceErrorList: errorList,
-                serviceName: operationName,
+                operationName,
                 context,
             });
-            addServiceErrorException(exception);
-            throw error;
+            throw serviceOperationError;
         })
             .finally(() => {
             setFetchMoreFetching(false);
         }));
-    }, [addServiceErrorException, context, memoizedQuery, queryDocument, setFetchMoreFetching]);
+    }, [context, memoizedQuery, queryDocument]);
     return (0, react_1.useMemo)(() => ({
         query: memoizedQuery,
         // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
@@ -108,8 +100,8 @@ const useServiceQuery = (queryDocument, options) => {
         fetchMoreFetching,
         promiselessRefetch,
         fetchMore,
-        exception,
-    }), [memoizedQuery, data, dataPath, fetchMoreFetching, promiselessRefetch, fetchMore, exception]);
+        error,
+    }), [memoizedQuery, data, dataPath, fetchMoreFetching, promiselessRefetch, fetchMore, error]);
 };
 exports.useServiceQuery = useServiceQuery;
 //# sourceMappingURL=UseServiceQuery.js.map

package/lib/Hooks/UseServiceQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseServiceQuery.js","sourceRoot":"","sources":["../../src/Hooks/UseServiceQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UseServiceQuery.js","sourceRoot":"","sources":["../../src/Hooks/UseServiceQuery.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export { getName } from './Api/OperationHelper';
 export * from './Api/ErrorMapHelper';
 export * from './Api/ObservableContext';
 export * from './Api/PromiseHelper';
+export * from './Api/VoidError';
 export * from './Hooks/UseServiceMutation';
 export { useServiceQuery, type QueryServiceProp, } from './Hooks/UseServiceQuery';
 export * from './Model/Types';

package/lib/index.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "getName", { enumerable: true, get: function () {
 __exportStar(require("./Api/ErrorMapHelper"), exports);
 __exportStar(require("./Api/ObservableContext"), exports);
 __exportStar(require("./Api/PromiseHelper"), exports);
+__exportStar(require("./Api/VoidError"), exports);
 __exportStar(require("./Hooks/UseServiceMutation"), exports);
 var UseServiceQuery_1 = require("./Hooks/UseServiceQuery");
 Object.defineProperty(exports, "useServiceQuery", { enumerable: true, get: function () { return UseServiceQuery_1.useServiceQuery; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;AAEH,yDAA+C;AAAtC,0GAAA,OAAO,OAAA;AAChB,uDAAoC;AACpC,0DAAuC;AACvC,sDAAmC;AACnC,6DAA0C;AAC1C,2DAGgC;AAF9B,kHAAA,eAAe,OAAA;AAGjB,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;AAEH,yDAA+C;AAAtC,0GAAA,OAAO,OAAA;AAChB,uDAAoC;AACpC,0DAAuC;AACvC,sDAAmC;AACnC,kDAA+B;AAC/B,6DAA0C;AAC1C,2DAGgC;AAF9B,kHAAA,eAAe,OAAA;AAGjB,gDAA6B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@txo/service-graphql-react",
-  "version": "2.6.32",
+  "version": "3.0.1",
   "description": "Technology Studio - Service graphql react",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -16,32 +16,31 @@
   "license": "UNLICENSED",
   "private": false,
   "scripts": {
-    "build": "yarn build:clean && yarn build:lib",
     "build:clean": "yarn rimraf lib",
     "build:lib": "yarn tsc",
     "build:watch": "yarn tsc --watch",
-    "test": "jest",
-    "test:watch": "concurrently \"yarn build:watch\" \"jest --watch\"",
-    "coverage": "jest --coverage && open coverage/lcov-report/index.html || xdg-open coverage/lcov-report/index.html",
+    "build": "yarn build:clean && yarn build:lib",
     "compare-boilerplate-version": "./scripts/compare-boilerplate-version.sh",
+    "coverage": "jest --coverage && open coverage/lcov-report/index.html || xdg-open coverage/lcov-report/index.html",
+    "lint:ci": "yarn lint",
+    "lint:fix": "eslint . --fix",
     "lint": "eslint --max-warnings 0 .",
-    "fixcode": "eslint . --fix",
-    "git-hook": "yarn -s lint-staged",
     "prepare": "husky && yarn build",
     "print-txo-packages": "yarn list 2> /dev/null|grep @txo|sed 's/.*\\(@txo[^@]*\\)@^*\\([^ ]*\\).*/\\1@\\2/g'|sort|uniq",
     "sanity": "yarn lint:ci && yarn build && tsc --noEmit && yarn test --coverage && yarn compare-boilerplate-version && echo 'success'",
     "semantic-release": "semantic-release",
-    "update-boilerplate-version": "./scripts/update-boilerplate-version.sh",
-    "lint:ci": "yarn lint",
-    "type-check": "tsc --noEmit"
+    "test:watch": "concurrently \"yarn build:watch\" \"yarn test --watch\"",
+    "test": "jest",
+    "type-check": "tsc --noEmit",
+    "update-boilerplate-version": "./scripts/update-boilerplate-version.sh"
   },
   "engines": {
     "node": ">=18.0.0"
   },
   "dependencies": {
     "@txo/hooks-react": "^2.3.21",
-    "@txo/service-graphql": "^4.4.6",
-    "@txo/service-prop": "^2.2.20",
+    "@txo/service-graphql": "^5.0.2",
+    "@txo/service-prop": "^3.0.2",
     "@txo/types": "^1.7.0",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
@@ -49,14 +48,14 @@
   },
   "peerDependencies": {
     "@apollo/client": "^3.11.8",
-    "@txo-peer-dep/service-error-handler-react": "^1.2.29",
+    "@txo-peer-dep/error-handler": "^3.0.0",
     "@txo-peer-dep/service-graphql": "^3.3.3",
     "graphql": "^16.9.0"
   },
   "devDependencies": {
     "@apollo/client": "^3.11.8",
+    "@txo-peer-dep/error-handler": "^3.0.0",
     "@txo-peer-dep/log": "^4.0.4",
-    "@txo-peer-dep/service-error-handler-react": "^1.2.29",
     "@txo-peer-dep/service-graphql": "^3.3.3",
     "@txo/commitlint": "^1.0.19",
     "@txo/log-console": "^3.0.0",

package/src/Api/VoidError.ts

@@ -0,0 +1,11 @@
+/**
+ * @Author: Erik Slovak <erik.slovak@technologystudio.sk>
+ * @Date: 2024-10-25T22:32:09+02:00
+ * @Copyright: Technology Studio
+**/
+
+export class VoidError extends Error {
+  constructor () {
+    super('Void validation error')
+  }
+}

package/src/Hooks/UseServiceMutation.ts

@@ -7,14 +7,12 @@
 import type { DependencyList } from 'react'
 import {
   useCallback,
-  useContext,
   useMemo,
-  useRef,
 } from 'react'
 import type {
   CallAttributes,
   ServiceProp,
-  ServiceErrorException,
+  ServiceOperationError,
 } from '@txo/service-prop'
 import { useMemoObject } from '@txo/hooks-react'
 import type { Typify } from '@txo/types'
@@ -29,20 +27,20 @@ import type {
 import {
   useMutation,
 } from '@apollo/client'
-import { ErrorHandlerContext } from '@txo-peer-dep/service-error-handler-react'
 import { operationPromiseProcessor } from '@txo/service-graphql'
 
 import { serviceContext } from '../Api/ContextHelper'
 import { getName } from '../Api/OperationHelper'
 import type { ErrorMap } from '../Model/Types'
 import { applyErrorMap } from '../Api/ErrorMapHelper'
+import { VoidError } from '../Api/VoidError'
 
 const calculateContext = (mutation: DocumentNode, variables?: Record<string, unknown>): string => (
   serviceContext(getName(mutation), variables ?? {})
 )
 
 export type MutationServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> =
-  Omit<ServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES, FetchResult<DATA>>, 'clear' | 'options' | 'clearException' | 'exception'>
+  Omit<ServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES, FetchResult<DATA>>, 'options' | 'error'>
   & {
     mutation: MutationResult<DATA>,
   }
@@ -62,10 +60,10 @@ export const useServiceMutation = <
   ATTRIBUTES extends Record<string, unknown>,
   DATA,
   CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>,
-  >(
-    mutationDocument: TypedDocumentNode<DATA, ATTRIBUTES>,
-    options?: MutationOptions<DATA, ATTRIBUTES>,
-  ): MutationServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES> => {
+> (
+  mutationDocument: TypedDocumentNode<DATA, ATTRIBUTES>,
+  options?: MutationOptions<DATA, ATTRIBUTES>,
+): MutationServiceProp<ATTRIBUTES, DATA, CALL_ATTRIBUTES> => {
   const {
     onFieldErrors: defaultOnFieldErrors,
     onFieldErrorsDependencyList,
@@ -74,7 +72,6 @@ export const useServiceMutation = <
     options: mutationOptions,
     mutateFactory,
   } = options ?? {}
-  const exceptionRef = useRef<ServiceErrorException | null>(null)
   const memoizedErrorMap = useMemo(
     () => errorMap,
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -86,13 +83,9 @@ export const useServiceMutation = <
     onFieldErrorsDependencyList ?? [],
   )
   const [mutate, mutation] = useMutation<
-  DATA,
-  ATTRIBUTES
+    DATA,
+    ATTRIBUTES
   >(mutationDocument, mutationOptions)
-  const {
-    addServiceErrorException,
-    removeServiceErrorException,
-  } = useContext(ErrorHandlerContext)
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const memoizedOptions = useMemoObject(mutationOptions!)
   const wrappedCall = useCallback(async (
@@ -102,8 +95,6 @@ export const useServiceMutation = <
     const attributes = { variables, mutation: mutationDocument, ...memoizedOptions }
     const onFieldErrors = callAttributes?.onFieldErrors ?? memoizedDefaultOnFieldErrors
     const context = calculateContext(mutationDocument, variables)
-    ;(exceptionRef.current != null) && removeServiceErrorException(context)
-    exceptionRef.current = null
     const operationName = getName(mutationDocument)
     const mutateWithErrorProcessor: typeof mutate = async (options) => (
       await operationPromiseProcessor(mutate(options), {
@@ -116,19 +107,20 @@ export const useServiceMutation = <
       operationName,
       context,
     })
-      .catch(async (serviceErrorException: ServiceErrorException) => {
+      .catch(async (serviceOperationError: ServiceOperationError) => {
         if (memoizedErrorMap != null) {
-          serviceErrorException.serviceErrorList = applyErrorMap(
-            serviceErrorException.serviceErrorList,
+          serviceOperationError.serviceErrorList = applyErrorMap(
+            serviceOperationError.serviceErrorList,
             memoizedErrorMap,
             onFieldErrors,
           )
         }
-        addServiceErrorException(serviceErrorException)
-        exceptionRef.current = serviceErrorException
-        throw serviceErrorException
+        if (serviceOperationError.serviceErrorList.length === 0) {
+          throw new VoidError()
+        }
+        throw serviceOperationError
       })
-  }, [mutationDocument, memoizedOptions, memoizedDefaultOnFieldErrors, removeServiceErrorException, mutateFactory, mutate, memoizedErrorMap, addServiceErrorException])
+  }, [mutationDocument, memoizedOptions, memoizedDefaultOnFieldErrors, mutateFactory, mutate, memoizedErrorMap])
 
   const memoizedMutation = useMemoObject<Typify<MutationResult<DATA>>>(mutation)
 

package/src/Hooks/UseServiceQuery.ts

@@ -27,17 +27,16 @@ import get from 'lodash.get'
 import type { Get } from 'type-fest'
 import type {
   CallAttributes,
-  ServiceError,
   ServiceProp,
 } from '@txo/service-prop'
 import {
-  ServiceErrorException,
+  ServiceOperationError,
 } from '@txo/service-prop'
 import { configManager } from '@txo-peer-dep/service-graphql'
 import {
   useMemoObject,
 } from '@txo/hooks-react'
-import { ErrorHandlerContext } from '@txo-peer-dep/service-error-handler-react'
+import { reportError } from '@txo-peer-dep/error-handler'
 import type { Typify } from '@txo/types'
 
 import { serviceContext } from '../Api/ContextHelper'
@@ -50,7 +49,7 @@ const calculateContext = (query: DocumentNode, variables: Record<string, unknown
 )
 
 export type QueryServiceProp<ATTRIBUTES extends OperationVariables, DATA, MAPPED_DATA, CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>> =
-  Omit<ServiceProp<ATTRIBUTES, MAPPED_DATA, CALL_ATTRIBUTES>, 'call' | 'clear' | 'options' | 'clearException'>
+  Omit<ServiceProp<ATTRIBUTES, MAPPED_DATA, CALL_ATTRIBUTES>, 'call' | 'options'>
   & {
     query: QueryResult<DATA, ATTRIBUTES>,
     promiselessRefetch: (variables?: Partial<ATTRIBUTES>) => void,
@@ -63,26 +62,16 @@ type QueryOptions<DATA, ATTRIBUTES extends OperationVariables, DATA_PATH extends
   dataPath: DATA_PATH,
 }
 
-const isServiceErrorListEqual = (a: ServiceError[], b: ServiceError[]): boolean => {
-  if (a.length !== b.length) {
-    return false
-  }
-  if (a.every((error, index) => (b[index].key === error.key) && (b[index].message === error.message))) {
-    return true
-  }
-  return false
-}
-
 // TODO: find a better way to parse type of dataPath (from attribute)
 export const useServiceQuery = <
   ATTRIBUTES extends Record<string, unknown>,
   DATA,
   CALL_ATTRIBUTES extends CallAttributes<ATTRIBUTES>,
   DATA_PATH extends string
->(
-    queryDocument: TypedDocumentNode<DATA, ATTRIBUTES>,
-    options: QueryOptions<DATA, ATTRIBUTES, DATA_PATH>,
-  ): QueryServiceProp<ATTRIBUTES, DATA, Get<DATA, DATA_PATH>, CALL_ATTRIBUTES> => {
+> (
+  queryDocument: TypedDocumentNode<DATA, ATTRIBUTES>,
+  options: QueryOptions<DATA, ATTRIBUTES, DATA_PATH>,
+): QueryServiceProp<ATTRIBUTES, DATA, Get<DATA, DATA_PATH>, CALL_ATTRIBUTES> => {
   const {
     dataPath,
     options: _queryOptions,
@@ -95,14 +84,14 @@ export const useServiceQuery = <
     skip: isSkipped,
   })
   const query: QueryResult<DATA, ATTRIBUTES> = useQuery<DATA, ATTRIBUTES>(queryDocument, queryOptions)
-  const shownExceptionListRef = useRef<(ServiceErrorException)[]>([])
-  const {
-    addServiceErrorException,
-    removeServiceErrorException,
-  } = useContext(ErrorHandlerContext)
+  const reportedOperationErrorListRef = useRef<(ServiceOperationError)[]>([])
   const [fetchMoreFetching, setFetchMoreFetching] = useState(false)
   const memoizedVariables = useMemoObject(queryOptions?.variables)
   const memoizedQuery = useMemoObject<Typify<QueryResult<DATA, ATTRIBUTES>>>(query)
+  useMemo(() => {
+    reportedOperationErrorListRef.current = []
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [memoizedQuery, queryDocument])
   const recentData = useRef(memoizedQuery.data)
   if (!isSkipped) {
     recentData.current = memoizedQuery.data
@@ -111,39 +100,36 @@ export const useServiceQuery = <
   const context = useMemo(() => (
     calculateContext(queryDocument, memoizedVariables)
   ), [queryDocument, memoizedVariables])
-  const exception = useMemo(() => {
+  const error = useMemo(() => {
     const operationName = getName(queryDocument)
     if (memoizedQuery.error != null) {
-      const errorList = configManager.config.errorResponseTranslator(memoizedQuery.error, {
+      const serviceErrorList = configManager.config.errorResponseTranslator(memoizedQuery.error, {
         context,
         operationName,
       })
-      const exception = new ServiceErrorException({
-        serviceErrorList: errorList,
-        serviceName: operationName,
+      const serviceOperationError = new ServiceOperationError({
+        serviceErrorList,
+        operationName,
         context,
       })
-      return exception
+      return serviceOperationError
     }
     return null
-  }, [context, memoizedQuery, queryDocument])
+  }, [context, memoizedQuery.error, queryDocument])
   useLayoutEffect(() => {
-    if ((exception != null) && (shownExceptionListRef.current.find(shownException => (
-      isServiceErrorListEqual(shownException.serviceErrorList, exception.serviceErrorList)
-    )) == null)) {
-      addServiceErrorException(exception)
-      shownExceptionListRef.current.push(exception)
-    }
-    return () => {
-      (exception != null) && removeServiceErrorException(context)
+    if ((error != null) && !reportedOperationErrorListRef.current.includes(error)) {
+      reportError(error)
+      reportedOperationErrorListRef.current.push(error)
     }
-  }, [addServiceErrorException, context, exception, memoizedVariables, queryDocument, removeServiceErrorException])
+  }, [context, error, memoizedVariables, queryDocument])
 
   const promiselessRefetch = useCallback((...args: Parameters<typeof memoizedQuery.refetch>) => {
+    reportedOperationErrorListRef.current = []
     asyncToCallback(memoizedQuery.refetch(...args))
   }, [memoizedQuery])
 
   const fetchMore: QueryResult<DATA>['fetchMore'] = useCallback(async (...args) => {
+    reportedOperationErrorListRef.current = []
     setFetchMoreFetching(true)
     return (
       await memoizedQuery.fetchMore(...args)
@@ -153,19 +139,18 @@ export const useServiceQuery = <
             context,
             operationName,
           })
-          const exception = new ServiceErrorException({
+          const serviceOperationError = new ServiceOperationError({
             serviceErrorList: errorList,
-            serviceName: operationName,
+            operationName,
             context,
           })
-          addServiceErrorException(exception)
-          throw error
+          throw serviceOperationError
         })
         .finally(() => {
           setFetchMoreFetching(false)
         })
     )
-  }, [addServiceErrorException, context, memoizedQuery, queryDocument, setFetchMoreFetching])
+  }, [context, memoizedQuery, queryDocument])
 
   return useMemo(() => ({
     query: memoizedQuery,
@@ -175,6 +160,6 @@ export const useServiceQuery = <
     fetchMoreFetching,
     promiselessRefetch,
     fetchMore,
-    exception,
-  }), [memoizedQuery, data, dataPath, fetchMoreFetching, promiselessRefetch, fetchMore, exception])
+    error,
+  }), [memoizedQuery, data, dataPath, fetchMoreFetching, promiselessRefetch, fetchMore, error])
 }

package/src/index.ts

@@ -8,6 +8,7 @@ export { getName } from './Api/OperationHelper'
 export * from './Api/ErrorMapHelper'
 export * from './Api/ObservableContext'
 export * from './Api/PromiseHelper'
+export * from './Api/VoidError'
 export * from './Hooks/UseServiceMutation'
 export {
   useServiceQuery,