@rjsf/utils 6.0.0-beta.14 → 6.0.0-beta.16

package/lib/types.d.ts

@@ -212,8 +212,6 @@ export type ErrorListProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F e
     errorSchema: ErrorSchema<T>;
     /** An array of the errors */
     errors: RJSFValidationError[];
-    /** The `formContext` object that was passed to `Form` */
-    formContext?: F;
 };
 /** The properties that are passed to an `FieldErrorTemplate` implementation */
 export type FieldErrorProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
@@ -363,7 +361,7 @@ export interface Registry<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
     /** The component update strategy used by the Form and its fields for performance optimization */
     experimental_componentUpdateStrategy?: 'customDeep' | 'shallow' | 'always';
 }
-/** The properties that are passed to a Field implementation */
+/** The properties that are passed to a `Field` implementation */
 export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, RJSFBaseProps<T, S, F>, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus' | 'onChange'>> {
     /** The tree of unique ids for every child field */
     idSchema: IdSchema<T>;
@@ -379,8 +377,6 @@ export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     onBlur: (id: string, value: any) => void;
     /** The input focus event handler; call it with the field id and value */
     onFocus: (id: string, value: any) => void;
-    /** The `formContext` object that you passed to `Form` */
-    formContext?: F;
     /** A boolean value stating if the field should autofocus */
     autofocus?: boolean;
     /** A boolean value stating if the field is disabled */
@@ -409,7 +405,7 @@ export type Field<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends Fo
     /** The optional TEST_IDS block that some fields contain, exported for testing purposes */
     TEST_IDS?: TestIdShape;
 };
-/** The properties that are passed to a FieldTemplate implementation */
+/** The properties that are passed to a `FieldTemplate` implementation */
 export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** The id of the field in the hierarchy. You can use it to render a label targeting the wrapped widget */
     id: string;
@@ -451,8 +447,6 @@ export type FieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema,
      * you don't want to clutter the UI
      */
     displayLabel?: boolean;
-    /** The `formContext` object that was passed to `Form` */
-    formContext?: F;
     /** The formData for this field */
     formData?: T;
     /** The value change event handler; Can be called with a new value to change the value for this field */
@@ -559,7 +553,7 @@ export type ArrayFieldItemTemplateType<T = any, S extends StrictRJSFSchema = RJS
  * @deprecated - Use `ArrayFieldItemTemplateType` instead
  */
 export type ArrayFieldTemplateItemType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = ArrayFieldItemTemplateType<T, S, F>;
-/** The properties that are passed to an ArrayFieldTemplate implementation */
+/** The properties that are passed to an `ArrayFieldTemplate` implementation */
 export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
     /** A boolean value stating whether new elements can be added to the array */
     canAdd?: boolean;
@@ -581,8 +575,6 @@ export type ArrayFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSc
     hideError?: boolean;
     /** A string value containing the title for the array */
     title: string;
-    /** The `formContext` object that was passed to Form */
-    formContext?: F;
     /** The formData for this array */
     formData?: T;
     /** The tree of errors for this field and its children */
@@ -627,8 +619,6 @@ export type ObjectFieldTemplateProps<T = any, S extends StrictRJSFSchema = RJSFS
     errorSchema?: ErrorSchema<T>;
     /** The form data for the object */
     formData?: T;
-    /** The `formContext` object that was passed to Form */
-    formContext?: F;
 };
 /** The properties that are passed to a WrapIfAdditionalTemplate implementation */
 export type WrapIfAdditionalTemplateProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> = RJSFBaseProps<T, S, F> & {
@@ -642,7 +632,7 @@ export interface MultiSchemaFieldTemplateProps<T = any, S extends StrictRJSFSche
     /** The rendered SchemaField for the selected schema option */
     optionSchemaField: ReactNode;
 }
-/** The properties that are passed to a Widget implementation */
+/** The properties that are passed to a `Widget` implementation */
 export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any> extends GenericObjectType, RJSFBaseProps<T, S, F>, Pick<HTMLAttributes<HTMLElement>, Exclude<keyof HTMLAttributes<HTMLElement>, 'onBlur' | 'onFocus' | 'onChange'>> {
     /** The generated id for this widget, used to provide unique `name`s and `id`s for the HTML field elements rendered by
      * widgets
@@ -673,8 +663,6 @@ export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
         /** The enum options list for a type that supports them */
         enumOptions?: EnumOptionsType<S>[];
     };
