@overmap-ai/forms 1.0.32-react-flow-david-fixes.30 → 1.0.32-react-flow-david-fixes.32

package/dist/form/conditions/UploadFieldCondition/UploadFieldCondition.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { UploadField } from '../../fields';
+import { UploadField, UUIDPromise } from '../../fields';
 import { BaseCondition, ConditionOptions, ConditionRenderProps } from '../BaseCondition';
 import { SerializedUploadCondition, UploadConditionModifiers } from './typings';
 export interface UploadFieldConditionOptions extends ConditionOptions<UploadField, boolean, UploadConditionModifiers> {
@@ -8,8 +8,8 @@ export declare class UploadFieldCondition extends BaseCondition<UploadField, boo
     readonly defaultConditionValue: undefined;
     readonly defaultConditionModifier = "equals";
     readonly modifiers: {
-        equals: import('../..').FieldConditionModifierConfig<(File | Promise<File>)[], boolean, boolean, File[], boolean, boolean>;
-        notEquals: import('../..').FieldConditionModifierConfig<(File | Promise<File>)[], boolean, boolean, File[], boolean, boolean>;
+        equals: import('../..').FieldConditionModifierConfig<(File | UUIDPromise<File>)[], boolean, boolean, File[], boolean, boolean>;
+        notEquals: import('../..').FieldConditionModifierConfig<(File | UUIDPromise<File>)[], boolean, boolean, File[], boolean, boolean>;
     };
     constructor(options: UploadFieldConditionOptions);
     static deserialize(serializedCondition: SerializedUploadCondition, field: UploadField): UploadFieldCondition;

package/dist/form/fields/UploadField/UUIDPromise.d.ts

@@ -0,0 +1,7 @@
+export declare class UUIDPromise<T> extends Promise<T> {
+    readonly uuid: string;
+    constructor(uuid: string, executor: (...args: Parameters<ConstructorParameters<typeof Promise<T>>[0]>) => void);
+    static from<T>(uuid: string, promise: Promise<T>): UUIDPromise<T>;
+    then<TResult1 = T, TResult2 = never>(...args: Parameters<Promise<T>["then"]>): UUIDPromise<TResult1 | TResult2>;
+    catch<TResult2 = never>(...args: Parameters<Promise<T>["catch"]>): UUIDPromise<T | TResult2>;
+}

package/dist/form/fields/UploadField/UploadField.d.ts

@@ -4,12 +4,13 @@ import { FieldRenderProps } from '../BaseFormElement';
 import { MultiSelectField } from '../MultiSelectField';
 import { NumberField } from '../NumberField';
 import { SerializedUploadField } from './typings';
-export interface UploadFieldOptions extends FieldOptions<(Promise<File> | File)[]> {
+import { UUIDPromise } from './UUIDPromise';
+export interface UploadFieldOptions extends FieldOptions<(UUIDPromise<File> | File)[]> {
     extensions?: string[];
     maximum_size?: number | string;
     maximum_files?: number | string;
 }
-export declare class UploadField extends BaseField<"upload", (Promise<File> | File)[], never[], UploadField> {
+export declare class UploadField extends BaseField<"upload", (UUIDPromise<File> | File)[], never[], UploadField> {
     readonly type = "upload";
     static readonly fieldTypeName = "Upload";
     static readonly fieldTypeDescription = "Allows a file to be uploaded.";
@@ -25,17 +26,17 @@ export declare class UploadField extends BaseField<"upload", (Promise<File> | Fi
         field: MultiSelectField;
         showDirectly: boolean;
     })[];
-    getFieldValidators(): FieldValidator<(Promise<File> | File)[]>[];
+    getFieldValidators(): FieldValidator<(UUIDPromise<File> | File)[]>[];
     serialize(): SerializedUploadField;
     getOptions(): UploadFieldOptions;
     duplicate(identifier: string): UploadField;
     setOptions(options: Partial<UploadFieldOptions>): void;
     static deserialize(data: SerializedUploadField): UploadField;
-    serializeValue(_value: (Promise<File> | File)[]): never[];
-    deserializeValue(_value: never[]): (Promise<File> | File)[];
+    serializeValue(_value: (UUIDPromise<File> | File)[]): never[];
+    deserializeValue(_value: never[]): (UUIDPromise<File> | File)[];
     render(props: FieldRenderProps): ReactNode;
     isSerializedValueValid(value: unknown): value is never[];
-    isValueValid(value: unknown): value is (Promise<File> | File)[];
-    areValuesEqual(value1: (Promise<File> | File)[], value2: (Promise<File> | File)[]): boolean;
-    blankValue(): (Promise<File> | File)[];
+    isValueValid(value: unknown): value is (UUIDPromise<File> | File)[];
+    areValuesEqual(value1: (UUIDPromise<File> | File)[], value2: (UUIDPromise<File> | File)[]): boolean;
+    blankValue(): (UUIDPromise<File> | File)[];
 }

package/dist/form/fields/UploadField/index.d.ts

@@ -1,3 +1,4 @@
 export * from './typings';
 export * from './UploadField';
 export * from './UploadInput';
+export * from './UUIDPromise';

package/dist/form/fields/UploadField/utils.d.ts

@@ -1,3 +1,4 @@
+import { UUIDPromise } from './UUIDPromise';
 export declare const convertBytesToLargestUnit: (bytes: number) => string;
 export declare function areFilesEqual(file1: File, file2: File): boolean;
-export declare function seprateFilesFromPromises(filesOrPromises: (Promise<File> | File)[]): [File[], Promise<File>[]];
+export declare function separateFilesFromPromises(filesOrPromises: (UUIDPromise<File> | File)[]): [File[], UUIDPromise<File>[]];

package/dist/form/fields/_utils.d.ts

@@ -1,2 +1 @@
 export declare function isStringArray(value: unknown): value is string[];
-export declare function isFilePromiseArray(value: unknown): value is (Promise<File> | File)[];

package/dist/form/fields/index.d.ts

@@ -1,5 +1,4 @@
-export { isFilePromiseArray } from './_utils';
-export { isStringArray } from './_utils';
+export * from './_utils';
 export * from './BaseField';
 export * from './BaseFormElement';
 export * from './BaseOptionsField';

package/dist/forms.js

@@ -42,10 +42,6 @@ function isStringArray(value) {
   if (!Array.isArray(value)) return false;
   return value.every((item) => typeof item === "string");
 }
-function isFilePromiseArray(value) {
-  if (!Array.isArray(value)) return false;
-  return value.every((item) => item instanceof Promise || item instanceof File);
-}
 class Observable {
   constructor() {
     __publicField(this, "observers", /* @__PURE__ */ new Set());
@@ -32257,6 +32253,24 @@ const ImageCard = memo(
     );
   })
 );
+class UUIDPromise extends Promise {
+  constructor(uuid, executor) {
+    super(executor);
+    __publicField(this, "uuid");
+    this.uuid = uuid;
+  }
+  static from(uuid, promise) {
+    return new UUIDPromise(uuid, (resolve, reject) => {
+      promise.then(resolve).catch(reject);
+    });
+  }
+  then(...args) {
+    return UUIDPromise.from(this.uuid, super.then(...args));
+  }
+  catch(...args) {
+    return UUIDPromise.from(this.uuid, super.catch(...args));
+  }
+}
 const convertBytesToLargestUnit = (bytes) => {
   const units = ["byte", "kilobyte", "megabyte"];
   let sizeInUnit = bytes;
@@ -32276,11 +32290,11 @@ const convertBytesToLargestUnit = (bytes) => {
 function areFilesEqual(file1, file2) {
   return file1.name === file2.name && file1.size === file2.size && file1.type === file2.type;
 }
-function seprateFilesFromPromises(filesOrPromises) {
+function separateFilesFromPromises(filesOrPromises) {
   const files = [];
   const promises = [];
   for (const fileOrPromise of filesOrPromises) {
-    if (fileOrPromise instanceof Promise) {
+    if (fileOrPromise instanceof UUIDPromise) {
       promises.push(fileOrPromise);
     } else {
       files.push(fileOrPromise);
@@ -32428,7 +32442,7 @@ const DisplayFile = memo((props) => {
     return { url: url2, name: name2, size };
   }, [resolvedFile]);
   useEffect(() => {
-    if (file instanceof Promise) {
+    if (file instanceof UUIDPromise) {
       file.then(setResolvedFile).catch(console.error);
     } else {
       setResolvedFile(file);
@@ -32625,15 +32639,16 @@ const _UploadField = class _UploadField extends BaseField {
     return Array.isArray(value) && value.length === 0;
   }
   isValueValid(value) {
-    return isFilePromiseArray(value);
+    if (!Array.isArray(value)) return false;
+    return value.every((item) => item instanceof UUIDPromise || item instanceof File);
   }
   areValuesEqual(value1, value2) {
-    const [files1, promises1] = seprateFilesFromPromises(value1);
-    const [files2, promises2] = seprateFilesFromPromises(value2);
+    const [files1, promises1] = separateFilesFromPromises(value1);
+    const [files2, promises2] = separateFilesFromPromises(value2);
     if (!files1.every((file1) => files2.some((file2) => areFilesEqual(file1, file2)))) return false;
     if (!files2.every((file2) => files1.some((file1) => areFilesEqual(file1, file2)))) return false;
-    if (!promises1.every((promise1) => promises2.some((promise2) => promise1 === promise2))) return false;
-    if (!promises2.every((promise2) => promises1.some((promise1) => promise1 === promise2))) return false;
+    if (!promises1.every((promise1) => promises2.some((promise2) => promise1.uuid === promise2.uuid))) return false;
+    if (!promises2.every((promise2) => promises1.some((promise1) => promise1.uuid === promise2.uuid))) return false;
     return true;
   }
   blankValue() {
@@ -36573,6 +36588,7 @@ export {
   TextFieldCondition,
   TextFieldConditionCell,
   TextInput,
+  UUIDPromise,
   UploadField,
   UploadFieldCondition,
   UploadFieldConditionCell,
@@ -36596,7 +36612,6 @@ export {
   flattenFields,
   getFieldsMapping,
   initializeFieldValues,
-  isFilePromiseArray,
   isStringArray,
   maxFileSizeB,
   maxFileSizeKB,

package/dist/forms.umd.cjs

@@ -44,10 +44,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     if (!Array.isArray(value)) return false;
     return value.every((item) => typeof item === "string");
   }
-  function isFilePromiseArray(value) {
-    if (!Array.isArray(value)) return false;
-    return value.every((item) => item instanceof Promise || item instanceof File);
-  }
   class Observable {
     constructor() {
       __publicField(this, "observers", /* @__PURE__ */ new Set());
@@ -32259,6 +32255,24 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       );
     })
   );
+  class UUIDPromise extends Promise {
+    constructor(uuid2, executor) {
+      super(executor);
+      __publicField(this, "uuid");
+      this.uuid = uuid2;
+    }
+    static from(uuid2, promise) {
+      return new UUIDPromise(uuid2, (resolve, reject) => {
+        promise.then(resolve).catch(reject);
+      });
+    }
+    then(...args) {
+      return UUIDPromise.from(this.uuid, super.then(...args));
+    }
+    catch(...args) {
+      return UUIDPromise.from(this.uuid, super.catch(...args));
+    }
+  }
   const convertBytesToLargestUnit = (bytes) => {
     const units = ["byte", "kilobyte", "megabyte"];
     let sizeInUnit = bytes;
@@ -32278,11 +32292,11 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   function areFilesEqual(file1, file2) {
     return file1.name === file2.name && file1.size === file2.size && file1.type === file2.type;
   }
-  function seprateFilesFromPromises(filesOrPromises) {
+  function separateFilesFromPromises(filesOrPromises) {
     const files = [];
     const promises = [];
     for (const fileOrPromise of filesOrPromises) {
-      if (fileOrPromise instanceof Promise) {
+      if (fileOrPromise instanceof UUIDPromise) {
         promises.push(fileOrPromise);
       } else {
         files.push(fileOrPromise);
@@ -32430,7 +32444,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       return { url: url2, name: name2, size };
     }, [resolvedFile]);
     React.useEffect(() => {
-      if (file instanceof Promise) {
+      if (file instanceof UUIDPromise) {
         file.then(setResolvedFile).catch(console.error);
       } else {
         setResolvedFile(file);
@@ -32627,15 +32641,16 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       return Array.isArray(value) && value.length === 0;
     }
     isValueValid(value) {
-      return isFilePromiseArray(value);
+      if (!Array.isArray(value)) return false;
+      return value.every((item) => item instanceof UUIDPromise || item instanceof File);
     }
     areValuesEqual(value1, value2) {
-      const [files1, promises1] = seprateFilesFromPromises(value1);
-      const [files2, promises2] = seprateFilesFromPromises(value2);
+      const [files1, promises1] = separateFilesFromPromises(value1);
+      const [files2, promises2] = separateFilesFromPromises(value2);
       if (!files1.every((file1) => files2.some((file2) => areFilesEqual(file1, file2)))) return false;
       if (!files2.every((file2) => files1.some((file1) => areFilesEqual(file1, file2)))) return false;
-      if (!promises1.every((promise1) => promises2.some((promise2) => promise1 === promise2))) return false;
-      if (!promises2.every((promise2) => promises1.some((promise1) => promise1 === promise2))) return false;
+      if (!promises1.every((promise1) => promises2.some((promise2) => promise1.uuid === promise2.uuid))) return false;
+      if (!promises2.every((promise2) => promises1.some((promise1) => promise1.uuid === promise2.uuid))) return false;
       return true;
     }
     blankValue() {
@@ -36574,6 +36589,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   exports2.TextFieldCondition = TextFieldCondition;
   exports2.TextFieldConditionCell = TextFieldConditionCell;
   exports2.TextInput = TextInput;
+  exports2.UUIDPromise = UUIDPromise;
   exports2.UploadField = UploadField;
   exports2.UploadFieldCondition = UploadFieldCondition;
   exports2.UploadFieldConditionCell = UploadFieldConditionCell;
@@ -36597,7 +36613,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   exports2.flattenFields = flattenFields;
   exports2.getFieldsMapping = getFieldsMapping;
   exports2.initializeFieldValues = initializeFieldValues;
-  exports2.isFilePromiseArray = isFilePromiseArray;
   exports2.isStringArray = isStringArray;
   exports2.maxFileSizeB = maxFileSizeB;
   exports2.maxFileSizeKB = maxFileSizeKB;

package/package.json

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