@overmap-ai/forms 1.0.32-react-flow-david-fixes.1 → 1.0.32-react-flow-david-fixes.3

package/dist/form/index.d.ts

@@ -3,4 +3,4 @@ export * from './constants';
 export * from './fields';
 export * from './renderer';
 export type * from './typings';
-export { initializeFieldValues, validateFields } from './utils';
+export { awaitPromisesFromFieldValues, initializeFieldValues, separateFilesFromFields, separateFilesFromFieldValues, validateFields, } from './utils';

package/dist/form/utils.d.ts

@@ -1,8 +1,17 @@
 import { FormikErrors } from 'formik';
 import { FormBuilderValues } from './builder';
-import { AnyFormElement } from './fields';
+import { AnyFormElement, FieldValue, SerializedField } from './fields';
 import { FieldValues } from './typings';
 export declare const hasKeys: (errors: object) => boolean;
 export declare const validateFields: (fields: AnyFormElement[], values: FieldValues | FormBuilderValues) => FormikErrors<FieldValues | FormBuilderValues> | undefined;
 export declare const initializeFieldValues: (fields: AnyFormElement[], values: FieldValues) => FieldValues;
 export declare const changedFieldValues: (fields: AnyFormElement[], values1: FieldValues, values2: FieldValues) => FieldValues;
+export declare const separateFilesFromFieldValues: (values: FieldValues) => {
+    values: FieldValues;
+    files: Record<string, File[]>;
+};
+export declare const separateFilesFromFields: (fields: SerializedField[]) => Promise<{
+    fields: SerializedField[];
+    images: Record<string, File>;
+}>;
+export declare function awaitPromisesFromFieldValues(values: FieldValues): Promise<Record<string, FieldValue | undefined>>;

package/dist/forms.js

@@ -13,7 +13,7 @@ import { DirectedGraph } from "graphology";
 import { willCreateCycle } from "graphology-dag";
 import { v4 } from "uuid";
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
-import { Copy, Download, X, Plus, Check, ChevronDown, Minus, Circle, Maximize, FileWarning, File, Upload, Trash2, Settings } from "lucide-react";
+import { Copy, Download, X, Plus, Check, ChevronDown, Minus, Circle, Maximize, FileWarning, File as File$1, Upload, Trash2, Settings } from "lucide-react";
 import * as ReactDOM from "react-dom";
 import ReactDOM__default from "react-dom";
 import { saveAs } from "file-saver";
@@ -31947,7 +31947,7 @@ const ImageCard = memo(
                 "bg-transparent": !file
               }),
               children: [
-                error ? /* @__PURE__ */ jsx(FileWarning, { className: "h-4 w-4" }) : file && /* @__PURE__ */ jsx(File, { className: "h-4 w-4", style: { color: "var(--base-a11)" } }),
+                error ? /* @__PURE__ */ jsx(FileWarning, { className: "h-4 w-4" }) : file && /* @__PURE__ */ jsx(File$1, { className: "h-4 w-4", style: { color: "var(--base-a11)" } }),
                 /* @__PURE__ */ jsx(Text, { className: "truncate", size: "sm", children: error ?? (file == null ? void 0 : file.name) }),
                 rightSlot
               ]
@@ -34529,6 +34529,63 @@ const changedFieldValues = (fields, values1, values2) => {
     return acc;
   }, {});
 };
