@rjsf/validator-ajv8 6.6.0 → 6.6.2

package/src/createPrecompiledValidator.ts

@@ -1,7 +1,7 @@
-import { FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '@rjsf/utils';
 
 import AJV8PrecompiledValidator from './precompiledValidator';
-import { Localizer, SuppressDuplicateFilteringType, ValidatorFunctions } from './types';
+import type { Localizer, SuppressDuplicateFilteringType, ValidatorFunctions } from './types';
 
 /** Creates and returns a `ValidatorType` interface that is implemented with a precompiled validator. If a `localizer`
  * is provided, it is used to translate the messages generated by the underlying AJV validation.

package/src/customizeValidator.ts

@@ -1,6 +1,6 @@
-import { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
+import type { FormContextType, RJSFSchema, StrictRJSFSchema } from '@rjsf/utils';
 
-import { CustomValidatorOptionsType, Localizer } from './types';
+import type { CustomValidatorOptionsType, Localizer } from './types';
 import AJV8Validator from './validator';
 
 /** Creates and returns a customized implementation of the `ValidatorType` with the given customization `options` if

package/src/index.ts

@@ -2,6 +2,6 @@ import createPrecompiledValidator from './createPrecompiledValidator';
 import customizeValidator from './customizeValidator';
 
 export { customizeValidator, createPrecompiledValidator };
-export * from './types';
+export type * from './types';
 
 export default customizeValidator();

package/src/precompiledValidator.ts

@@ -1,23 +1,20 @@
-import {
+import type {
   CustomValidator,
-  deepEquals,
   ErrorTransformer,
   FormContextType,
-  hashForSchema,
-  ID_KEY,
-  JUNK_OPTION_ID,
-  retrieveSchema,
   RJSFSchema,
   StrictRJSFSchema,
   UiSchema,
   ValidationData,
   ValidatorType,
 } from '@rjsf/utils';
-import { ErrorObject } from 'ajv';
+import { deepEquals, hashForSchema, ID_KEY, JUNK_OPTION_ID, retrieveSchema } from '@rjsf/utils';
+import type { ErrorObject } from 'ajv';
 import get from 'lodash/get';
 
-import processRawValidationErrors, { RawValidationErrorsType } from './processRawValidationErrors';
-import { CompiledValidateFunction, Localizer, SuppressDuplicateFilteringType, ValidatorFunctions } from './types';
+import type { RawValidationErrorsType } from './processRawValidationErrors';
+import processRawValidationErrors from './processRawValidationErrors';
+import type { CompiledValidateFunction, Localizer, SuppressDuplicateFilteringType, ValidatorFunctions } from './types';
 
 /** `ValidatorType` implementation that uses an AJV 8 precompiled validator as created by the
  * `compileSchemaValidators()` function provided by the `@rjsf/validator-ajv8` library.

package/src/processRawValidationErrors.ts

@@ -1,31 +1,33 @@
-import {
-  ANY_OF_KEY,
-  createErrorHandler,
+import type {
   CustomValidator,
   ErrorTransformer,
   FormContextType,
+  RJSFSchema,
+  RJSFValidationError,
+  StrictRJSFSchema,
+  UiSchema,
+  ValidatorType,
+} from '@rjsf/utils';
+import {
+  ANY_OF_KEY,
+  createErrorHandler,
   getDefaultFormState,
   getUiOptions,
   ONE_OF_KEY,
   PROPERTIES_KEY,
-  RJSFSchema,
-  RJSFValidationError,
-  StrictRJSFSchema,
   toErrorSchema,
-  UiSchema,
   unwrapErrorHandler,
   validationDataMerge,
-  ValidatorType,
 } from '@rjsf/utils';
-import { ErrorObject } from 'ajv';
+import type { ErrorObject } from 'ajv';
 import get from 'lodash/get';
 
-import { SuppressDuplicateFilteringType } from './types';
+import type { SuppressDuplicateFilteringType } from './types';
 
-export type RawValidationErrorsType<Result = any> = {
+export interface RawValidationErrorsType<Result = any> {
   errors?: Result[];
   validationError?: Error;
-};
+}
 
 /** Filters duplicate errors from `anyOf`/`oneOf` schema paths according to the `suppressDuplicateFiltering` flag.
  *
@@ -43,7 +45,7 @@ export function filterDuplicateErrors(
   if (suppressDuplicateFiltering === 'all') {
     return errorList;
   }
-  return errorList.reduce((acc: RJSFValidationError[], err: RJSFValidationError) => {
+  return errorList.reduce<RJSFValidationError[]>((acc: RJSFValidationError[], err: RJSFValidationError) => {
     const { message, schemaPath } = err;
     // Compute the index only when filtering for that keyword is not suppressed.
     // 'all' is already handled above; within the reduce, only 'none', 'anyOf', and 'oneOf' are possible.
@@ -63,7 +65,7 @@ export function filterDuplicateErrors(
       acc.push(err);
     }
     return acc;
-  }, [] as RJSFValidationError[]);
+  }, []);
 }
 
 /** Transforming the error output from ajv to format used by @rjsf/utils.
@@ -97,7 +99,7 @@ export function transformRJSFValidationErrors<
     if (rawPropertyNames.length > 0) {
       rawPropertyNames.forEach((currentProperty) => {
         const path = property ? `${property}.${currentProperty}` : currentProperty;
-        let uiSchemaTitle = getUiOptions(get(uiSchema, `${path.replace(/^\./, '')}`)).title;
+        let uiSchemaTitle = getUiOptions(get(uiSchema, path.replace(/^\./, ''))).title;
         if (uiSchemaTitle === undefined) {
           // To retrieve a title from UI schema, construct a path to UI schema from `schemaPath` and `currentProperty`.
           // For example, when `#/properties/A/properties/B/required` and `C` are given, they are converted into `['A', 'B', 'C']`.
@@ -122,7 +124,7 @@ export function transformRJSFValidationErrors<
 
       stack = message;
     } else {
-      const uiSchemaTitle = getUiOptions<T, S, F>(get(uiSchema, `${property.replace(/^\./, '')}`)).title;
+      const uiSchemaTitle = getUiOptions<T, S, F>(get(uiSchema, property.replace(/^\./, ''))).title;
 
       if (uiSchemaTitle) {
         stack = `'${uiSchemaTitle}' ${message}`.trim();
@@ -188,7 +190,7 @@ export default function processRawValidationErrors<
   let errors = transformRJSFValidationErrors<T, S, F>(rawErrors.errors, uiSchema, suppressDuplicateFiltering);
 
   if (invalidSchemaError) {
-    errors = [...errors, { stack: invalidSchemaError!.message }];
+    errors = [...errors, { stack: invalidSchemaError.message }];
   }
   if (typeof transformErrors === 'function') {
     errors = transformErrors(errors, uiSchema);
@@ -200,7 +202,7 @@ export default function processRawValidationErrors<
     errorSchema = {
       ...errorSchema,
       $schema: {
-        __errors: [invalidSchemaError!.message],
+        __errors: [invalidSchemaError.message],
       },
     };
   }

package/src/types.ts

@@ -1,5 +1,6 @@
-import Ajv, { Options, ErrorObject } from 'ajv';
-import { FormatsPluginOptions } from 'ajv-formats';
+import type { Options, ErrorObject } from 'ajv';
+import type Ajv from 'ajv';
+import type { FormatsPluginOptions } from 'ajv-formats';
 
 /** The type describing the value for the `suppressDuplicateFiltering` option */
 export type SuppressDuplicateFilteringType = 'anyOf' | 'oneOf' | 'all' | 'none';
@@ -8,11 +9,9 @@ export type SuppressDuplicateFilteringType = 'anyOf' | 'oneOf' | 'all' | 'none';
  */
 export interface CustomValidatorOptionsType {
   /** The list of additional meta schemas that the validator can access */
-  additionalMetaSchemas?: ReadonlyArray<object>;
+  additionalMetaSchemas?: readonly object[];
   /** The set of additional custom formats that the validator will support */
-  customFormats?: {
-    [k: string]: string | RegExp | ((data: string) => boolean);
-  };
+  customFormats?: Record<string, string | RegExp | ((data: string) => boolean)>;
   /** The set of config overrides that will be passed to the AJV validator constructor on top of the defaults */
   ajvOptionsOverrides?: Options;
   /** The `ajv-format` options to use when adding formats to `ajv`; pass `false` to disable it */
@@ -49,4 +48,4 @@ export interface CompiledValidateFunction {
 
 /** The definition of precompiled validator functions
  */
-export type ValidatorFunctions = { [key: string]: CompiledValidateFunction };
+export type ValidatorFunctions = Record<string, CompiledValidateFunction>;

package/src/validator.ts

@@ -1,23 +1,21 @@
-import {
+import type {
   CustomValidator,
-  deepEquals,
   ErrorTransformer,
   FormContextType,
-  ID_KEY,
   RJSFSchema,
-  ROOT_SCHEMA_PREFIX,
   StrictRJSFSchema,
   UiSchema,
   ValidationData,
   ValidatorType,
-  withIdRefPrefix,
-  hashForSchema,
 } from '@rjsf/utils';
-import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
+import { deepEquals, ID_KEY, ROOT_SCHEMA_PREFIX, withIdRefPrefix, hashForSchema } from '@rjsf/utils';
+import type { ErrorObject, ValidateFunction } from 'ajv';
+import type Ajv from 'ajv';
 
 import createAjvInstance from './createAjvInstance';
-import processRawValidationErrors, { RawValidationErrorsType } from './processRawValidationErrors';
-import { CustomValidatorOptionsType, Localizer, SuppressDuplicateFilteringType } from './types';
+import type { RawValidationErrorsType } from './processRawValidationErrors';
+import processRawValidationErrors from './processRawValidationErrors';
+import type { CustomValidatorOptionsType, Localizer, SuppressDuplicateFilteringType } from './types';
 
 /** `ValidatorType` implementation that uses the AJV 8 validation mechanism.
  */
@@ -121,12 +119,14 @@ export default class AJV8Validator<
         (compiledValidator.errors ?? []).forEach((error) => {
           ['missingProperty', 'property'].forEach((key) => {
             if (error.params?.[key]) {
+              // oxlint-disable-next-line no-param-reassign
               error.params[key] = `'${error.params[key]}'`;
             }
           });
           if (error.params?.deps) {
             // As `error.params.deps` is the comma+space separated list of missing dependencies, enclose each dependency separately.
             // For example, `A, B` is converted into `'A', 'B'`.
+            // oxlint-disable-next-line no-param-reassign
             error.params.deps = error.params.deps
               .split(', ')
               .map((v: string) => `'${v}'`)
@@ -138,11 +138,13 @@ export default class AJV8Validator<
         (compiledValidator.errors ?? []).forEach((error) => {
           ['missingProperty', 'property'].forEach((key) => {
             if (error.params?.[key]) {
+              // oxlint-disable-next-line no-param-reassign
               error.params[key] = error.params[key].slice(1, -1);
             }
           });
           if (error.params?.deps) {
             // Remove surrounding quotes from each missing dependency. For example, `'A', 'B'` is reverted to `A, B`.
+            // oxlint-disable-next-line no-param-reassign
             error.params.deps = error.params.deps
               .split(', ')
               .map((v: string) => v.slice(1, -1))
@@ -244,8 +246,9 @@ export default class AJV8Validator<
           this.ajv.compile(schemaWithIdRefPrefix);
       }
       const result = compiledValidator(formData);
-      return result as boolean;
+      return result;
     } catch (e) {
+      // oxlint-disable-next-line no-console
       console.warn('Error encountered compiling schema:', e);
       return false;
     }