- Responded to /code-review skill

Author: heath-freenome

CHANGELOG.md

@@ -31,14 +31,18 @@ should change the heading of the (upcoming) version to include a major version b
 ## @rjsf/core
 
 - Support locale-specific decimal separators in `NumberField` (e.g. Polish/German comma decimal separators) without breaking non-text widgets like radio buttons and select dropdowns, fixing [#5148](https://github.com/rjsf-team/react-jsonschema-form/pull/5148)
-- Fixed `ObjectField` to preserve the insertion order of additional and pattern properties when keys are renamed to integers, fixing [#4631](https://github.com/rjsf-team/react-jsonschema-form/issues/4631) ([#5156](https://github.com/rjsf-team/react-jsonschema-form/pull/5156))
+- Fixed `ObjectField` to preserve the insertion order of additional and pattern properties when keys are renamed to integers, fixing [#4631](https://github.com/rjsf-team/react-jsonschema-form/issues/4631)
 
 ## @rjsf/utils
 
 - Added `getDecimalSeparator()` utility to detect locale-specific decimal separators and updated `asNumber()` to parse locale-specific decimal strings, partially fixing [#5148](https://github.com/rjsf-team/react-jsonschema-form/pull/5148)
 - Fixed a regression where `getDefaultFormState()` with `experimental_defaultFormStateBehavior.arrayMinItems.populate = 'never'` padded arrays with `null` entries up to `minItems`, fixing [#5163](https://github.com/rjsf-team/react-jsonschema-form/issues/5163)
   - Optional arrays with no data are now omitted (unchanged) while required arrays with no data default to `[]`, letting the validator report the `minItems` violation instead of surfacing invalid `null` items
 
+## @rjsf/validator-ajv8
+
+- Updated `AJV8Validator` to remove broken schemas from AJV cache after compilation error, fixing [#3933](https://github.com/rjsf-team/react-jsonschema-form/issues/3933)
+
 ## @rjsf/validator-ata
 
 - Updated the `ata-validator` dependency to `^1.1.0`, which fixes a stack overflow in browser environments for schemas its JS engine cannot compile and shrinks the install footprint via per-platform optional packages ([#5162](https://github.com/rjsf-team/react-jsonschema-form/pull/5162))

packages/validator-ajv8/src/validator.ts

@@ -114,7 +114,11 @@ export default class AJV8Validator<
       // the entry so every call with an invalid schema consistently produces a
       // compilation error. For schemas with $id the cache key is the id string;
       // for anonymous schemas AJV uses the object reference as the key.
-      this.ajv.removeSchema(schema[ID_KEY] !== undefined ? schema[ID_KEY] : (schema as object));
+      // Guard with compiledValidator === undefined so that a runtime error thrown
+      // by compiledValidator(formData) does not evict a correctly-compiled schema.
+      if (compiledValidator === undefined) {
+        this.ajv.removeSchema(schema[ID_KEY] !== undefined ? schema[ID_KEY] : (schema as object));
+      }
     }
 
     let errors;
@@ -235,9 +239,10 @@ export default class AJV8Validator<
    * @param rootSchema - The root schema used to provide $ref resolutions
    */
   isValid(schema: S, formData: T | undefined, rootSchema: S) {
-    // schemaId is declared outside the try so the catch block can remove the
-    // broken schema from AJV's registry even when an error occurs during compilation.
+    // schemaId and compiled are declared outside the try so the catch block can
+    // conditionally remove the broken schema from AJV's registry.
     let schemaId: string | undefined;
+    let compiled = false;
     try {
       this.handleSchemaUpdate(rootSchema);
       // then rewrite the schema ref's to point to the rootSchema
@@ -255,15 +260,17 @@ export default class AJV8Validator<
           this.ajv.addSchema(schemaWithIdRefPrefix, schemaId).getSchema(schemaId) ||
           this.ajv.compile(schemaWithIdRefPrefix);
       }
+      compiled = true;
       const result = compiledValidator(formData);
       return result;
     } catch (e) {
       // oxlint-disable-next-line no-console
       console.warn('Error encountered compiling schema:', e);
       // Remove the broken schema from AJV's registry so a subsequent rawValidation
       // or isValid call does not silently reuse a cached entry that bypassed
-      // meta-schema validation.
-      if (schemaId !== undefined) {
+      // meta-schema validation. Guard with !compiled so that a runtime error thrown
+      // by compiledValidator(formData) does not evict a correctly-compiled schema.
+      if (!compiled && schemaId !== undefined) {
         this.ajv.removeSchema(schemaId);
       }
       return false;

packages/validator-ajv8/test/validator.test.ts

@@ -7,6 +7,7 @@ import type {
   ValidatorType,
 } from '@rjsf/utils';
 import { ErrorSchemaBuilder } from '@rjsf/utils';
+import type Ajv from 'ajv';
 import localize from 'ajv-i18n';
 import Ajv2019 from 'ajv/dist/2019';
 import Ajv2020 from 'ajv/dist/2020';
@@ -258,6 +259,64 @@ describe('AJV8Validator', () => {
         expect(result1).toBe(false);
         expect(result2).toBe(false);
       });
+
+      it('rawValidation does not evict a correctly-compiled schema when data evaluation throws', () => {
+        // A keyword whose validate() throws during data evaluation (not compilation).
+        // The schema is valid and compiles fine; the throw happens when the compiled
+        // validator runs against formData.  The fix guards removeSchema with
+        // compiledValidator === undefined so only compile-phase failures evict.
+        const v = new AJV8Validator({
+          extenderFn: (ajv: Ajv) => {
+            ajv.addKeyword({
+              keyword: 'throwOnValidate',
+              schemaType: 'boolean',
+              validate: () => {
+                throw new Error('keyword threw during data evaluation');
+              },
+            });
+            return ajv;
+          },
+        });
+        const schema = { $id: 'test-exec-throw-raw', type: 'string', throwOnValidate: true } as unknown as RJSFSchema;
+
+        // First call — compiledValidator(formData) throws, so compilationError is set.
+        const result = v.rawValidation(schema, 'hello');
+        expect(result.validationError).toBeInstanceOf(Error);
+
+        // Schema must still be cached — the execution throw must not have evicted it.
+        expect(v.ajv.getSchema('test-exec-throw-raw')).toBeDefined();
+      });
+
+      it('isValid does not evict a correctly-compiled schema when data evaluation throws', () => {
+        const v = new AJV8Validator({
+          extenderFn: (ajv: Ajv) => {
+            ajv.addKeyword({
+              keyword: 'throwOnValidate',
+              schemaType: 'boolean',
+              validate: () => {
+                throw new Error('keyword threw during data evaluation');
+              },
+            });
+            return ajv;
+          },
+        });
+        const schema = {
+          $id: 'test-exec-throw-isvalid',
+          type: 'string',
+          throwOnValidate: true,
+        } as unknown as RJSFSchema;
+        const rootSchema: RJSFSchema = {};
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(noop);
+
+        // Execution throw — isValid should return false but NOT evict the schema.
+        const result = v.isValid(schema, 'hello', rootSchema);
+        expect(result).toBe(false);
+
+        // $id is preserved by withIdRefPrefix, so schemaId === schema.$id.
+        expect(v.ajv.getSchema('test-exec-throw-isvalid')).toBeDefined();
+
+        warnSpy.mockRestore();
+      });
     });
     describe('validator.validateFormData()', () => {
       describe('No custom validate function, single value', () => {