@txo/service-graphql-react 3.0.8 → 3.0.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/lib/Api/ErrorMapHelper.js +1 -1
- package/lib/Api/ErrorMapHelper.js.map +1 -1
- package/package.json +2 -2
- package/src/Api/ErrorMapHelper.ts +18 -18
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [3.0.10](https://github.com/technology-studio/service-graphql-react/compare/v3.0.9...v3.0.10) (2024-11-27)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug fixes
|
|
5
|
+
|
|
6
|
+
* use key from extensions of graphQlError ([#864](https://github.com/technology-studio/service-graphql-react/issues/864)) ([9e45e94](https://github.com/technology-studio/service-graphql-react/commit/9e45e949fc8ff700a3d5afbe3081c1000214d00f))
|
|
7
|
+
|
|
8
|
+
## [3.0.9](https://github.com/technology-studio/service-graphql-react/compare/v3.0.8...v3.0.9) (2024-11-26)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug fixes
|
|
12
|
+
|
|
13
|
+
* **deps:** update dependency type-fest to ^4.28.1 ([#863](https://github.com/technology-studio/service-graphql-react/issues/863)) ([7bb26fb](https://github.com/technology-studio/service-graphql-react/commit/7bb26fb753dbc8606e5e28f459711af33b82453c))
|
|
14
|
+
|
|
1
15
|
## [3.0.8](https://github.com/technology-studio/service-graphql-react/compare/v3.0.7...v3.0.8) (2024-11-24)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -60,7 +60,7 @@ const applyErrorMap = (serviceErrorList, errorMap, onFieldErrors) => {
|
|
|
60
60
|
const nextServiceErrorList = serviceErrorList
|
|
61
61
|
.reduce((nextServiceErrorList, serviceError) => {
|
|
62
62
|
const graphQlError = serviceError.data;
|
|
63
|
-
const path = [...(graphQlError?.path ?? []),
|
|
63
|
+
const path = [...(graphQlError?.path ?? []), graphQlError.extensions.key].join('.');
|
|
64
64
|
const errorMapper = getWithWildcardFallback(normalisedErrorMap, path);
|
|
65
65
|
if (errorMapper != null) {
|
|
66
66
|
const nextServiceError = errorMapper({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorMapHelper.js","sourceRoot":"","sources":["../../src/Api/ErrorMapHelper.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAKH,gDAA0C;AAC1C,4DAA4B;AAO5B,0CAEuB;AAEvB,MAAM,iBAAiB,GAAG,CAAC,QAAkB,EAAY,EAAE;IACzD,IAAI,IAAA,qBAAQ,EAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,kBAA4C,EAAE,GAAG,EAAE,EAAE;YACxF,IAAA,oBAAG,EAAC,kBAAkB,EAAE,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAC9D,OAAO,kBAAkB,CAAA;QAC3B,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,GAAgB,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAA;AAAhD,QAAA,WAAW,eAAqC;AACtD,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAe,EAAE,CAAC,CAAC,EACjE,KAAK,GACN,EAAE,EAAE;IACH,MAAM,SAAS,GAAiB;QAC9B,GAAG,KAAK;QACR,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO;QACjC,IAAI,EAAE;YACJ,GAAG,KAAK,CAAC,IAAI;YACb,IAAI,EAAE,wBAAgB;SACvB;KACF,CAAA;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAbY,QAAA,eAAe,mBAa3B;AAED,MAAM,uBAAuB,GAAG,CAAC,QAAkB,EAAE,IAAY,EAA2B,EAAE;IAC5F,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,IAAI,IAAA,qBAAQ,EAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;YACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACrC,MAAM,UAAU,GAAG,WAAW,IAAI,IAAI,IAAI,WAAW,KAAK,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAA;YACjH,OAAO,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1E,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9D,CAAC,CAAA;AAEM,MAAM,aAAa,GAAG,CAC3B,gBAAgC,EAChC,QAAkB,EAClB,aAA6E,EAC7D,EAAE;IAClB,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACtD,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,MAAM,WAAW,GAAG,EAAE,CAAA;IACtB,MAAM,oBAAoB,GAAG,gBAAgB;SAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"ErrorMapHelper.js","sourceRoot":"","sources":["../../src/Api/ErrorMapHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@txo/service-graphql-react",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.10",
|
|
4
4
|
"description": "Technology Studio - Service graphql react",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@txo/types": "^1.7.0",
|
|
45
45
|
"lodash.get": "^4.4.2",
|
|
46
46
|
"lodash.set": "^4.3.2",
|
|
47
|
-
"type-fest": "^4.28.
|
|
47
|
+
"type-fest": "^4.28.1"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"@apollo/client": "^3.11.10",
|
|
@@ -73,27 +73,27 @@ export const applyErrorMap = (
|
|
|
73
73
|
const fieldErrors = {}
|
|
74
74
|
const nextServiceErrorList = serviceErrorList
|
|
75
75
|
.reduce<ServiceError[]>(
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
76
|
+
(nextServiceErrorList, serviceError) => {
|
|
77
|
+
const graphQlError = serviceError.data as GraphQLError
|
|
78
|
+
const path = [...(graphQlError?.path ?? []), graphQlError.extensions.key].join('.')
|
|
79
|
+
const errorMapper = getWithWildcardFallback(normalisedErrorMap, path)
|
|
80
80
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
81
|
+
if (errorMapper != null) {
|
|
82
|
+
const nextServiceError = errorMapper({
|
|
83
|
+
error: serviceError,
|
|
84
|
+
fieldErrors,
|
|
85
|
+
path,
|
|
86
|
+
})
|
|
87
|
+
if (nextServiceError !== serviceError) {
|
|
88
|
+
modified = true
|
|
89
|
+
}
|
|
90
|
+
(nextServiceError != null) && nextServiceErrorList.push(nextServiceError)
|
|
91
|
+
} else {
|
|
92
|
+
nextServiceErrorList.push(serviceError)
|
|
89
93
|
}
|
|
90
|
-
(nextServiceError != null) && nextServiceErrorList.push(nextServiceError)
|
|
91
|
-
} else {
|
|
92
|
-
nextServiceErrorList.push(serviceError)
|
|
93
|
-
}
|
|
94
94
|
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
return nextServiceErrorList
|
|
96
|
+
}, [])
|
|
97
97
|
|
|
98
98
|
if ((onFieldErrors != null) && Object.keys(fieldErrors).length > 0) {
|
|
99
99
|
onFieldErrors(fieldErrors)
|