Fix IdSchema and PathSchema types

Author: solimant

packages/utils/src/schema/toIdSchema.ts

@@ -64,7 +64,11 @@ function toIdSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     for (const name in schema.properties) {
       const field = get(schema, [PROPERTIES_KEY, name]);
       const fieldId = idSchema[ID_KEY] + idSeparator + name;
-      idSchema[name] = toIdSchemaInternal<T, S, F>(
+      (idSchema as { [key in keyof IdSchema<T>]: IdSchema<T> })[name as keyof IdSchema<T>] = toIdSchemaInternal<
+        T,
+        S,
+        F
+      >(
         validator,
         isObject(field) ? field : {},
         idPrefix,

packages/utils/src/schema/toPathSchema.ts

@@ -78,52 +78,49 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
     if (Array.isArray(schemaItems)) {
       formData.forEach((element, i: number) => {
         if (schemaItems[i]) {
-          pathSchema[i] = toPathSchemaInternal<T, S, F>(
-            validator,
-            schemaItems[i] as S,
-            `${name}.${i}`,
-            rootSchema,
-            element,
-            _recurseList
-          );
+          (pathSchema as { [key in keyof PathSchema<T>]: PathSchema<T> })[i as keyof PathSchema<T>] =
+            toPathSchemaInternal<T, S, F>(
+              validator,
+              schemaItems[i] as S,
+              `${name}.${i}`,
+              rootSchema,
+              element,
+              _recurseList
+            );
         } else if (schemaAdditionalItems) {
-          pathSchema[i] = toPathSchemaInternal<T, S, F>(
-            validator,
-            schemaAdditionalItems as S,
-            `${name}.${i}`,
-            rootSchema,
-            element,
-            _recurseList
-          );
+          (pathSchema as { [key in keyof PathSchema<T>]: PathSchema<T> })[i as keyof PathSchema<T>] =
+            toPathSchemaInternal<T, S, F>(
+              validator,
+              schemaAdditionalItems as S,
+              `${name}.${i}`,
+              rootSchema,
+              element,
+              _recurseList
+            );
         } else {
           console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
         }
       });
     } else {
       formData.forEach((element, i: number) => {
-        pathSchema[i] = toPathSchemaInternal<T, S, F>(
-          validator,
-          schemaItems as S,
-          `${name}.${i}`,
-          rootSchema,
-          element,
-          _recurseList
-        );
+        (pathSchema as { [key in keyof PathSchema<T>]: PathSchema<T> })[i as keyof PathSchema<T>] =
+          toPathSchemaInternal<T, S, F>(validator, schemaItems as S, `${name}.${i}`, rootSchema, element, _recurseList);
       });
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
       const field = get(schema, [PROPERTIES_KEY, property]);
-      pathSchema[property] = toPathSchemaInternal<T, S, F>(
-        validator,
-        field,
-        `${name}.${property}`,
-        rootSchema,
-        // It's possible that formData is not an object -- this can happen if an
-        // array item has just been added, but not populated with data yet
-        get(formData, [property]),
-        _recurseList
-      );
+      (pathSchema as { [key in keyof PathSchema<T>]: PathSchema<T> })[property as keyof PathSchema<T>] =
+        toPathSchemaInternal<T, S, F>(
+          validator,
+          field,
+          `${name}.${property}`,
+          rootSchema,
+          // It's possible that formData is not an object -- this can happen if an
+          // array item has just been added, but not populated with data yet
+          get(formData, [property]),
+          _recurseList
+        );
     }
   }
   return pathSchema as PathSchema<T>;

packages/utils/src/types.ts

@@ -131,10 +131,12 @@ export type FieldId = {
 };
 
 /** Type describing a recursive structure of `FieldId`s for an object with a non-empty set of keys */
-export type IdSchema<T = any> = FieldId & {
-  /** The set of ids for fields in the recursive object structure */
-  [key in keyof T]?: IdSchema<T[key]>;
-};
+export type IdSchema<T = any> = T extends GenericObjectType
+  ? FieldId & {
+      /** The set of ids for fields in the recursive object structure */
+      [key in keyof T]?: IdSchema<T[key]>;
+    }
+  : FieldId;
 
 /** Type describing a name used for a field in the `PathSchema` */
 export type FieldPath = {
@@ -143,10 +145,12 @@ export type FieldPath = {
 };
 
 /** Type describing a recursive structure of `FieldPath`s for an object with a non-empty set of keys */
-export type PathSchema<T = any> = FieldPath & {
-  /** The set of names for fields in the recursive object structure */
-  [key in keyof T]?: PathSchema<T[key]>;
-};
+export type PathSchema<T = any> = T extends GenericObjectType
+  ? FieldPath & {
+      /** The set of names for fields in the recursive object structure */
+      [key in keyof T]?: PathSchema<T[key]>;
+    }
+  : FieldPath;
 
 /** The type for error produced by RJSF schema validation */
 export type RJSFValidationError = {

packages/validator-ajv6/test/utilsTests/getTestValidator.ts

@@ -22,7 +22,7 @@ export default function getTestValidator<T = any>(options: CustomValidatorOption
     validateFormData(
       formData: T,
       schema: RJSFSchema,
-      customValidate?: CustomValidator<T>,
+      customValidate?: CustomValidator,
       transformErrors?: ErrorTransformer
     ): ValidationData<T> {
       return validator.validateFormData(formData, schema, customValidate, transformErrors);

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

@@ -22,7 +22,7 @@ export default function getTestValidator<T = any>(options: CustomValidatorOption
     validateFormData(
       formData: T | undefined,
       schema: RJSFSchema,
-      customValidate?: CustomValidator<T>,
+      customValidate?: CustomValidator,
       transformErrors?: ErrorTransformer
     ): ValidationData<T> {
       return validator.validateFormData(formData, schema, customValidate, transformErrors);