@loadmill/core 0.3.75 → 0.3.76

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.
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.applyJSONSchema = void 0;
7
7
  var jsonschema_1 = require("jsonschema");
8
8
  var isEmpty_1 = __importDefault(require("lodash/isEmpty"));
9
+ var json_utils_1 = require("@loadmill/universal/dist/json-utils");
9
10
  var errors_1 = require("@loadmill/universal/dist/errors");
10
11
  var applyJSONSchema = function (instance, schema) {
11
12
  var v = new jsonschema_1.Validator();
@@ -17,7 +18,7 @@ var applyJSONSchema = function (instance, schema) {
17
18
  parsedInstance = instance;
18
19
  }
19
20
  try {
20
- parsedSchema = JSON.parse(schema);
21
+ parsedSchema = JSON.parse(json_utils_1.stripJsonTrailingCommas(schema));
21
22
  }
22
23
  catch (e) {
23
24
  throw new errors_1.JSONSchemaAssertionError("Invalid schema - " + e.message);
@@ -1 +1 @@
1
- {"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../src/parameters/parameter-functions/json-schema.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAuC;AACvC,2DAAqC;AAErC,0DAA2E;AAEpE,IAAM,eAAe,GAAG,UAAC,QAAQ,EAAE,MAAM;IAC9C,IAAM,CAAC,GAAG,IAAI,sBAAS,EAAE,CAAC;IAC1B,IAAI,cAAc,EAAE,YAAY,CAAC;IAEjC,IAAI;QACF,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;KACvC;IAAC,WAAM;QACN,cAAc,GAAG,QAAQ,CAAC;KAC3B;IAED,IAAI;QACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,iCAAwB,CAAC,sBAAoB,CAAC,CAAC,OAAS,CAAC,CAAC;KACrE;IAED,IAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAErD,IAAI,CAAC,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAvBW,QAAA,eAAe,mBAuB1B"}
1
+ {"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../src/parameters/parameter-functions/json-schema.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAuC;AACvC,2DAAqC;AACrC,kEAA8E;AAC9E,0DAA2E;AAEpE,IAAM,eAAe,GAAG,UAAC,QAAQ,EAAE,MAAM;IAC9C,IAAM,CAAC,GAAG,IAAI,sBAAS,EAAE,CAAC;IAC1B,IAAI,cAAc,EAAE,YAAY,CAAC;IAEjC,IAAI;QACF,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;KACvC;IAAC,WAAM;QACN,cAAc,GAAG,QAAQ,CAAC;KAC3B;IAED,IAAI;QACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,oCAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;KAC5D;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,iCAAwB,CAAC,sBAAoB,CAAC,CAAC,OAAS,CAAC,CAAC;KACrE;IAED,IAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAErD,IAAI,CAAC,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAvBW,QAAA,eAAe,mBAuB1B"}
@@ -25,7 +25,7 @@ exports.generateJSONSchema = generateJSONSchema;
25
25
  var _getSchema = function (obj, ignoreKeys, shouldAddNullable, withExactValue, withKeys) {
26
26
  if (ignoreKeys === void 0) { ignoreKeys = []; }
27
27
  if (obj == null) {
28
- return shouldAddNullable ? { type: 'object', nullable: true } : {};
28
+ return shouldAddNullable ? { type: 'object', nullable: true } : { type: 'null' };
29
29
  }
30
30
  else if (exports.isPrimitive(obj)) {
31
31
  var res = { type: evaluateObjectType(obj) };
@@ -81,7 +81,8 @@ var humanizeJsonSchemaErrors = function (errors) {
81
81
  err.stack = "JSON contains null on property " + exports.getField(err.property, err.message);
82
82
  }
83
83
  if (err.stack.includes('is not of a type')) {
84
- err.stack = "JSON doesn't contain a type of " + err.argument[0] + " on property " + exports.getField(err.property, err.message) + " " + addIndex(err);
84
+ var type = err.argument[0];
85
+ err.stack = "JSON doesn't contain " + (type === 'null' ? type : "a type of " + type) + " on property " + exports.getField(err.property, err.message) + " " + addIndex(err);
85
86
  }
86
87
  else if (err.stack.includes('does not exactly match')) {
87
88
  err.stack = "JSON doesn't contain " + err.schema.const + " on property " + exports.getField(err.property, err.message) + " " + addIndex(err);
@@ -1 +1 @@
1
- {"version":3,"file":"json-schema-generator.js","sourceRoot":"","sources":["../../src/schema/json-schema-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"json-schema-generator.js","sourceRoot":"","sources":["../../src/schema/json-schema-generator.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.isJSONContains = void 0;
4
4
  var errors_1 = require("@loadmill/universal/dist/errors");
5
+ var json_utils_1 = require("@loadmill/universal/dist/json-utils");
5
6
  var is_subset_1 = require("./is-subset");
6
7
  var isJSONContains = function (containing, contained) {
7
8
  var parsedContaining, parsedContained;
@@ -12,7 +13,7 @@ var isJSONContains = function (containing, contained) {
12
13
  throw new errors_1.PresentableError('couldn\'t parse the containing JSON');
13
14
  }
14
15
  try {
15
- parsedContained = JSON.parse(contained);
16
+ parsedContained = JSON.parse(json_utils_1.stripJsonTrailingCommas(contained));
16
17
  }
17
18
  catch (e) {
18
19
  throw new errors_1.PresentableError('couldn\'t parse the contained JSON');
@@ -1 +1 @@
1
- {"version":3,"file":"json-contains.js","sourceRoot":"","sources":["../../src/subset/json-contains.ts"],"names":[],"mappings":";;;AAAA,0DAAmE;AAEnE,yCAAuC;AAEhC,IAAM,cAAc,GAAG,UAAC,UAAkB,EAAE,SAAiB;IAClE,IAAI,gBAA2B,EAAE,eAA0B,CAAC;IAE5D,IAAI;QACF,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;KAC3C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,yBAAgB,CAAC,qCAAqC,CAAC,CAAC;KACnE;IAED,IAAI;QACF,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;KACzC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,yBAAgB,CAAC,oCAAoC,CAAC,CAAC;KAClE;IAED,OAAO,oBAAQ,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AACrD,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}
1
+ {"version":3,"file":"json-contains.js","sourceRoot":"","sources":["../../src/subset/json-contains.ts"],"names":[],"mappings":";;;AAAA,0DAAmE;AAEnE,kEAA8E;AAC9E,yCAAuC;AAEhC,IAAM,cAAc,GAAG,UAAC,UAAkB,EAAE,SAAiB;IAClE,IAAI,gBAA2B,EAAE,eAA0B,CAAC;IAE5D,IAAI;QACF,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;KAC3C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,yBAAgB,CAAC,qCAAqC,CAAC,CAAC;KACnE;IAED,IAAI;QACF,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,oCAAuB,CAAC,SAAS,CAAC,CAAC,CAAC;KAClE;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,yBAAgB,CAAC,oCAAoC,CAAC,CAAC;KAClE;IAED,OAAO,oBAAQ,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AACrD,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loadmill/core",
3
- "version": "0.3.75",
3
+ "version": "0.3.76",
4
4
  "description": "Loadmill core library",
5
5
  "scripts": {
6
6
  "ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
@@ -23,7 +23,7 @@
23
23
  "@aws-sdk/client-cognito-identity": "^3.58.0",
24
24
  "@aws-sdk/client-firehose": "^3.58.0",
25
25
  "@aws-sdk/types": "^3.55.0",
26
- "@loadmill/universal": "0.3.70",
26
+ "@loadmill/universal": "0.3.71",
27
27
  "cheerio": "^0.22.0",
28
28
  "crypto-js": "^4.1.1",
29
29
  "http-headers-validation": "^0.0.1",