@hestia-earth/schema-validation 23.1.0 → 23.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-validation",
-  "version": "23.1.0",
+  "version": "23.3.0",
   "description": "Hestia Schema Validation",
   "main": "index.js",
   "typings": "index.d.ts",

package/validate.d.ts

@@ -10,7 +10,16 @@ import { definitions } from '@hestia-earth/json-schema';
  */
 export declare const validateContent: (ajv: Ajv.Ajv, schemas: definitions) => (content: HestiaJson<SchemaType>) => Promise<{
     success: any;
-    errors: Ajv.ErrorObject[];
+    errors: {
+        schema?: any;
+        parentSchema?: object;
+        dataPath: string;
+        schemaPath: string;
+        params: Ajv.ErrorParameters;
+        propertyName?: string;
+        message?: string;
+        keyword: string;
+    }[];
 }>;
 export declare const initAjv: () => Ajv.Ajv;
 /**
@@ -22,5 +31,14 @@ export declare const initAjv: () => Ajv.Ajv;
  */
 export declare const validator: (domain?: string, strictMode?: boolean) => (content: HestiaJson<SchemaType>) => Promise<{
     success: any;
-    errors: Ajv.ErrorObject[];
+    errors: {
+        schema?: any;
+        parentSchema?: object;
+        dataPath: string;
+        schemaPath: string;
+        params: Ajv.ErrorParameters;
+        propertyName?: string;
+        message?: string;
+        keyword: string;
+    }[];
 }>;

package/validate.js

@@ -46,6 +46,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validator = exports.initAjv = exports.validateContent = void 0;
 var Ajv = require("ajv");
@@ -61,6 +72,16 @@ var validateSchemaType = function (schemas, content) {
     }
     return true;
 };
+var ignoreSchemaKeywords = [
+    'if', validators_1.uniqueArrayItem, validators_1.arraySameSize
+];
+// using `verbose: true` includes data which we don't need
+var cleanErrors = function (errors) {
+    return errors.map(function (_a) {
+        var keyword = _a.keyword, data = _a.data, schema = _a.schema, parentSchema = _a.parentSchema, error = __rest(_a, ["keyword", "data", "schema", "parentSchema"]);
+        return (__assign(__assign({ keyword: keyword }, error), (ignoreSchemaKeywords.includes(keyword) ? {} : { schema: schema, parentSchema: parentSchema })));
+    });
+};
 /**
  * Validate a single node. Function is asynchronous to return a list of `success` and a list of `errors`.
  *
@@ -80,7 +101,7 @@ var validateContent = function (ajv, schemas) { return function (content) { retu
                 return [4 /*yield*/, ajv.validate(schemas[content['@type'] || content.type], content)];
             case 1:
                 _a = (_b.success = _c.sent(),
-                    _b.errors = ajv.errors || [],
+                    _b.errors = cleanErrors(ajv.errors || []),
                     _b);
                 _c.label = 2;
             case 2: return [2 /*return*/, _a];
@@ -91,7 +112,8 @@ exports.validateContent = validateContent;
 var initAjv = function () {
     var ajv = new Ajv({
         schemaId: 'auto',
-        allErrors: true
+        allErrors: true,
+        verbose: true
     });
     ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
     ajv.addSchema(require('./json-schema/geojson.json'), geojsonSchema);

package/validators/index.d.ts

@@ -1,2 +1,6 @@
 import { Ajv } from 'ajv';
+import { keyword as arraySameSize } from './arraySameSize';
+import { keyword as datePattern } from './datePattern';
+import { keyword as uniqueArrayItem } from './uniqueArrayItem';
+export { arraySameSize, datePattern, uniqueArrayItem };
 export declare const init: (ajv: Ajv) => void;

package/validators/index.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
+exports.init = exports.uniqueArrayItem = exports.datePattern = exports.arraySameSize = void 0;
 var arraySameSize_1 = require("./arraySameSize");
+Object.defineProperty(exports, "arraySameSize", { enumerable: true, get: function () { return arraySameSize_1.keyword; } });
 var datePattern_1 = require("./datePattern");
+Object.defineProperty(exports, "datePattern", { enumerable: true, get: function () { return datePattern_1.keyword; } });
 var uniqueArrayItem_1 = require("./uniqueArrayItem");
+Object.defineProperty(exports, "uniqueArrayItem", { enumerable: true, get: function () { return uniqueArrayItem_1.keyword; } });
 var init = function (ajv) {
     ajv.addKeyword(arraySameSize_1.keyword, {
         type: 'array',