@hestia-earth/schema-validation 7.5.1 → 7.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/schema-validation",
-  "version": "7.5.1",
+  "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) => Promise<(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

@@ -60,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) {
@@ -114,25 +135,15 @@ exports.initAjv = function () {
 exports.validator = function (domain, strictMode) {
     if (domain === void 0) { domain = 'https://www.hestia.earth'; }
     if (strictMode === void 0) { strictMode = true; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var ajv, schemas;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    ajv = exports.initAjv();
-                    return [4 /*yield*/, json_schema_1.loadSchemas()];
-                case 1:
-                    schemas = _a.sent();
-                    Object.keys(schemas).map(function (schemaName) {
-                        var schema = schemas[schemaName];
-                        schema.properties = __assign({ '@context': {
-                                type: 'string'
-                            } }, schema.properties);
-                        schema.oneOf = strictMode && schema_1.isTypeNode(schemaName) ? [existingNodeRequired] : schema.oneOf;
-                        ajv.addSchema(schema, domain + "/schema/json-schema}/" + schemaName + "#");
-                    });
-                    return [2 /*return*/, exports.validateContent(ajv, schemas)];
-            }
-        });
+    var ajv = exports.initAjv();
+    var schemas = json_schema_1.loadSchemas();
+    Object.keys(schemas).map(function (schemaName) {
+        var schema = schemas[schemaName];
+        schema.properties = __assign({ '@context': {
+                type: 'string'
+            } }, schema.properties);
+        schema.oneOf = strictMode && schema_1.isTypeNode(schemaName) ? [existingNodeRequired] : schema.oneOf;
+        ajv.addSchema(schema, domain + "/schema/json-schema/" + schemaName + "#");
     });
+    return exports.validateContent(ajv, schemas);
 };