- Responded to self-review feedback

Author: heath-freenome

packages/validator-ajv8/src/compileSchemaValidators.ts

@@ -26,7 +26,12 @@ export default function compileSchemaValidators<S extends StrictRJSFSchema = RJS
   const schemas = Object.values(schemaMaps);
 
   const { additionalMetaSchemas, customFormats, ajvOptionsOverrides = {}, ajvFormatOptions, AjvClass } = options;
-  const compileOptions = { ...ajvOptionsOverrides, code: { source: true, lines: true }, schemas };
+  // Allow users to turn off the `lines: true` feature in their own overrides, but NOT the `source: true`
+  const compileOptions = {
+    ...ajvOptionsOverrides,
+    code: { lines: true, ...ajvOptionsOverrides.code, source: true },
+    schemas,
+  };
   const ajv = createAjvInstance(additionalMetaSchemas, customFormats, compileOptions, ajvFormatOptions, AjvClass);
 
   const moduleCode = standaloneCode(ajv);

packages/validator-ajv8/src/precompiledValidator.ts

@@ -100,7 +100,6 @@ export default class AJV8PrecompiledValidator<
    * @throws - Error when the schema provided does not match the base schema of the precompiled validator
    */
   rawValidation<Result = any>(schema: S, formData?: T): RawValidationErrorsType<Result> {
-    const validationError: Error | undefined = undefined;
     if (!isEqual(schema, this.rootSchema)) {
       throw new Error(
         'The schema associated with the precompiled schema differs from the schema provided for validation'
@@ -116,10 +115,7 @@ export default class AJV8PrecompiledValidator<
     // Clear errors to prevent persistent errors, see #1104
     this.mainValidator.errors = null;
 
-    return {
-      errors: errors as unknown as Result[],
-      validationError,
-    };
+    return { errors: errors as unknown as Result[] };
   }
 
   /** This function processes the `formData` with an optional user contributed `customValidate` function, which receives

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

@@ -59,7 +59,10 @@ describe('compileSchemaValidators()', () => {
     beforeAll(() => {
       schemas = Object.values(schemaParser(superSchema as RJSFSchema));
       expectedCode = readFileSync('./test/harness/superSchemaOptions.js').toString();
-      compileSchemaValidators(superSchema as RJSFSchema, OUTPUT_FILE, CUSTOM_OPTIONS);
+      compileSchemaValidators(superSchema as RJSFSchema, OUTPUT_FILE, {
+        ...CUSTOM_OPTIONS,
+        ajvOptionsOverrides: { ...CUSTOM_OPTIONS.ajvOptionsOverrides, code: { lines: false } },
+      });
     });
     afterAll(() => {
       consoleLogSpy.mockClear();
@@ -82,7 +85,7 @@ describe('compileSchemaValidators()', () => {
         ajvFormatOptions,
         AjvClass,
       } = CUSTOM_OPTIONS;
-      const expectedCompileOpts = { ...ajvOptionsOverrides, code: { source: true, lines: true }, schemas };
+      const expectedCompileOpts = { ...ajvOptionsOverrides, code: { source: true, lines: false }, schemas };
       expect(createAjvInstance).toHaveBeenCalledWith(
         additionalMetaSchemas,
         customFormats,

packages/validator-ajv8/test/harness/compileTestSchema.js

@@ -16,10 +16,7 @@ const superSchema = require('./superSchema.json');
 const options = {
   additionalMetaSchemas: [require('ajv/lib/refs/json-schema-draft-06.json')],
   customFormats: { 'phone-us': /\(?\d{3}\)?[\s-]?\d{3}[\s-]?\d{4}$/, 'area-code': /\d{3}/ },
-  ajvOptionsOverrides: {
-    $data: true,
-      verbose: true,
-  },
+  ajvOptionsOverrides: { $data: true, verbose: true, code: { lines: false } },
   ajvFormatOptions: {
     mode: 'fast',
   },