@hestia-earth/schema-validation 7.6.0 → 7.6.1

package/package.json

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

package/validate-jsonld.js

@@ -75,28 +75,36 @@ exports.run = function () { return __awaiter(void 0, void 0, void 0, function ()
     var contentValidator, jsonldFiles, results;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, validate_1.validator(domain, strictMode === 'true')];
-            case 1:
-                contentValidator = _a.sent();
+            case 0:
+                contentValidator = validate_1.validator(domain, strictMode === 'true');
                 jsonldFiles = findFiles(folder);
-                results = jsonldFiles
-                    .map(function (filepath) {
-                    var content = loadFile(filepath);
-                    var nodes = Array.isArray(content) ? content : ('nodes' in content ? content.nodes : [content]);
-                    var allErrors = nodes
-                        .map(function (node) { return node['@type'] || node.type ? node : null; })
-                        .filter(Boolean)
-                        .map(contentValidator)
-                        .map(function (_a) {
-                        var errors = _a.errors;
-                        return errors;
-                    });
-                    return {
-                        filepath: filepath,
-                        success: !allErrors.some(function (v) { return v.length; }),
-                        errors: allErrors
-                    };
-                })
+                return [4 /*yield*/, Promise.all(jsonldFiles.map(function (filepath) { return __awaiter(void 0, void 0, void 0, function () {
+                        var content, nodes, allErrors;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    content = loadFile(filepath);
+                                    nodes = Array.isArray(content) ? content : ('nodes' in content ? content.nodes : [content]);
+                                    return [4 /*yield*/, Promise.all(nodes
+                                            .map(function (node) { return node['@type'] || node.type ? node : null; })
+                                            .filter(Boolean)
+                                            .map(contentValidator))];
+                                case 1:
+                                    allErrors = (_a.sent())
+                                        .map(function (_a) {
+                                        var errors = _a.errors;
+                                        return errors;
+                                    });
+                                    return [2 /*return*/, {
+                                            filepath: filepath,
+                                            success: !allErrors.some(function (v) { return v.length; }),
+                                            errors: allErrors
+                                        }];
+                            }
+                        });
+                    }); }))];
+            case 1:
+                results = (_a.sent())
                     .filter(function (_a) {
                     var success = _a.success;
                     return !success;

package/validate.d.ts

@@ -1,10 +1,17 @@
 import * as Ajv from 'ajv';
 import { SchemaType, JSON as HestiaJson } from '@hestia-earth/schema';
 import { definitions } from '@hestia-earth/json-schema';
-export declare const validateContent: (ajv: Ajv.Ajv, schemas: definitions) => (content: HestiaJson<SchemaType>) => {
-    success: boolean | PromiseLike<any>;
+/**
+ * Validate a single node. Function is asynchronous to return a list of `success` and a list of `errors`.
+ *
+ * @param ajv The AJV object. Use `initAjv()` or pass your own.
+ * @param schemas The schema definitions. Use `loadSchemas` from `@hestia-earth/json-schema`  or pass your own.
+ * @returns
+ */
+export declare const validateContent: (ajv: Ajv.Ajv, schemas: definitions) => (content: HestiaJson<SchemaType>) => Promise<{
+    success: any;
     errors: Ajv.ErrorObject[];
-};
+}>;
 declare function uniqueArrayItemValidate(keys: string[], items: any[], schema?: any, dataPath?: string): boolean;
 export { uniqueArrayItemValidate };
 export declare const initAjv: () => Ajv.Ajv;
@@ -15,7 +22,7 @@ export declare const initAjv: () => Ajv.Ajv;
  * @param strictMode Allow validating non-existing nodes, i.e. without unique `@id`.
  * @returns Function to validate a Node. Use `await validator()(node)`
  */
-export declare const validator: (domain?: string, strictMode?: boolean) => (content: HestiaJson<SchemaType>) => {
-    success: boolean | PromiseLike<any>;
+export declare const validator: (domain?: string, strictMode?: boolean) => (content: HestiaJson<SchemaType>) => Promise<{
+    success: any;
     errors: Ajv.ErrorObject[];
-};
+}>;

package/validate.js

@@ -10,6 +10,42 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validator = exports.initAjv = exports.uniqueArrayItemValidate = exports.validateContent = void 0;
 var Ajv = require("ajv");
@@ -24,9 +60,30 @@ var validateSchemaType = function (schemas, content) {
     }
     return true;
 };
-exports.validateContent = function (ajv, schemas) { return function (content) { return validateSchemaType(schemas, content) && ({
-    success: ajv.validate(schemas[content['@type'] || content.type], content),
-    errors: ajv.errors || []
+/**
+ * Validate a single node. Function is asynchronous to return a list of `success` and a list of `errors`.
+ *
+ * @param ajv The AJV object. Use `initAjv()` or pass your own.
+ * @param schemas The schema definitions. Use `loadSchemas` from `@hestia-earth/json-schema`  or pass your own.
+ * @returns
+ */
+exports.validateContent = function (ajv, schemas) { return function (content) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = validateSchemaType(schemas, content);
+                if (!_a) return [3 /*break*/, 2];
+                _b = {};
+                return [4 /*yield*/, ajv.validate(schemas[content['@type'] || content.type], content)];
+            case 1:
+                _a = (_b.success = _c.sent(),
+                    _b.errors = ajv.errors || [],
+                    _b);
+                _c.label = 2;
+            case 2: return [2 /*return*/, _a];
+        }
+    });
 }); }; };
 var getByKey = function (prev, curr) { return !curr || !prev ? prev : (Array.isArray(prev) ? prev.map(function (item) { return getItemValue(item, curr); }) : (prev ? prev[curr] : undefined)); };
 var getItemValue = function (item, key) {
@@ -86,7 +143,7 @@ exports.validator = function (domain, strictMode) {
                 type: 'string'
             } }, schema.properties);
         schema.oneOf = strictMode && schema_1.isTypeNode(schemaName) ? [existingNodeRequired] : schema.oneOf;
-        ajv.addSchema(schema, domain + "/schema/json-schema}/" + schemaName + "#");
+        ajv.addSchema(schema, domain + "/schema/json-schema/" + schemaName + "#");
     });
     return exports.validateContent(ajv, schemas);
 };