@overmap-ai/forms 1.0.32-react-flow-david-fixes.4 → 1.0.32-react-flow-david-fixes.6

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

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

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

@@ -1,9 +1,9 @@
 import { ReactNode } from 'react';
 import { FormBuilderValues } from '../../builder';
-import { Condition, ConditionManager } from '../../conditions/typings';
+import { Condition, ConditionManager } from '../../conditions';
 import { FieldValues } from '../../typings';
 import { BaseFormElement, FormElementOptions } from '../BaseFormElement';
-import { ComponentProps, Field, FieldsManagerInterface } from '../typings';
+import { ComponentProps, Field, FieldsManager } from '../typings';
 import { FieldSectionConditions, SerializedFieldSection } from './typings';
 export interface FieldSectionOptions extends FormElementOptions {
     label?: string | null;
@@ -11,7 +11,7 @@ export interface FieldSectionOptions extends FormElementOptions {
     conditions?: FieldSectionConditions;
     fields: Field[];
 }
-export declare class FieldSection extends BaseFormElement<"section", FieldSection> implements ConditionManager<Condition>, FieldsManagerInterface<Field> {
+export declare class FieldSection extends BaseFormElement<"section", FieldSection> implements ConditionManager<Condition>, FieldsManager<Field> {
     static readonly fieldTypeName = "Section";
     static readonly fieldTypeDescription = "Sections can be useful for grouping fields together. They can also be conditionally shown or hidden.";
     readonly type = "section";

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

@@ -4,12 +4,12 @@ import { MultiSelectField } from '../MultiSelectField';
 import { NumberField } from '../NumberField';
 import { ComponentProps, FieldValidator } from '../typings';
 import { SerializedUploadField } from './typings';
-export interface UploadFieldOptions extends FieldOptions<File[]> {
+export interface UploadFieldOptions extends FieldOptions<(Promise<File> | File)[]> {
     extensions?: string[];
     maximum_size?: number | string;
     maximum_files?: number | string;
 }
-export declare class UploadField extends BaseField<"upload", File[], never[], UploadField> {
+export declare class UploadField extends BaseField<"upload", (Promise<File> | File)[], never[], UploadField> {
     readonly type = "upload";
     static readonly fieldTypeName = "Upload";
     static readonly fieldTypeDescription = "Allows a file to be uploaded.";
@@ -18,8 +18,8 @@ export declare class UploadField extends BaseField<"upload", File[], never[], Up
     maxFiles: number;
     readonly onlyValidateAfterTouched = false;
     constructor(options: UploadFieldOptions);
-    isBlank(value: File[] | undefined): boolean;
-    isEqual(value1: File[] | undefined, value2: File[] | undefined): boolean;
+    isBlank(value: (Promise<File> | File)[] | undefined): boolean;
+    isEqual(value1: (Promise<File> | File)[] | undefined, value2: (Promise<File> | File)[] | undefined): boolean;
     static getFieldCreationSchema(parentPath?: string): ({
         field: NumberField;
         showDirectly: boolean;
@@ -27,13 +27,13 @@ export declare class UploadField extends BaseField<"upload", File[], never[], Up
         field: MultiSelectField;
         showDirectly: boolean;
     })[];
-    getFieldValidators(): FieldValidator<File[]>[];
+    getFieldValidators(): FieldValidator<(Promise<File> | File)[]>[];
     serialize(): SerializedUploadField;
     getOptions(): UploadFieldOptions;
     duplicate(identifier: string): UploadField;
     setOptions(options: Partial<UploadFieldOptions>): void;
     static deserialize(data: SerializedUploadField): UploadField;
-    serializeValue(_value: File[]): never[];
-    deserializeValue(_value: never[]): File[];
+    serializeValue(_value: (Promise<File> | File)[]): never[];
+    deserializeValue(_value: never[]): (Promise<File> | File)[];
     render(props: ComponentProps): ReactNode;
 }

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

@@ -32,7 +32,7 @@ export type SerializedFieldValue = SerializedValueOfField<BooleanField> | Serial
 export type Field = BooleanField | CheckboxListField | DateField | MultiSelectField | MultiStringField | NumberField | RadioField | ScanField | SelectField | StringField | TextField | UploadField;
 export type SerializedField = SerializedTextField | SerializedBooleanField | SerializedNumberField | SerializedDateField | SerializedStringField | SerializedSelectField | SerializedFieldSection | SerializedMultiStringField | SerializedMultiSelectField | SerializedUploadField | SerializedScanField | SerializedRadioField | SerializedCheckboxListField;
 export type SerializedOnlyField = Exclude<SerializedField, SerializedFieldSection>;
-export interface FieldsManagerInterface<TField extends AnyFormElement> {
+export interface FieldsManager<TField extends AnyFormElement> {
     readonly fields: TField[];
     getFields(): TField[];
     addField(field: TField): void;

package/dist/form/schema/FieldSchema.d.ts

@@ -1,6 +1,6 @@
-import { FieldSection, FieldsManagerInterface, SerializedFieldSection } from '../fields';
+import { FieldSection, FieldsManager, SerializedFieldSection } from '../fields';
 import { Observable } from '../observable/Observable';
-export declare class FieldSchema extends Observable<FieldSchema> implements FieldsManagerInterface<FieldSection> {
+export declare class FieldSchema extends Observable<FieldSchema> implements FieldsManager<FieldSection> {
     fields: FieldSection[];
     constructor(fields: FieldSection[]);
     serialize(): SerializedFieldSection[];

package/dist/form/typings.d.ts

@@ -1,5 +1,5 @@
 import { Field, FieldSection, FieldValue, SerializedFieldValue } from './fields';
-export type FieldValues = Record<string, FieldValue | Promise<File>[] | undefined>;
+export type FieldValues = Record<string, FieldValue | undefined>;
 export type SerializedFieldValues = Record<string, SerializedFieldValue>;
 export type Severity = "danger" | "warning" | "info" | "success";
 export interface SchemaMeta {

package/dist/forms.js

@@ -32180,6 +32180,18 @@ DisplayFile.displayName = "DisplayFile";
 function areFilesEqual(file1, file2) {
   return file1.name === file2.name && file1.size === file2.size && file1.type === file2.type;
 }
+function seprateFilesFromPromises(filesOrPromises) {
+  const files = [];
+  const promises = [];
+  for (const fileOrPromise of filesOrPromises) {
+    if (fileOrPromise instanceof Promise) {
+      promises.push(fileOrPromise);
+    } else {
+      files.push(fileOrPromise);
+    }
+  }
+  return [files, promises];
+}
 const _UploadField = class _UploadField extends BaseField {
   constructor(options) {
     const { extensions, maximum_files, maximum_size, ...base } = options;
@@ -32199,8 +32211,12 @@ const _UploadField = class _UploadField extends BaseField {
   isEqual(value1, value2) {
     if (value1 === void 0 && value2 === void 0) return true;
     if (value1 === void 0 || value2 === void 0) return false;
-    if (!value1.every((file1) => value2.some((file2) => areFilesEqual(file1, file2)))) return false;
-    if (!value2.every((file2) => value1.some((file1) => areFilesEqual(file1, file2)))) return false;
+    const [files1, promises1] = seprateFilesFromPromises(value1);
+    const [files2, promises2] = seprateFilesFromPromises(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;
     return true;
   }
   static getFieldCreationSchema(parentPath = "") {
@@ -32220,7 +32236,6 @@ const _UploadField = class _UploadField extends BaseField {
       },
       {
         field: new NumberField({
-          // TODO: Default value
           label: "What is the maximum size of each file?",
           description: `Maximum file size in megabytes (between 1MB–${maxFileSizeMB}MB).`,
           required: false,
@@ -32270,7 +32285,7 @@ const _UploadField = class _UploadField extends BaseField {
     const maxFileSizeInB = maxFileSizeInMB * 1e3 * 1e3;
     const maxFiles = this.maxFiles || 1;
     validators.push((value) => {
-      if (value && value.some((file) => file.size > maxFileSizeInB)) {
+      if (value && value.some((file) => file instanceof File && file.size > maxFileSizeInB)) {
         return `Files must be at most ${maxFileSizeInMB}MB.`;
       }
     });
@@ -32358,6 +32373,60 @@ const fieldIcons = {
 const maxFileSizeMB = 50;
 const maxFileSizeKB = maxFileSizeMB * 1e3;
 const maxFileSizeB = maxFileSizeKB * 1e3;
+class BaseCondition extends Observable {
+  constructor(config) {
+    const { id, field, conditionValue, conditionModifier } = config;
+    super();
+    __publicField(this, "id");
+    __publicField(this, "conditionValue");
+    __publicField(this, "conditionModifier");
+    __publicField(this, "field");
+    __publicField(this, "getConditionValue", () => {
+      return this.conditionValue;
+    });
+    __publicField(this, "setConditionValue", (conditionValue) => {
+      const modifier = this.modifiers[this.conditionModifier];
+      if (conditionValue !== void 0 && !modifier.isConditionValueValid(conditionValue)) return;
+      this.conditionValue = conditionValue;
+      this.notify(this);
+    });
+    __publicField(this, "getConditionModifier", () => {
+      return this.conditionModifier;
+    });
+    __publicField(this, "setConditionModifier", (modifier) => {
+      const foundModifier = this.modifiers[modifier];
+      const filterValue = this.getConditionValue();
+      if (filterValue && !foundModifier.isConditionValueValid(filterValue)) {
+        this.conditionValue = void 0;
+      }
+      this.conditionModifier = modifier;
+      this.notify(this);
+    });
+    __publicField(this, "getConditionModifiers", () => {
+      return Object.entries(this.modifiers);
+    });
+    __publicField(this, "apply", (value) => {
+      const modifier = this.modifiers[this.conditionModifier];
+      const conditionValue = this.getConditionValue();
+      if (conditionValue === void 0 || !modifier.isConditionValueValid(conditionValue)) return true;
+      if (!modifier.isValueValid(value)) return false;
+      return modifier.modifier.modifierFn(value, conditionValue);
+    });
+    this.id = id;
+    this.field = field;
+    this.conditionValue = conditionValue;
+    this.conditionModifier = conditionModifier;
+  }
+  serialize() {
+    return {
+      id: this.id,
+      type: this.field.type,
+      fieldId: this.field.identifier,
+      conditionValue: this.modifiers[this.conditionModifier].modifier.serialize(this.conditionValue),
+      conditionModifier: this.conditionModifier
+    };
+  }
+}
 class ConditionModifier {
   constructor(config) {
     __publicField(this, "id");
@@ -32664,60 +32733,6 @@ const StringArrayNotEqualsConditionModifier = ConditionModifier.create({
   deserialize: (filterValue) => filterValue
 });
 const createConditionModifierConfig = (conifg) => conifg;
-class BaseCondition extends Observable {
-  constructor(config) {
-    const { id, field, conditionValue, conditionModifier } = config;
-    super();
-    __publicField(this, "id");
-    __publicField(this, "conditionValue");
-    __publicField(this, "conditionModifier");
-    __publicField(this, "field");
-    __publicField(this, "getConditionValue", () => {
-      return this.conditionValue;
-    });
-    __publicField(this, "setConditionValue", (conditionValue) => {
-      const modifier = this.modifiers[this.conditionModifier];
-      if (conditionValue !== void 0 && !modifier.isConditionValueValid(conditionValue)) return;
-      this.conditionValue = conditionValue;
-      this.notify(this);
-    });
-    __publicField(this, "getConditionModifier", () => {
-      return this.conditionModifier;
-    });
-    __publicField(this, "setConditionModifier", (modifier) => {
-      const foundModifier = this.modifiers[modifier];
-      const filterValue = this.getConditionValue();
-      if (filterValue && !foundModifier.isConditionValueValid(filterValue)) {
-        this.conditionValue = void 0;
-      }
-      this.conditionModifier = modifier;
-      this.notify(this);
-    });
-    __publicField(this, "getConditionModifiers", () => {
-      return Object.entries(this.modifiers);
-    });
-    __publicField(this, "apply", (value) => {
-      const modifier = this.modifiers[this.conditionModifier];
-      const conditionValue = this.getConditionValue();
-      if (conditionValue === void 0 || !modifier.isConditionValueValid(conditionValue)) return true;
-      if (!modifier.isValueValid(value)) return false;
-      return modifier.modifier.modifierFn(value, conditionValue);
-    });
-    this.id = id;
-    this.field = field;
-    this.conditionValue = conditionValue;
-    this.conditionModifier = conditionModifier;
-  }
-  serialize() {
-    return {
-      id: this.id,
-      type: this.field.type,
-      fieldId: this.field.identifier,
-      conditionValue: this.modifiers[this.conditionModifier].modifier.serialize(this.conditionValue),
-      conditionModifier: this.conditionModifier
-    };
-  }
-}
 const formId = "form-builder";
 const fieldsToChoose = [
   ["string", "text"],

package/dist/forms.umd.cjs

@@ -32182,6 +32182,18 @@ 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) {
+    const files = [];
+    const promises = [];
+    for (const fileOrPromise of filesOrPromises) {
+      if (fileOrPromise instanceof Promise) {
+        promises.push(fileOrPromise);
+      } else {
+        files.push(fileOrPromise);
+      }
+    }
+    return [files, promises];
+  }
   const _UploadField = class _UploadField extends BaseField {
     constructor(options2) {
       const { extensions, maximum_files, maximum_size, ...base } = options2;
@@ -32201,8 +32213,12 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     isEqual(value1, value2) {
       if (value1 === void 0 && value2 === void 0) return true;
       if (value1 === void 0 || value2 === void 0) return false;
-      if (!value1.every((file1) => value2.some((file2) => areFilesEqual(file1, file2)))) return false;
-      if (!value2.every((file2) => value1.some((file1) => areFilesEqual(file1, file2)))) return false;
+      const [files1, promises1] = seprateFilesFromPromises(value1);
+      const [files2, promises2] = seprateFilesFromPromises(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;
       return true;
     }
     static getFieldCreationSchema(parentPath = "") {
@@ -32222,7 +32238,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
         },
         {
           field: new NumberField({
-            // TODO: Default value
             label: "What is the maximum size of each file?",
             description: `Maximum file size in megabytes (between 1MB–${maxFileSizeMB}MB).`,
             required: false,
@@ -32272,7 +32287,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       const maxFileSizeInB = maxFileSizeInMB * 1e3 * 1e3;
       const maxFiles = this.maxFiles || 1;
       validators.push((value) => {
-        if (value && value.some((file) => file.size > maxFileSizeInB)) {
+        if (value && value.some((file) => file instanceof File && file.size > maxFileSizeInB)) {
           return `Files must be at most ${maxFileSizeInMB}MB.`;
         }
       });
@@ -32360,6 +32375,60 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   const maxFileSizeMB = 50;
   const maxFileSizeKB = maxFileSizeMB * 1e3;
   const maxFileSizeB = maxFileSizeKB * 1e3;
+  class BaseCondition extends Observable {
+    constructor(config) {
+      const { id, field, conditionValue, conditionModifier } = config;
+      super();
+      __publicField(this, "id");
+      __publicField(this, "conditionValue");
+      __publicField(this, "conditionModifier");
+      __publicField(this, "field");
+      __publicField(this, "getConditionValue", () => {
+        return this.conditionValue;
+      });
+      __publicField(this, "setConditionValue", (conditionValue) => {
+        const modifier = this.modifiers[this.conditionModifier];
+        if (conditionValue !== void 0 && !modifier.isConditionValueValid(conditionValue)) return;
+        this.conditionValue = conditionValue;
+        this.notify(this);
+      });
+      __publicField(this, "getConditionModifier", () => {
+        return this.conditionModifier;
+      });
+      __publicField(this, "setConditionModifier", (modifier) => {
+        const foundModifier = this.modifiers[modifier];
+        const filterValue = this.getConditionValue();
+        if (filterValue && !foundModifier.isConditionValueValid(filterValue)) {
+          this.conditionValue = void 0;
+        }
+        this.conditionModifier = modifier;
+        this.notify(this);
+      });
+      __publicField(this, "getConditionModifiers", () => {
+        return Object.entries(this.modifiers);
+      });
+      __publicField(this, "apply", (value) => {
+        const modifier = this.modifiers[this.conditionModifier];
+        const conditionValue = this.getConditionValue();
+        if (conditionValue === void 0 || !modifier.isConditionValueValid(conditionValue)) return true;
+        if (!modifier.isValueValid(value)) return false;
+        return modifier.modifier.modifierFn(value, conditionValue);
+      });
+      this.id = id;
+      this.field = field;
+      this.conditionValue = conditionValue;
+      this.conditionModifier = conditionModifier;
+    }
+    serialize() {
+      return {
+        id: this.id,
+        type: this.field.type,
+        fieldId: this.field.identifier,
+        conditionValue: this.modifiers[this.conditionModifier].modifier.serialize(this.conditionValue),
+        conditionModifier: this.conditionModifier
+      };
+    }
+  }
   class ConditionModifier {
     constructor(config) {
       __publicField(this, "id");
@@ -32666,60 +32735,6 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     deserialize: (filterValue) => filterValue
   });
   const createConditionModifierConfig = (conifg) => conifg;
-  class BaseCondition extends Observable {
-    constructor(config) {
-      const { id, field, conditionValue, conditionModifier } = config;
-      super();
-      __publicField(this, "id");
-      __publicField(this, "conditionValue");
-      __publicField(this, "conditionModifier");
-      __publicField(this, "field");
-      __publicField(this, "getConditionValue", () => {
-        return this.conditionValue;
-      });
-      __publicField(this, "setConditionValue", (conditionValue) => {
-        const modifier = this.modifiers[this.conditionModifier];
-        if (conditionValue !== void 0 && !modifier.isConditionValueValid(conditionValue)) return;
-        this.conditionValue = conditionValue;
-        this.notify(this);
-      });
-      __publicField(this, "getConditionModifier", () => {
-        return this.conditionModifier;
-      });
-      __publicField(this, "setConditionModifier", (modifier) => {
-        const foundModifier = this.modifiers[modifier];
-        const filterValue = this.getConditionValue();
-        if (filterValue && !foundModifier.isConditionValueValid(filterValue)) {
-          this.conditionValue = void 0;
-        }
-        this.conditionModifier = modifier;
-        this.notify(this);
-      });
-      __publicField(this, "getConditionModifiers", () => {
-        return Object.entries(this.modifiers);
-      });
-      __publicField(this, "apply", (value) => {
-        const modifier = this.modifiers[this.conditionModifier];
-        const conditionValue = this.getConditionValue();
-        if (conditionValue === void 0 || !modifier.isConditionValueValid(conditionValue)) return true;
-        if (!modifier.isValueValid(value)) return false;
-        return modifier.modifier.modifierFn(value, conditionValue);
-      });
-      this.id = id;
-      this.field = field;
-      this.conditionValue = conditionValue;
-      this.conditionModifier = conditionModifier;
-    }
-    serialize() {
-      return {
-        id: this.id,
-        type: this.field.type,
-        fieldId: this.field.identifier,
-        conditionValue: this.modifiers[this.conditionModifier].modifier.serialize(this.conditionValue),
-        conditionModifier: this.conditionModifier
-      };
-    }
-  }
   const formId = "form-builder";
   const fieldsToChoose = [
     ["string", "text"],

package/package.json

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