+const isArrayOfFiles = (value) => {
+  return Array.isArray(value) && value[0] instanceof File;
+};
+const separateFilesFromFieldValues = (values) => {
+  const files = {};
+  const newValues = {};
+  for (const key in values) {
+    const value = values[key];
+    if (value instanceof File) {
+      files[key] = [value];
+    } else if (isArrayOfFiles(value)) {
+      files[key] = value;
+    } else if (value !== void 0) {
+      newValues[key] = value;
+    }
+  }
+  return { values: newValues, files };
+};
+const separateFilesFromFields = async (fields) => {
+  const images = {};
+  const newFields = [];
+  for (const section of fields) {
+    if (section.type !== "section") {
+      throw new Error(`Expected ISerializedField type to be a section. Got ${section.type} instead.`);
+    }
+    const { fields: sectionFields } = section;
+    const newSectionFields = [];
+    for (const field of sectionFields) {
+      if (field.image) {
+        if (field.image instanceof Promise) {
+          try {
+            images[field.identifier] = await field.image;
+          } catch (e) {
+            console.error("Failed to get image from promise", e);
+          }
+        } else {
+          images[field.identifier] = field.image;
+        }
+        delete field.image;
+      }
+      newSectionFields.push(field);
+    }
+    newFields.push({ ...section, fields: newSectionFields });
+  }
+  return { fields: newFields, images };
+};
+async function awaitPromisesFromFieldValues(values) {
+  const valuesWithoutFiles = {};
+  for (const [key, value] of Object.entries(values)) {
+    if (Array.isArray(value) && value.every((item) => item instanceof Promise)) {
+      valuesWithoutFiles[key] = await Promise.all(value);
+    } else {
+      valuesWithoutFiles[key] = value;
+    }
+  }
+  return valuesWithoutFiles;
+}
 const FieldSettingsPopover = memo((props) => {
   const { popoverInputs, hasError, ...rest } = props;
   return /* @__PURE__ */ jsxs(Popover.Root, { children: [
@@ -35970,6 +36027,7 @@ export {
   TextInput,
   UploadField,
   UploadInput,
+  awaitPromisesFromFieldValues,
   createCondition,
   createField,
   deserialize,
@@ -35984,6 +36042,8 @@ export {
   maxFileSizeB,
   maxFileSizeKB,
   maxFileSizeMB,
+  separateFilesFromFieldValues,
+  separateFilesFromFields,
   serializeFieldValues,
   useFieldInput,
   useFieldInputs,

package/dist/forms.umd.cjs

@@ -34531,6 +34531,63 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       return acc;
     }, {});
   };
+  const isArrayOfFiles = (value) => {
+    return Array.isArray(value) && value[0] instanceof File;
+  };
+  const separateFilesFromFieldValues = (values) => {
+    const files = {};
+    const newValues = {};
+    for (const key in values) {
+      const value = values[key];
+      if (value instanceof File) {
+        files[key] = [value];
+      } else if (isArrayOfFiles(value)) {
+        files[key] = value;
+      } else if (value !== void 0) {
+        newValues[key] = value;
+      }
+    }
+    return { values: newValues, files };
+  };
+  const separateFilesFromFields = async (fields) => {
+    const images = {};
+    const newFields = [];
+    for (const section of fields) {
+      if (section.type !== "section") {
+        throw new Error(`Expected ISerializedField type to be a section. Got ${section.type} instead.`);
+      }
+      const { fields: sectionFields } = section;
+      const newSectionFields = [];
+      for (const field of sectionFields) {
+        if (field.image) {
+          if (field.image instanceof Promise) {
+            try {
+              images[field.identifier] = await field.image;
+            } catch (e) {
+              console.error("Failed to get image from promise", e);
+            }
+          } else {
+            images[field.identifier] = field.image;
+          }
+          delete field.image;
+        }
+        newSectionFields.push(field);
+      }
+      newFields.push({ ...section, fields: newSectionFields });
+    }
+    return { fields: newFields, images };
+  };
+  async function awaitPromisesFromFieldValues(values) {
+    const valuesWithoutFiles = {};
+    for (const [key, value] of Object.entries(values)) {
+      if (Array.isArray(value) && value.every((item) => item instanceof Promise)) {
+        valuesWithoutFiles[key] = await Promise.all(value);
+      } else {
+        valuesWithoutFiles[key] = value;
+      }
+    }
+    return valuesWithoutFiles;
+  }
   const FieldSettingsPopover = React.memo((props) => {
     const { popoverInputs, hasError, ...rest } = props;
     return /* @__PURE__ */ jsxRuntime.jsxs(blocks.Popover.Root, { children: [
@@ -35971,6 +36028,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   exports2.TextInput = TextInput;
   exports2.UploadField = UploadField;
   exports2.UploadInput = UploadInput;
+  exports2.awaitPromisesFromFieldValues = awaitPromisesFromFieldValues;
   exports2.createCondition = createCondition;
   exports2.createField = createField;
   exports2.deserialize = deserialize;
@@ -35985,6 +36043,8 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   exports2.maxFileSizeB = maxFileSizeB;
   exports2.maxFileSizeKB = maxFileSizeKB;
   exports2.maxFileSizeMB = maxFileSizeMB;
+  exports2.separateFilesFromFieldValues = separateFilesFromFieldValues;
+  exports2.separateFilesFromFields = separateFilesFromFields;
   exports2.serializeFieldValues = serializeFieldValues;
   exports2.useFieldInput = useFieldInput;
   exports2.useFieldInputs = useFieldInputs;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@overmap-ai/forms",
-	"version": "1.0.32-react-flow-david-fixes.1",
+	"version": "1.0.32-react-flow-david-fixes.3",
 	"license": "UNLICENSED",
 	"main": "dist/forms.umd.cjs",
 	"module": "dist/forms.js",