Merge branch 'update/SOF-7299' of github.com:Exabyte-io/exabyte-mater…

…ials-json into update/SOF-7299-1

package.json

@@ -68,10 +68,11 @@
         "@babel/register": "^7.16.0",
         "@babel/runtime-corejs3": "7.16.8",
         "@types/chai": "^4.3.11",
+        "@types/js-yaml": "^4.0.9",
         "@types/json-schema-merge-allof": "^0.6.5",
         "@types/mocha": "^10.0.6",
-        "@types/js-yaml": "^4.0.9",
         "ajv": "^8.12.0",
+        "ajv-formats": "^2.1.1",
         "js-yaml": "^4.1.0",
         "json-schema": "^0.4.0",
         "json-schema-deref-sync": "0.14.0",

src/js/utils/ajv.ts

@@ -1,5 +1,6 @@
 import Ajv, { SchemaObject } from "ajv";
 import { AnyValidateFunction } from "ajv/dist/core";
+import addFormats from "ajv-formats";
 
 import { mapObjectDeep } from "../esse/schemaUtils";
 import { AnyObject } from "../esse/types";
@@ -42,6 +43,10 @@ const ajvValidatorAndCleanerWithCoercingTypes = new Ajv({
     coerceTypes: true,
 });
 
+addFormats(ajvValidator);
+addFormats(ajvValidatorAndCleaner);
+addFormats(ajvValidatorAndCleanerWithCoercingTypes);
+
 interface AjvInstanceOptions {
     clean: boolean;
     coerceTypes: boolean;

tests/js/validate.ts

@@ -4,7 +4,6 @@ import groupBy from "lodash/groupBy";
 import * as path from "path";
 
 import JSONSchemasInterface from "../../src/js/esse/JSONSchemasInterfaceServer";
-import { AnyObject } from "../../src/js/esse/types";
 import * as ajv from "../../src/js/utils/ajv";
 import { walkDirSync } from "../../src/js/utils/filesystem";
 
@@ -36,39 +35,6 @@ describe("validate all examples", () => {
     });
 });
 
-interface Example extends AnyObject {
-    property: string | Date;
-}
-
-describe("validate Date object", () => {
-    const schema = {
-        $id: "validate-date-object",
-        type: "object",
-        properties: {
-            property: {
-                type: "string",
-                format: "date-time",
-            },
-        },
-    };
-
-    const example1: Example = { property: new Date() };
-    const example2: Example = { property: "December 17, 1995 03:24:00" };
-    const example3: Example = { property: "Invalid Date" };
-
-    const result1 = ajv.validate(example1, schema);
-    const result2 = ajv.validate(example2, schema);
-    const result3 = ajv.validate(example3, schema);
-
-    expect(result1.isValid).to.be.equal(true);
-    expect(result2.isValid).to.be.equal(true);
-    expect(result3.isValid).to.be.equal(false);
-
-    expect(example1.property instanceof Date).to.be.equal(true);
-    expect(example2.property instanceof Date).to.be.equal(true);
-    expect(typeof example3.property === "string").to.be.equal(true);
-});
-
 describe("schema titles must be unique or empty", () => {
     JSONSchemasInterface.setSchemaFolder(schemasPath);
     const schemas = JSONSchemasInterface.schemasCache.values();