@loadmill/core 0.3.178 → 0.3.179
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.
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
declare type JsonSchemaOptions = {
|
|
2
|
+
ignoreKeys?: string[];
|
|
3
|
+
shouldAddNullable?: boolean;
|
|
4
|
+
withExactValue?: boolean;
|
|
5
|
+
withKeys?: boolean;
|
|
6
|
+
isStrict?: boolean;
|
|
7
|
+
};
|
|
8
|
+
export declare const generateJSONSchema: (jsObj: any, options?: JsonSchemaOptions) => PrimitiveSchema | Schema;
|
|
2
9
|
export declare const isPrimitive: (obj: any) => obj is Primitive;
|
|
3
10
|
export declare const humanizeJsonSchemaErrors: (errors: any) => any;
|
|
4
11
|
export declare const getField: (property: any, message?: string) => any;
|
|
@@ -5,13 +5,10 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var find = require("lodash/find");
|
|
6
6
|
var log_1 = tslib_1.__importDefault(require("@loadmill/universal/dist/log"));
|
|
7
7
|
var isEmpty = require("lodash/isEmpty");
|
|
8
|
-
var generateJSONSchema = function (jsObj,
|
|
9
|
-
if (
|
|
10
|
-
if (shouldAddNullable === void 0) { shouldAddNullable = false; }
|
|
11
|
-
if (withExactValue === void 0) { withExactValue = false; }
|
|
12
|
-
if (withKeys === void 0) { withKeys = false; }
|
|
8
|
+
var generateJSONSchema = function (jsObj, options) {
|
|
9
|
+
if (options === void 0) { options = {}; }
|
|
13
10
|
try {
|
|
14
|
-
var schema = _getSchema(jsObj,
|
|
11
|
+
var schema = _getSchema(jsObj, options);
|
|
15
12
|
return schema;
|
|
16
13
|
}
|
|
17
14
|
catch (err) {
|
|
@@ -20,8 +17,8 @@ var generateJSONSchema = function (jsObj, ignoreKeys, shouldAddNullable, withExa
|
|
|
20
17
|
return {};
|
|
21
18
|
};
|
|
22
19
|
exports.generateJSONSchema = generateJSONSchema;
|
|
23
|
-
var _getSchema = function (obj,
|
|
24
|
-
|
|
20
|
+
var _getSchema = function (obj, options) {
|
|
21
|
+
var _a = options.ignoreKeys, ignoreKeys = _a === void 0 ? [] : _a, _b = options.shouldAddNullable, shouldAddNullable = _b === void 0 ? false : _b, _c = options.withExactValue, withExactValue = _c === void 0 ? false : _c, _d = options.withKeys, withKeys = _d === void 0 ? false : _d, _e = options.isStrict, isStrict = _e === void 0 ? false : _e;
|
|
25
22
|
if (obj == null) {
|
|
26
23
|
return shouldAddNullable ? { type: 'object', nullable: true } : { type: 'null' };
|
|
27
24
|
}
|
|
@@ -34,9 +31,9 @@ var _getSchema = function (obj, ignoreKeys, shouldAddNullable, withExactValue, w
|
|
|
34
31
|
}
|
|
35
32
|
else if (Array.isArray(obj)) {
|
|
36
33
|
var items = [];
|
|
37
|
-
for (var _i = 0,
|
|
38
|
-
var
|
|
39
|
-
var elementSchema = _getSchema(value,
|
|
34
|
+
for (var _i = 0, _f = Object.entries(obj); _i < _f.length; _i++) {
|
|
35
|
+
var _g = _f[_i], value = _g[1];
|
|
36
|
+
var elementSchema = _getSchema(value, options);
|
|
40
37
|
if (withExactValue || !find(items, elementSchema)) {
|
|
41
38
|
items.push(elementSchema);
|
|
42
39
|
}
|
|
@@ -51,10 +48,10 @@ var _getSchema = function (obj, ignoreKeys, shouldAddNullable, withExactValue, w
|
|
|
51
48
|
}
|
|
52
49
|
else {
|
|
53
50
|
var properties = {};
|
|
54
|
-
for (var
|
|
55
|
-
var
|
|
51
|
+
for (var _h = 0, _j = Object.entries(obj); _h < _j.length; _h++) {
|
|
52
|
+
var _k = _j[_h], key = _k[0], value = _k[1];
|
|
56
53
|
if (!ignoreKeys.includes(key)) {
|
|
57
|
-
properties[key] = _getSchema(value,
|
|
54
|
+
properties[key] = _getSchema(value, options);
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
57
|
var res = {
|
|
@@ -62,6 +59,7 @@ var _getSchema = function (obj, ignoreKeys, shouldAddNullable, withExactValue, w
|
|
|
62
59
|
properties: properties,
|
|
63
60
|
};
|
|
64
61
|
withKeys && (res['required'] = Object.keys(obj));
|
|
62
|
+
isStrict && (res['additionalProperties'] = false);
|
|
65
63
|
return res;
|
|
66
64
|
}
|
|
67
65
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema-generator.js","sourceRoot":"","sources":["../../src/schema/json-schema-generator.ts"],"names":[],"mappings":";;;;AAAA,kCAAqC;AACrC,6EAA+C;AAC/C,wCAA2C;
|
|
1
|
+
{"version":3,"file":"json-schema-generator.js","sourceRoot":"","sources":["../../src/schema/json-schema-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,3 +38,10 @@ export declare enum ArrayFormat {
|
|
|
38
38
|
INDICES = "indices",
|
|
39
39
|
REPEAT = "repeat"
|
|
40
40
|
}
|
|
41
|
+
export declare type StrictResponseValidation = {
|
|
42
|
+
jsonSchema: boolean;
|
|
43
|
+
jsonContains: boolean;
|
|
44
|
+
isStrict: boolean;
|
|
45
|
+
shouldValidateArrayItems: boolean;
|
|
46
|
+
ignoreKeys: string[];
|
|
47
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loadmill/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.179",
|
|
4
4
|
"description": "Loadmill core library",
|
|
5
5
|
"main": "dist/",
|
|
6
6
|
"scripts": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@aws-sdk/client-cognito-identity": "~3.58.0",
|
|
28
28
|
"@aws-sdk/client-firehose": "~3.58.0",
|
|
29
29
|
"@aws-sdk/types": "~3.55.0",
|
|
30
|
-
"@loadmill/universal": "0.3.
|
|
30
|
+
"@loadmill/universal": "0.3.174",
|
|
31
31
|
"@xmldom/xmldom": "^0.8.10",
|
|
32
32
|
"cheerio": "^0.22.0",
|
|
33
33
|
"crypto-js": "^4.1.1",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"superagent": "^10.0.1",
|
|
49
49
|
"tslib": "^2.8.1",
|
|
50
50
|
"urijs": "^1.18.1",
|
|
51
|
-
"validator": "13.
|
|
51
|
+
"validator": "13.15.23",
|
|
52
52
|
"xml2js": "^0.6.2",
|
|
53
53
|
"xpath": "^0.0.32"
|
|
54
54
|
},
|