SOF-6944: accept schema as optional argument in validation method

Exabyte-io · Oct 2, 2024 · 487d245 · 487d245
1 parent 45d1fff
commit 487d245
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dist/js/entity/in_memory.d.ts b/dist/js/entity/in_memory.d.ts
@@ -49,7 +49,7 @@ export declare class InMemoryEntity {
      * @summary Clone this entity
      */
     clone(extraContext?: object): this;
-    static validateData(data: AnyObject, clean?: boolean): AnyObject;
+    static validateData(data: AnyObject, clean?: boolean, jsonSchema?: import("json-schema").JSONSchema7 | undefined): AnyObject;
     /**
      * @summary Validate entity contents against schema
      */

diff --git a/dist/js/entity/in_memory.js b/dist/js/entity/in_memory.js
@@ -105,22 +105,22 @@ class InMemoryEntity {
             ...extraContext,
         });
     }
-    static validateData(data, clean = false) {
-        if (!this.jsonSchema) {
+    static validateData(data, clean = false, jsonSchema = this.jsonSchema) {
+        if (!jsonSchema) {
             return data;
         }
         const result = clean
-            ? ajv.validateAndClean(data, this.jsonSchema, {
+            ? ajv.validateAndClean(data, jsonSchema, {
                 coerceTypes: this.allowJsonSchemaTypesCoercing,
             })
-            : ajv.validate(data, this.jsonSchema);
+            : ajv.validate(data, jsonSchema);
         if (!result.isValid) {
             throw new EntityError({
                 code: ValidationErrorCode.IN_MEMORY_ENTITY_DATA_INVALID,
                 details: {
                     error: result === null || result === void 0 ? void 0 : result.errors,
                     json: data,
-                    schema: this.jsonSchema,
+                    schema: jsonSchema,
                 },
             });
         }

diff --git a/src/js/entity/in_memory.ts b/src/js/entity/in_memory.ts
@@ -116,23 +116,23 @@ export class InMemoryEntity {
         });
     }
 
-    static validateData(data: AnyObject, clean = false) {
-        if (!this.jsonSchema) {
+    static validateData(data: AnyObject, clean = false, jsonSchema = this.jsonSchema) {
+        if (!jsonSchema) {
             return data;
         }
         const result = clean
-            ? ajv.validateAndClean(data, this.jsonSchema, {
+            ? ajv.validateAndClean(data, jsonSchema, {
                   coerceTypes: this.allowJsonSchemaTypesCoercing,
               })
-            : ajv.validate(data, this.jsonSchema);
+            : ajv.validate(data, jsonSchema);
 
         if (!result.isValid) {
             throw new EntityError({
                 code: ValidationErrorCode.IN_MEMORY_ENTITY_DATA_INVALID,
                 details: {
                     error: result?.errors,
                     json: data,
-                    schema: this.jsonSchema,
+                    schema: jsonSchema,
                 },
             });
         }