@rjsf/utils 5.24.10 → 6.0.0-beta.1

package/src/schema/toIdSchema.ts

@@ -1,7 +1,6 @@
 import get from 'lodash/get';
 
 import { ALL_OF_KEY, DEPENDENCIES_KEY, ID_KEY, ITEMS_KEY, PROPERTIES_KEY, REF_KEY } from '../constants';
-import isObject from '../isObject';
 import {
   Experimental_CustomMergeAllOf,
   FormContextType,
@@ -38,58 +37,60 @@ function toIdSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   rootSchema?: S,
   formData?: T,
   _recurseList: S[] = [],
-  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>
+  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>,
 ): IdSchema<T> {
-  if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-    const _schema = retrieveSchema<T, S, F>(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-    const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
-    if (sameSchemaIndex === -1) {
+  const $id = id || idPrefix;
+  const idSchema: IdSchema<T> = { $id } as IdSchema<T>;
+  if (typeof schema === 'object') {
+    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
+      const _schema = retrieveSchema<T, S, F>(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
+      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
+      if (sameSchemaIndex === -1) {
+        return toIdSchemaInternal<T, S, F>(
+          validator,
+          _schema,
+          idPrefix,
+          idSeparator,
+          id,
+          rootSchema,
+          formData,
+          _recurseList.concat(_schema),
+          experimental_customMergeAllOf,
+        );
+      }
+    }
+    if (ITEMS_KEY in schema && !get(schema, [ITEMS_KEY, REF_KEY])) {
       return toIdSchemaInternal<T, S, F>(
         validator,
-        _schema,
+        get(schema, ITEMS_KEY) as S,
         idPrefix,
         idSeparator,
         id,
         rootSchema,
         formData,
-        _recurseList.concat(_schema),
-        experimental_customMergeAllOf
-      );
-    }
-  }
-  if (ITEMS_KEY in schema && !get(schema, [ITEMS_KEY, REF_KEY])) {
-    return toIdSchemaInternal<T, S, F>(
-      validator,
-      get(schema, ITEMS_KEY) as S,
-      idPrefix,
-      idSeparator,
-      id,
-      rootSchema,
-      formData,
-      _recurseList,
-      experimental_customMergeAllOf
-    );
-  }
-  const $id = id || idPrefix;
-  const idSchema: IdSchema<T> = { $id } as IdSchema<T>;
-  if (getSchemaType<S>(schema) === 'object' && PROPERTIES_KEY in schema) {
-    for (const name in schema.properties) {
-      const field = get(schema, [PROPERTIES_KEY, name]);
-      const fieldId = idSchema[ID_KEY] + idSeparator + name;
-      (idSchema as IdSchema<GenericObjectType>)[name] = toIdSchemaInternal<T, S, F>(
-        validator,
-        isObject(field) ? field : {},
-        idPrefix,
-        idSeparator,
-        fieldId,
-        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, [name]),
         _recurseList,
-        experimental_customMergeAllOf
+        experimental_customMergeAllOf,
       );
     }
+    if (getSchemaType<S>(schema) === 'object' && PROPERTIES_KEY in schema) {
+      for (const name in schema.properties) {
+        const field: S = schema[PROPERTIES_KEY][name] as S;
+        const fieldId = idSchema[ID_KEY] + idSeparator + name;
+        (idSchema as IdSchema<GenericObjectType>)[name] = toIdSchemaInternal<T, S, F>(
+          validator,
+          field,
+          idPrefix,
+          idSeparator,
+          fieldId,
+          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, [name]),
+          _recurseList,
+          experimental_customMergeAllOf,
+        );
+      }
+    }
   }
   return idSchema;
 }
@@ -114,7 +115,7 @@ export default function toIdSchema<T = any, S extends StrictRJSFSchema = RJSFSch
   formData?: T,
   idPrefix = 'root',
   idSeparator = '_',
-  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>
+  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>,
 ): IdSchema<T> {
   return toIdSchemaInternal<T, S, F>(
     validator,
@@ -125,6 +126,6 @@ export default function toIdSchema<T = any, S extends StrictRJSFSchema = RJSFSch
     rootSchema,
     formData,
     undefined,
-    experimental_customMergeAllOf
+    experimental_customMergeAllOf,
   );
 }

package/src/schema/toPathSchema.ts

@@ -46,7 +46,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
   rootSchema?: S,
   formData?: T,
   _recurseList: S[] = [],
-  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>
+  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>,
 ): PathSchema<T> {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
     const _schema = retrieveSchema<T, S, F>(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
@@ -59,7 +59,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
         rootSchema,
         formData,
         _recurseList.concat(_schema),
-        experimental_customMergeAllOf
+        experimental_customMergeAllOf,
       );
     }
   }
@@ -78,7 +78,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
       xxxOf,
       0,
       discriminator,
-      experimental_customMergeAllOf
+      experimental_customMergeAllOf,
     );
     const _schema: S = xxxOf![index] as S;
     pathSchema = {
@@ -90,7 +90,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
         rootSchema,
         formData,
         _recurseList,
-        experimental_customMergeAllOf
+        experimental_customMergeAllOf,
       ),
     };
   }
@@ -112,7 +112,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
             rootSchema,
             element,
             _recurseList,
-            experimental_customMergeAllOf
+            experimental_customMergeAllOf,
           );
         } else if (schemaAdditionalItems) {
           (pathSchema as PathSchema<T[]>)[i] = toPathSchemaInternal<T, S, F>(
@@ -122,7 +122,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
             rootSchema,
             element,
             _recurseList,
-            experimental_customMergeAllOf
+            experimental_customMergeAllOf,
           );
         } else {
           console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
@@ -137,13 +137,13 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
           rootSchema,
           element,
           _recurseList,
-          experimental_customMergeAllOf
+          experimental_customMergeAllOf,
         );
       });
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get(schema, [PROPERTIES_KEY, property]);
+      const field: S = get(schema, [PROPERTIES_KEY, property], {}) as S;
       (pathSchema as PathSchema<GenericObjectType>)[property] = toPathSchemaInternal<T, S, F>(
         validator,
         field,
@@ -153,7 +153,7 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
         // array item has just been added, but not populated with data yet
         get(formData, [property]),
         _recurseList,
-        experimental_customMergeAllOf
+        experimental_customMergeAllOf,
       );
     }
   }
@@ -176,7 +176,7 @@ export default function toPathSchema<T = any, S extends StrictRJSFSchema = RJSFS
   name = '',
   rootSchema?: S,
   formData?: T,
-  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>
+  experimental_customMergeAllOf?: Experimental_CustomMergeAllOf<S>,
 ): PathSchema<T> {
   return toPathSchemaInternal(validator, schema, name, rootSchema, formData, undefined, experimental_customMergeAllOf);
 }

package/src/toErrorList.ts

@@ -11,7 +11,7 @@ import { ErrorSchema, GenericObjectType, RJSFValidationError } from './types';
  */
 export default function toErrorList<T = any>(
   errorSchema?: ErrorSchema<T>,
-  fieldPath: string[] = []
+  fieldPath: string[] = [],
 ): RJSFValidationError[] {
   if (!errorSchema) {
     return [];
@@ -26,7 +26,7 @@ export default function toErrorList<T = any>(
           message,
           stack: `${property} ${message}`,
         };
-      })
+      }),
     );
   }
   return Object.keys(errorSchema).reduce((acc, key) => {