@tsed/ajv 7.67.3 → 7.67.5
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/jest.config.js +3 -3
- package/lib/cjs/utils/defaultErrorFormatter.js +13 -6
- package/lib/cjs/utils/defaultErrorFormatter.js.map +1 -1
- package/lib/cjs/utils/getPath.js +9 -2
- package/lib/cjs/utils/getPath.js.map +1 -1
- package/lib/esm/utils/defaultErrorFormatter.js +14 -7
- package/lib/esm/utils/defaultErrorFormatter.js.map +1 -1
- package/lib/esm/utils/getPath.js +6 -0
- package/lib/esm/utils/getPath.js.map +1 -1
- package/lib/types/utils/getPath.d.ts +1 -0
- package/package.json +11 -11
package/jest.config.js
CHANGED
|
@@ -5,20 +5,27 @@ const getPath_1 = require("./getPath");
|
|
|
5
5
|
function defaultErrorFormatter(error) {
|
|
6
6
|
const value = JSON.stringify(error.data === undefined ? "undefined" : error.data);
|
|
7
7
|
const join = (list) => list.filter(Boolean).join("").trim();
|
|
8
|
-
|
|
9
|
-
const [, indexPath, ...paths] = error.dataPath.split(".");
|
|
8
|
+
const [, indexPath, ...paths] = (0, getPath_1.getInstancePath)(error).split(".");
|
|
10
9
|
const deepPaths = paths.length ? "." + paths.join(".") : "";
|
|
10
|
+
error.dataPath = (0, getPath_1.getPath)(error);
|
|
11
11
|
if (error.collectionName) {
|
|
12
|
+
const modelName = error.modelName || "";
|
|
12
13
|
switch (error.collectionName) {
|
|
13
14
|
case "Array":
|
|
14
|
-
return join([`${
|
|
15
|
+
return join([`${modelName}[${indexPath}]${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
15
16
|
case "Map":
|
|
16
|
-
return join([`Map<${indexPath}, ${
|
|
17
|
+
return join([`Map<${indexPath}, ${modelName}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
17
18
|
case "Set":
|
|
18
|
-
return join([`Set<${indexPath}, ${
|
|
19
|
+
return join([`Set<${indexPath}, ${modelName}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
|
-
return join([
|
|
22
|
+
return join([
|
|
23
|
+
!error.modelName && "Value",
|
|
24
|
+
`${error.modelName || ""}`,
|
|
25
|
+
(!error?.params?.missingProperty && error.dataPath) ||
|
|
26
|
+
(error?.params?.missingProperty && (error.instancePath || "").replace(/\//g, ".")),
|
|
27
|
+
` ${error.message}. Given value: ${value}`
|
|
28
|
+
]);
|
|
22
29
|
}
|
|
23
30
|
exports.defaultErrorFormatter = defaultErrorFormatter;
|
|
24
31
|
//# sourceMappingURL=defaultErrorFormatter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":";;;AACA,uCAAmD;AAEnD,SAAgB,qBAAqB,CAAC,KAA0C;IAC9E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,MAAM,IAAI,GAAG,CAAC,IAAW,EAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAE3E,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,KAAK,CAAC,QAAQ,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;QAExC,QAAQ,KAAK,CAAC,cAAc,EAAE;YAC5B,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,CAAC,GAAG,SAAS,IAAI,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YACtG,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3G,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;SAC5G;KACF;IAED,OAAO,IAAI,CAAC;QACV,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO;QAC3B,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE;QAC1B,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,IAAI,KAAK,CAAC,QAAQ,CAAC;YACjD,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpF,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE;KAC3C,CAAC,CAAC;AACL,CAAC;AA7BD,sDA6BC"}
|
package/lib/cjs/utils/getPath.js
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPath = void 0;
|
|
3
|
+
exports.getInstancePath = exports.getPath = void 0;
|
|
4
4
|
const core_1 = require("@tsed/core");
|
|
5
5
|
function getPath(error) {
|
|
6
|
-
|
|
6
|
+
if (error.params && error.params.missingProperty) {
|
|
7
|
+
return `.${error.params.missingProperty}`;
|
|
8
|
+
}
|
|
9
|
+
return getInstancePath(error);
|
|
7
10
|
}
|
|
8
11
|
exports.getPath = getPath;
|
|
12
|
+
function getInstancePath(error) {
|
|
13
|
+
return (0, core_1.getValue)(error, "dataPath", (0, core_1.getValue)(error, "instancePath", "")).replace(/\//gi, ".");
|
|
14
|
+
}
|
|
15
|
+
exports.getInstancePath = getInstancePath;
|
|
9
16
|
//# sourceMappingURL=getPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPath.js","sourceRoot":"","sources":["../../../src/utils/getPath.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,SAAgB,OAAO,CAAC,KAAU;IAChC,OAAO,IAAA,eAAQ,EAAC,KAAK,EAAE,UAAU,EAAE,IAAA,eAAQ,EAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC;AAFD,
|
|
1
|
+
{"version":3,"file":"getPath.js","sourceRoot":"","sources":["../../../src/utils/getPath.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,SAAgB,OAAO,CAAC,KAAU;IAChC,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE;QAChD,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;KAC3C;IAED,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAND,0BAMC;AAED,SAAgB,eAAe,CAAC,KAAU;IACxC,OAAO,IAAA,eAAQ,EAAC,KAAK,EAAE,UAAU,EAAE,IAAA,eAAQ,EAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC;AAFD,0CAEC"}
|
|
@@ -1,20 +1,27 @@
|
|
|
1
|
-
import { getPath } from "./getPath.js";
|
|
1
|
+
import { getInstancePath, getPath } from "./getPath.js";
|
|
2
2
|
export function defaultErrorFormatter(error) {
|
|
3
3
|
const value = JSON.stringify(error.data === undefined ? "undefined" : error.data);
|
|
4
4
|
const join = (list) => list.filter(Boolean).join("").trim();
|
|
5
|
-
|
|
6
|
-
const [, indexPath, ...paths] = error.dataPath.split(".");
|
|
5
|
+
const [, indexPath, ...paths] = getInstancePath(error).split(".");
|
|
7
6
|
const deepPaths = paths.length ? "." + paths.join(".") : "";
|
|
7
|
+
error.dataPath = getPath(error);
|
|
8
8
|
if (error.collectionName) {
|
|
9
|
+
const modelName = error.modelName || "";
|
|
9
10
|
switch (error.collectionName) {
|
|
10
11
|
case "Array":
|
|
11
|
-
return join([`${
|
|
12
|
+
return join([`${modelName}[${indexPath}]${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
12
13
|
case "Map":
|
|
13
|
-
return join([`Map<${indexPath}, ${
|
|
14
|
+
return join([`Map<${indexPath}, ${modelName}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
14
15
|
case "Set":
|
|
15
|
-
return join([`Set<${indexPath}, ${
|
|
16
|
+
return join([`Set<${indexPath}, ${modelName}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
|
-
return join([
|
|
19
|
+
return join([
|
|
20
|
+
!error.modelName && "Value",
|
|
21
|
+
`${error.modelName || ""}`,
|
|
22
|
+
(!error?.params?.missingProperty && error.dataPath) ||
|
|
23
|
+
(error?.params?.missingProperty && (error.instancePath || "").replace(/\//g, ".")),
|
|
24
|
+
` ${error.message}. Given value: ${value}`
|
|
25
|
+
]);
|
|
19
26
|
}
|
|
20
27
|
//# sourceMappingURL=defaultErrorFormatter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AAEnD,MAAM,UAAU,qBAAqB,CAAC,KAA0C;IAC9E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,MAAM,IAAI,GAAG,CAAC,IAAW,EAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAE3E,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;QAExC,QAAQ,KAAK,CAAC,cAAc,EAAE;YAC5B,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,CAAC,GAAG,SAAS,IAAI,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YACtG,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3G,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;SAC5G;KACF;IAED,OAAO,IAAI,CAAC;QACV,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO;QAC3B,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE;QAC1B,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,IAAI,KAAK,CAAC,QAAQ,CAAC;YACjD,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpF,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE;KAC3C,CAAC,CAAC;AACL,CAAC"}
|
package/lib/esm/utils/getPath.js
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { getValue } from "@tsed/core";
|
|
2
2
|
export function getPath(error) {
|
|
3
|
+
if (error.params && error.params.missingProperty) {
|
|
4
|
+
return `.${error.params.missingProperty}`;
|
|
5
|
+
}
|
|
6
|
+
return getInstancePath(error);
|
|
7
|
+
}
|
|
8
|
+
export function getInstancePath(error) {
|
|
3
9
|
return getValue(error, "dataPath", getValue(error, "instancePath", "")).replace(/\//gi, ".");
|
|
4
10
|
}
|
|
5
11
|
//# sourceMappingURL=getPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPath.js","sourceRoot":"","sources":["../../../src/utils/getPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,OAAO,CAAC,KAAU;IAChC,OAAO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC"}
|
|
1
|
+
{"version":3,"file":"getPath.js","sourceRoot":"","sources":["../../../src/utils/getPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,OAAO,CAAC,KAAU;IAChC,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE;QAChD,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;KAC3C;IAED,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAU;IACxC,OAAO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tsed/ajv",
|
|
3
|
-
"version": "7.67.
|
|
3
|
+
"version": "7.67.5",
|
|
4
4
|
"description": "AJV package for Ts.ED framework",
|
|
5
5
|
"source": "./src/index.ts",
|
|
6
6
|
"main": "./lib/cjs/index.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"scripts": {
|
|
16
16
|
"build": "yarn barrels && yarn build:ts",
|
|
17
17
|
"barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
|
|
18
|
-
"test": "
|
|
18
|
+
"test": "jest --max-workers=2 && jest-coverage-thresholds-bumper",
|
|
19
19
|
"build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
@@ -24,21 +24,21 @@
|
|
|
24
24
|
"tslib": "2.6.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@tsed/core": "7.67.
|
|
28
|
-
"@tsed/di": "7.67.
|
|
29
|
-
"@tsed/exceptions": "7.67.
|
|
30
|
-
"@tsed/schema": "7.67.
|
|
31
|
-
"@tsed/typescript": "7.67.
|
|
27
|
+
"@tsed/core": "7.67.5",
|
|
28
|
+
"@tsed/di": "7.67.5",
|
|
29
|
+
"@tsed/exceptions": "7.67.5",
|
|
30
|
+
"@tsed/schema": "7.67.5",
|
|
31
|
+
"@tsed/typescript": "7.67.5",
|
|
32
32
|
"ajv": "8.12.0",
|
|
33
33
|
"barrelsby": "^2.8.1",
|
|
34
34
|
"eslint": "^8.57.0",
|
|
35
35
|
"jest": "^29.7.0"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@tsed/core": "7.67.
|
|
39
|
-
"@tsed/di": "7.67.
|
|
40
|
-
"@tsed/exceptions": "7.67.
|
|
41
|
-
"@tsed/schema": "7.67.
|
|
38
|
+
"@tsed/core": "7.67.5",
|
|
39
|
+
"@tsed/di": "7.67.5",
|
|
40
|
+
"@tsed/exceptions": "7.67.5",
|
|
41
|
+
"@tsed/schema": "7.67.5",
|
|
42
42
|
"ajv": ">=8.9.0",
|
|
43
43
|
"ajv-errors": ">=3.0.0"
|
|
44
44
|
},
|