-    /** The `formContext` object that you passed to `Form` */
-    formContext?: F;
     /** The input blur event handler; call it with the widget id and value */
     onBlur: (id: string, value: any) => void;
     /** The value change event handler; call it with the new value every time it changes */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/utils",
-  "version": "6.0.0-beta.14",
+  "version": "6.0.0-beta.16",
   "main": "dist/index.js",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -9,27 +9,27 @@
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "import": "./lib/index.js"
     },
     "./lib": {
       "types": "./lib/index.d.ts",
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "import": "./lib/index.js"
     },
     "./lib/*.js": {
       "types": "./lib/*.d.ts",
-      "require": "./dist/*.js",
+      "require": "./dist/*.cjs",
       "import": "./lib/*.js"
     },
     "./dist": {
       "types": "./lib/index.d.ts",
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "import": "./lib/index.js"
     },
-    "./dist/*.js": {
+    "./dist/*.cjs": {
       "types": "./lib/*.d.ts",
-      "require": "./dist/*.js",
+      "require": "./dist/*.cjs",
       "import": "./lib/*.js"
     }
   },
@@ -45,7 +45,7 @@
   "scripts": {
     "compileReplacer": "tsc -p tsconfig.replacer.json && move-file lodashReplacer.js lodashReplacer.cjs",
     "build:ts": "npm run compileReplacer && rimraf ./lib && tsc -b tsconfig.build.json && tsc-alias -p tsconfig.build.json",
-    "build:cjs": "esbuild ./src/index.ts --bundle --outfile=dist/index.js --sourcemap --packages=external --format=cjs",
+    "build:cjs": "esbuild ./src/index.ts --bundle --outfile=dist/index.cjs --sourcemap --packages=external --format=cjs",
     "build:esm": "esbuild ./src/index.ts --bundle --outfile=dist/utils.esm.js --sourcemap --packages=external --format=esm",
     "build:umd": "rollup dist/utils.esm.js --format=umd --file=dist/utils.umd.js --name=@rjsf/utils",
     "build": "npm run build:ts && npm run build:cjs && npm run build:esm && npm run build:umd",
@@ -65,12 +65,11 @@
     "react": ">=18"
   },
   "dependencies": {
-    "fast-uri": "^3.0.6",
+    "fast-uri": "^3.1.0",
     "json-schema-merge-allof": "^0.8.1",
     "jsonpointer": "^5.0.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
-    "nanoid": "^5.1.5",
     "react-is": "^18.3.1"
   },
   "devDependencies": {

package/src/getTestIds.ts

@@ -1,5 +1,5 @@
-import { nanoid } from 'nanoid';
 import get from 'lodash/get';
+import uniqueId from 'lodash/uniqueId';
 
 import { TestIdShape } from './types';
 
@@ -31,7 +31,7 @@ export default function getTestIds(): TestIdShape {
     {
       get(_obj, prop) {
         if (!ids.has(prop)) {
-          ids.set(prop, nanoid());
+          ids.set(prop, uniqueId('test-id-'));
         }
         return ids.get(prop);
       },

package/src/getWidget.tsx

@@ -110,7 +110,7 @@ export default function getWidget<T = any, S extends StrictRJSFSchema = RJSFSche
   }
 
   if (typeof widget !== 'string') {
-    throw new Error(`Unsupported widget definition: ${typeof widget}`);
+    throw new Error(`Unsupported widget definition: ${typeof widget} in schema: ${JSON.stringify(schema)}`);
   }
 
   if (widget in registeredWidgets) {
@@ -120,7 +120,7 @@ export default function getWidget<T = any, S extends StrictRJSFSchema = RJSFSche
 
   if (typeof type === 'string') {
     if (!(type in widgetMap)) {
-      throw new Error(`No widget for type '${type}'`);
+      throw new Error(`No widget for type '${type}' in schema: ${JSON.stringify(schema)}`);
     }
 
     if (widget in widgetMap[type]) {
@@ -129,5 +129,5 @@ export default function getWidget<T = any, S extends StrictRJSFSchema = RJSFSche
     }
   }
 
-  throw new Error(`No widget '${widget}' for type '${type}'`);
+  throw new Error(`No widget '${widget}' for type '${type}' in schema: ${JSON.stringify(schema)}`);
 }

package/src/mergeDefaultsWithFormData.ts

@@ -102,7 +102,7 @@ export default function mergeDefaultsWithFormData<T = any>(
    */
   if (
     (defaultSupercedesUndefined &&
-      ((!isNil(defaults) && isNil(formData)) || (typeof formData === 'number' && isNaN(formData)))) ||
+      ((!(defaults === undefined) && isNil(formData)) || (typeof formData === 'number' && isNaN(formData)))) ||
     (overrideFormDataWithDefaults && !isNil(formData))
   ) {
     return defaults;

package/src/schema/getDefaultFormState.ts

@@ -650,7 +650,7 @@ export function getArrayDefaults<T = any, S extends StrictRJSFSchema = RJSFSchem
   const fillerDefault = fillerSchema.default;
 
   // Calculate filler entries for remaining items (minItems - existing raw data/defaults)
-  const fillerEntries: T[] = new Array(schema.minItems - defaultsLength).fill(
+  const fillerEntries: T[] = Array.from({ length: schema.minItems - defaultsLength }, () =>
     computeDefaults<any, S, F>(validator, fillerSchema, {
       parentDefaults: fillerDefault,
       rootSchema,

package/src/types.ts

@@ -263,8 +263,6 @@ export type ErrorListProps<
   errorSchema: ErrorSchema<T>;
   /** An array of the errors */
   errors: RJSFValidationError[];
-  /** The `formContext` object that was passed to `Form` */
-  formContext?: F;
 };
 
 /** The properties that are passed to an `FieldErrorTemplate` implementation */
@@ -429,7 +427,7 @@ export interface Registry<T = any, S extends StrictRJSFSchema = RJSFSchema, F ex
   experimental_componentUpdateStrategy?: 'customDeep' | 'shallow' | 'always';
 }
 
-/** The properties that are passed to a Field implementation */
+/** The properties that are passed to a `Field` implementation */
 export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>
   extends GenericObjectType,
     RJSFBaseProps<T, S, F>,
@@ -448,8 +446,6 @@ export interface FieldProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
   onBlur: (id: string, value: any) => void;
   /** The input focus event handler; call it with the field id and value */
   onFocus: (id: string, value: any) => void;
-  /** The `formContext` object that you passed to `Form` */
-  formContext?: F;
   /** A boolean value stating if the field should autofocus */
   autofocus?: boolean;
   /** A boolean value stating if the field is disabled */
@@ -482,7 +478,7 @@ export type Field<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends Fo
   TEST_IDS?: TestIdShape;
 };
 
-/** The properties that are passed to a FieldTemplate implementation */
+/** The properties that are passed to a `FieldTemplate` implementation */
 export type FieldTemplateProps<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
@@ -528,8 +524,6 @@ export type FieldTemplateProps<
    * you don't want to clutter the UI
    */
   displayLabel?: boolean;
-  /** The `formContext` object that was passed to `Form` */
-  formContext?: F;
   /** The formData for this field */
   formData?: T;
   /** The value change event handler; Can be called with a new value to change the value for this field */
@@ -677,7 +671,7 @@ export type ArrayFieldTemplateItemType<
   F extends FormContextType = any,
 > = ArrayFieldItemTemplateType<T, S, F>;
 
-/** The properties that are passed to an ArrayFieldTemplate implementation */
+/** The properties that are passed to an `ArrayFieldTemplate` implementation */
 export type ArrayFieldTemplateProps<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
@@ -703,8 +697,6 @@ export type ArrayFieldTemplateProps<
   hideError?: boolean;
   /** A string value containing the title for the array */
   title: string;
-  /** The `formContext` object that was passed to Form */
-  formContext?: F;
   /** The formData for this array */
   formData?: T;
   /** The tree of errors for this field and its children */
@@ -755,8 +747,6 @@ export type ObjectFieldTemplateProps<
   errorSchema?: ErrorSchema<T>;
   /** The form data for the object */
   formData?: T;
-  /** The `formContext` object that was passed to Form */
-  formContext?: F;
 };
 
 /** The properties that are passed to a WrapIfAdditionalTemplate implementation */
@@ -797,7 +787,7 @@ export interface MultiSchemaFieldTemplateProps<
   optionSchemaField: ReactNode;
 }
 
-/** The properties that are passed to a Widget implementation */
+/** The properties that are passed to a `Widget` implementation */
 export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>
   extends GenericObjectType,
     RJSFBaseProps<T, S, F>,
@@ -831,8 +821,6 @@ export interface WidgetProps<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     /** The enum options list for a type that supports them */
     enumOptions?: EnumOptionsType<S>[];
   };
-  /** The `formContext` object that you passed to `Form` */
-  formContext?: F;
   /** The input blur event handler; call it with the widget id and value */
   onBlur: (id: string, value: any) => void;
   /** The value change event handler; call it with the new value every time it changes */