Separate ajv instances used for evaluating the form data vs subschemas

Author: nickgros

packages/core/src/validate.js

@@ -1,6 +1,7 @@
 import toPath from "lodash/toPath";
 import Ajv from "ajv";
-let ajv = createAjvInstance();
+let formValidationAjv = createAjvInstance();
+let schemaValidationAjv = createAjvInstance();
 import { deepEquals, getDefaultFormState } from "./utils";
 
 let formerCustomFormats = null;
@@ -182,7 +183,7 @@ export default function validateFormData(
   const newFormats = !deepEquals(formerCustomFormats, customFormats);
 
   if (newMetaSchemas || newFormats) {
-    ajv = createAjvInstance();
+    formValidationAjv = createAjvInstance();
   }
 
   // add more schemas to validate against
@@ -191,30 +192,30 @@ export default function validateFormData(
     newMetaSchemas &&
     Array.isArray(additionalMetaSchemas)
   ) {
-    ajv.addMetaSchema(additionalMetaSchemas);
+    formValidationAjv.addMetaSchema(additionalMetaSchemas);
     formerMetaSchema = additionalMetaSchemas;
   }
 
   // add more custom formats to validate against
   if (customFormats && newFormats && isObject(customFormats)) {
     Object.keys(customFormats).forEach(formatName => {
-      ajv.addFormat(formatName, customFormats[formatName]);
+      formValidationAjv.addFormat(formatName, customFormats[formatName]);
     });
 
     formerCustomFormats = customFormats;
   }
 
   let validationError = null;
   try {
-    ajv.validate(schema, formData);
+    formValidationAjv.validate(schema, formData);
   } catch (err) {
     validationError = err;
   }
 
-  let errors = transformAjvErrors(ajv.errors);
+  let errors = transformAjvErrors(formValidationAjv.errors);
   // Clear errors to prevent persistent errors, see #1104
 
-  ajv.errors = null;
+  formValidationAjv.errors = null;
 
   const noProperMetaSchema =
     validationError &&
@@ -307,19 +308,19 @@ export function isValid(schema, data, rootSchema) {
     // that lives in the rootSchema but not in the schema in question.
     let rootSchemaAdded;
     if (rootSchema.$id) {
-      rootSchemaAdded = !!ajv.getSchema(rootSchema.$id);
+      rootSchemaAdded = !!schemaValidationAjv.getSchema(rootSchema.$id);
     } else {
-      rootSchemaAdded = !!ajv.getSchema(ROOT_SCHEMA_PREFIX);
+      rootSchemaAdded = !!schemaValidationAjv.getSchema(ROOT_SCHEMA_PREFIX);
     }
 
     if (!rootSchemaAdded) {
       if (rootSchema.$id) {
-        ajv.addSchema(rootSchema);
+        schemaValidationAjv.addSchema(rootSchema);
       } else {
-        ajv.addSchema(rootSchema, ROOT_SCHEMA_PREFIX);
+        schemaValidationAjv.addSchema(rootSchema, ROOT_SCHEMA_PREFIX);
       }
     }
-    return ajv.validate(withIdRefPrefix(schema), data);
+    return schemaValidationAjv.validate(withIdRefPrefix(schema), data);
   } catch (e) {
     console.warn("Encountered error while validating schema", e);
     return false;