@rjsf/utils 5.16.1 → 5.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/utils",
-  "version": "5.16.1",
+  "version": "5.17.1",
   "main": "dist/index.js",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -43,17 +43,17 @@
     "react-is": "^18.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.23.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-    "@babel/preset-env": "^7.23.7",
+    "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/json-schema": "^7.0.15",
     "@types/json-schema-merge-allof": "^0.6.5",
     "@types/lodash": "^4.14.202",
-    "@types/react": "^17.0.74",
+    "@types/react": "^17.0.75",
     "@types/react-is": "^17.0.7",
     "@types/react-test-renderer": "^17.0.9",
     "babel-jest": "^29.7.0",
@@ -86,5 +86,5 @@
     "url": "git+https://github.com/rjsf-team/react-jsonschema-form.git"
   },
   "license": "Apache-2.0",
-  "gitHead": "0fc3cb0922247968c5553e6caa1a9ee2d882c6cf"
+  "gitHead": "4d13c51c861fa0d21ec6e40881a21ba16c72d8bd"
 }

package/src/dataURItoBlob.ts

@@ -4,39 +4,42 @@
  * @param dataURI - The `DataUrl` potentially containing name and raw data to be converted to a Blob
  * @returns - an object containing a Blob and its name, extracted from the URI
  */
-export default function dataURItoBlob(dataURI: string) {
-  // Split metadata from data
-  const splitted: string[] = dataURI.split(',');
-  // Split params
-  const params: string[] = splitted[0].split(';');
-  // Get mime-type from params
-  const type: string = params[0].replace('data:', '');
-  // Filter the name property from params
-  const properties = params.filter((param) => {
-    return param.split('=')[0] === 'name';
-  });
-  // Look for the name and use unknown if no name property.
-  let name: string;
-  if (properties.length !== 1) {
-    name = 'unknown';
-  } else {
-    // Because we filtered out the other property,
-    // we only have the name case here, which we decode to make it human-readable
-    name = decodeURI(properties[0].split('=')[1]);
+export default function dataURItoBlob(dataURILike: string) {
+  // check if is dataURI
+  if (dataURILike.indexOf('data:') === -1) {
+    throw new Error('File is invalid: URI must be a dataURI');
   }
+  const dataURI = dataURILike.slice(5);
+  // split the dataURI into media and base64, with the base64 signature
+  const splitted = dataURI.split(';base64,');
+  // if the base64 signature is not present, the latter part will become empty
+  if (splitted.length !== 2) {
+    throw new Error('File is invalid: dataURI must be base64');
+  }
+  // extract the mime type, media parameters including the name, and the base64 string
+  const [media, base64] = splitted;
+  const [mime, ...mediaparams] = media.split(';');
+  const type = mime || '';
+
+  // extract the name from the parameters
+  const name = decodeURI(
+    // parse the parameters into key-value pairs, find a key, and extract a value
+    // if no key is found, then the name is unknown
+    mediaparams.map((param) => param.split('=')).find(([key]) => key === 'name')?.[1] || 'unknown'
+  );
 
   // Built the Uint8Array Blob parameter from the base64 string.
   try {
-    const binary = atob(splitted[1]);
-    const array = [];
+    const binary = atob(base64);
+    const array = new Array(binary.length);
     for (let i = 0; i < binary.length; i++) {
-      array.push(binary.charCodeAt(i));
+      array[i] = binary.charCodeAt(i);
     }
     // Create the blob object
     const blob = new window.Blob([new Uint8Array(array)], { type });
 
     return { blob, name };
   } catch (error) {
-    return { blob: { size: 0, type: (error as Error).message }, name: dataURI };
+    throw new Error('File is invalid: ' + (error as Error).message);
   }
 }

package/src/enumOptionsValueForIndex.ts

@@ -17,7 +17,12 @@ export default function enumOptionsValueForIndex<S extends StrictRJSFSchema = RJ
   emptyValue?: EnumOptionsType<S>['value']
 ): EnumOptionsType<S>['value'] | EnumOptionsType<S>['value'][] | undefined {
   if (Array.isArray(valueIndex)) {
-    return valueIndex.map((index) => enumOptionsValueForIndex(index, allEnumOptions)).filter((val) => val);
+    return (
+      valueIndex
+        .map((index) => enumOptionsValueForIndex(index, allEnumOptions))
+        // Since the recursive call returns `emptyValue` when we get a bad option, only filter those out
+        .filter((val) => val !== emptyValue)
+    );
   }
   // So Number(null) and Number('') both return 0, so use emptyValue for those two values
   const index = valueIndex === '' || valueIndex === null ? -1 : Number(valueIndex);

package/src/types.ts

@@ -601,6 +601,8 @@ export type ArrayFieldTemplateProps<
   formContext?: F;
   /** The formData for this array */
   formData?: T;
+  /** The tree of errors for this field and its children */
+  errorSchema?: ErrorSchema<T>;
   /** An array of strings listing all generated error messages from encountered errors for this widget */
   rawErrors?: string[];
   /** The `registry` object */