@wise/dynamic-flow-client 4.5.2 → 4.5.3

package/build/main.js

@@ -1186,6 +1186,39 @@ var isStringSchema = (schema) => "type" in schema && schema.type === "string";
 var isStringSchemaWithUpload = (schema) => isStringSchema(schema) && schema.format === "base64url";
 var isSchemaWithPersistAsync = (schema) => "persistAsync" in schema && !isNullish(schema.persistAsync);
 
+// src/revamp/renderers/stepComponentToProps.ts
+var stepComponentToProps = (component, rendererMapperProps) => {
+  const {
+    uid,
+    back,
+    control,
+    description,
+    error,
+    loadingState,
+    step,
+    title,
+    onBehavior
+  } = component;
+  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
+  return __spreadValues({
+    type: "step",
+    id: step.id,
+    uid,
+    back,
+    control,
+    description,
+    error,
+    loadingState,
+    step,
+    title,
+    children: childrenProps.map(rendererMapperProps.render),
+    childrenProps,
+    onAction: (action) => {
+      void onBehavior({ type: "action", action });
+    }
+  }, rendererMapperProps);
+};
+
 // src/revamp/renderers/mappers/utils/pick.ts
 function pick(obj, ...keys) {
   const result = {};
@@ -1379,6 +1412,19 @@ var decisionComponentToProps = (component, rendererMapperProps) => __spreadProps
 // src/revamp/renderers/mappers/dividerComponentToProps.ts
 var dividerComponentToProps = (component, rendererMapperProps) => __spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "margin")), rendererMapperProps);
 
+// src/revamp/renderers/mappers/externalComponentToProps.ts
+var externalComponentToProps = (component, rendererMapperProps) => {
+  return __spreadValues({
+    type: "external-confirmation",
+    uid: component.uid,
+    url: component.url,
+    status: component.status,
+    onSuccess: component.onSuccess.bind(component),
+    onFailure: component.onFailure.bind(component),
+    onCancel: component.onCancel.bind(component)
+  }, rendererMapperProps);
+};
+
 // src/revamp/renderers/mappers/formComponentToProps.ts
 var formComponentToProps = (component, rendererMapperProps) => {
   const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
@@ -1419,6 +1465,20 @@ var integerInputComponentToProps = (component, rendererMapperProps) => __spreadP
   onChange: component.onChange.bind(component)
 });
 
+// src/revamp/renderers/mappers/listComponentToProps.ts
+var listComponentToProps = (component, rendererMapperProps) => __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "callToAction", "control", "margin", "title")), rendererMapperProps), {
+  items: component.items.map(mapItem)
+});
+var mapItem = (item) => {
+  var _a, _b;
+  return __spreadProps(__spreadValues({}, item), {
+    // populate deprecated fields
+    subtitle: item.description,
+    value: (_a = item.supportingValues) == null ? void 0 : _a.value,
+    subvalue: (_b = item.supportingValues) == null ? void 0 : _b.subvalue
+  });
+};
+
 // src/revamp/renderers/mappers/loadingIndicatorComponentToProps.ts
 var loadingIndicatorComponentToProps = (component, rendererMapperProps) => __spreadValues(__spreadValues({}, pick(component, "uid", "type", "control", "margin", "size")), rendererMapperProps);
 
@@ -1443,6 +1503,35 @@ var modalComponentToProps = (component, rendererMapperProps) => {
   }, rendererMapperProps);
 };
 
+// src/revamp/renderers/mappers/modalContentComponentToProps.ts
+var modalContentComponentToProps = (component, rendererMapperProps) => {
+  const { uid, open, title, close } = component;
+  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
+  return __spreadValues({
+    uid,
+    type: "modal-content",
+    open,
+    title,
+    children: childrenProps.map(rendererMapperProps.render),
+    childrenProps,
+    onClose: close.bind(component)
+  }, rendererMapperProps);
+};
+
+// src/revamp/renderers/mappers/multiSelectComponentToProps.ts
+var multiSelectInputComponentToProps = (component, rendererMapperProps) => {
+  const { autoComplete, maxItems, minItems, options, selectedIndices, onSelect } = component;
+  const _a = inputComponentToProps(component, "input-multi-select"), { required, value } = _a, props = __objRest(_a, ["required", "value"]);
+  return __spreadProps(__spreadValues(__spreadValues({}, props), rendererMapperProps), {
+    autoComplete,
+    maxItems,
+    minItems,
+    options,
+    selectedIndices,
+    onSelect: onSelect.bind(component)
+  });
+};
+
 // src/revamp/renderers/mappers/multiUploadInputComponentToProps.ts
 var multiUploadInputComponentToProps = (component, rendererMapperProps) => {
   const { accepts, cameraConfig, files, maxSize, minItems, maxItems, source, uploadLabel } = component;
@@ -1550,6 +1639,17 @@ var reviewComponentToProps = (component, rendererMapperProps) => __spreadValues(
 }), rendererMapperProps);
 var mapField = (field) => __spreadValues({}, field);
 
+// src/revamp/renderers/mappers/rootComponentToProps.ts
+var rootComponentToProps = (rootComponent, rendererMapperProps) => {
+  const childrenProps = rootComponent.getChildren().map((child) => componentToRendererProps(child, rendererMapperProps));
+  return __spreadValues({
+    type: "root",
+    uid: rootComponent.uid,
+    children: childrenProps.map(rendererMapperProps.render),
+    childrenProps
+  }, rendererMapperProps);
+};
+
 // src/revamp/domain/mappers/utils/image.ts
 var mapSpecImage = (image) => {
   var _a, _b, _c;
@@ -1645,17 +1745,14 @@ var textInputComponentToProps = (component, rendererMapperProps) => __spreadProp
   onChange: component.onChange.bind(component)
 });
 
-// src/revamp/renderers/mappers/multiSelectComponentToProps.ts
-var multiSelectInputComponentToProps = (component, rendererMapperProps) => {
-  const { autoComplete, maxItems, minItems, options, selectedIndices, onSelect } = component;
-  const _a = inputComponentToProps(component, "input-multi-select"), { required, value } = _a, props = __objRest(_a, ["required", "value"]);
-  return __spreadProps(__spreadValues(__spreadValues({}, props), rendererMapperProps), {
-    autoComplete,
-    maxItems,
-    minItems,
-    options,
-    selectedIndices,
-    onSelect: onSelect.bind(component)
+// src/revamp/renderers/mappers/tupleComponentToProps.ts
+var tupleComponentToProps = (component, rendererMapperProps) => {
+  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
+  return __spreadProps(__spreadValues(__spreadValues({
+    type: "form-section"
+  }, pick(component, "uid", "control", "description", "help", "icon", "image", "title")), rendererMapperProps), {
+    children: childrenProps.map(rendererMapperProps.render),
+    childrenProps
   });
 };
 
@@ -1671,108 +1768,25 @@ var uploadInputComponentToProps = (component, rendererMapperProps) => {
   });
 };
 
-// src/revamp/renderers/mappers/tupleComponentToProps.ts
-var tupleComponentToProps = (component, rendererMapperProps) => {
-  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
-  return __spreadProps(__spreadValues(__spreadValues({
-    type: "form-section"
-  }, pick(component, "uid", "control", "description", "help", "icon", "image", "title")), rendererMapperProps), {
-    children: childrenProps.map(rendererMapperProps.render),
-    childrenProps
-  });
-};
-
-// src/revamp/renderers/mappers/listComponentToProps.ts
-var listComponentToProps = (component, rendererMapperProps) => __spreadProps(__spreadValues(__spreadValues({}, pick(component, "uid", "type", "callToAction", "control", "margin", "title")), rendererMapperProps), {
-  items: component.items.map(mapItem)
-});
-var mapItem = (item) => {
-  var _a, _b;
-  return __spreadProps(__spreadValues({}, item), {
-    // populate deprecated fields
-    subtitle: item.description,
-    value: (_a = item.supportingValues) == null ? void 0 : _a.value,
-    subvalue: (_b = item.supportingValues) == null ? void 0 : _b.subvalue
-  });
-};
-
-// src/revamp/renderers/stepComponentToProps.ts
-var stepComponentToProps = (component, rendererMapperProps) => {
-  const {
-    uid,
-    back,
-    control,
-    description,
-    error,
-    loadingState,
-    step,
-    title,
-    onBehavior
-  } = component;
-  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
-  return __spreadValues({
-    type: "step",
-    id: step.id,
-    uid,
-    back,
-    control,
-    description,
-    error,
-    loadingState,
-    step,
-    title,
-    children: childrenProps.map(rendererMapperProps.render),
-    childrenProps,
-    onAction: (action) => {
-      void onBehavior({ type: "action", action });
-    }
-  }, rendererMapperProps);
-};
-
-// src/revamp/renderers/mappers/rootComponentToProps.ts
-var rootComponentToProps = (rootComponent, rendererMapperProps) => {
-  const childrenProps = rootComponent.getChildren().map((child) => componentToRendererProps(child, rendererMapperProps));
-  return __spreadValues({
-    type: "root",
-    uid: rootComponent.uid,
-    children: childrenProps.map(rendererMapperProps.render),
-    childrenProps
-  }, rendererMapperProps);
-};
-
-// src/revamp/renderers/mappers/modalContentComponentToProps.ts
-var modalContentComponentToProps = (component, rendererMapperProps) => {
-  const { uid, open, title, close } = component;
-  const childrenProps = component.getChildren().map((c) => componentToRendererProps(c, rendererMapperProps));
-  return __spreadValues({
-    uid,
-    type: "modal-content",
-    open,
-    title,
-    children: childrenProps.map(rendererMapperProps.render),
-    childrenProps,
-    onClose: close.bind(component)
-  }, rendererMapperProps);
-};
-
-// src/revamp/renderers/mappers/externalComponentToProps.ts
-var externalComponentToProps = (component, rendererMapperProps) => {
-  return __spreadValues({
-    type: "external-confirmation",
-    uid: component.uid,
-    url: component.url,
-    status: component.status,
-    onSuccess: component.onSuccess.bind(component),
-    onFailure: component.onFailure.bind(component),
-    onCancel: component.onCancel.bind(component)
-  }, rendererMapperProps);
-};
-
 // src/revamp/renderers/mappers/componentToRendererProps.ts
 var componentToRendererProps = (component, rendererMapperProps) => {
   if (isHiddenComponent(component)) {
     return hiddenComponentToProps(component);
   }
+  const componentProps = getComponentProps(component, rendererMapperProps);
+  const alertProps = getComponentAlertProps(component, rendererMapperProps);
+  if (alertProps) {
+    const childrenProps = [alertProps, componentProps];
+    return __spreadValues({
+      type: "container",
+      uid: `${component.uid}-wrapper`,
+      children: childrenProps.map(rendererMapperProps.render),
+      childrenProps
+    }, rendererMapperProps);
+  }
+  return componentProps;
+};
+var getComponentProps = (component, rendererMapperProps) => {
   switch (component.type) {
     case "root":
       return rootComponentToProps(component, rendererMapperProps);
@@ -1852,6 +1866,13 @@ var componentToRendererProps = (component, rendererMapperProps) => {
       throw new Error("Unknown component type");
   }
 };
+var getComponentAlertProps = (component, rendererMapperProps) => "alert" in component && component.alert ? __spreadValues({
+  type: "alert",
+  uid: `${component.uid}-alert`,
+  margin: "md",
+  context: component.alert.context,
+  markdown: component.alert.content
+}, rendererMapperProps) : null;
 
 // src/revamp/useDynamicFlowCore.tsx
 var import_dynamic_flow_types2 = require("@wise/dynamic-flow-types");
@@ -2503,6 +2524,12 @@ var mapAdditionalInfo = (info, onBehavior) => {
   }
   return void 0;
 };
+var mapSchemaAlert = (alert) => {
+  return alert ? {
+    content: alert.markdown,
+    context: alert.context ? mapLegacyContext(alert.context) : "neutral"
+  } : void 0;
+};
 
 // src/revamp/domain/mappers/layout/decisionLayoutToComponent.ts
 var decisionLayoutToComponent = (uid, {
@@ -3304,7 +3331,7 @@ var mapCommonSchemaProps = (schemaMapperProps) => {
   var _a;
   const { uid, schema, required, validationErrors } = schemaMapperProps;
   const { $id, analyticsId, control, description, icon, image, keywords, title, hidden } = schema;
-  return __spreadValues(__spreadValues({
+  return __spreadValues(__spreadValues(__spreadValues({
     uid,
     id: $id != null ? $id : uid,
     analyticsId: (_a = analyticsId != null ? analyticsId : $id) != null ? _a : "",
@@ -3319,7 +3346,7 @@ var mapCommonSchemaProps = (schemaMapperProps) => {
     required: Boolean(required),
     title,
     summariser: getSummariser(schema)
-  }, schemaHasHelp(schema) ? { help: schema.help.markdown } : {}), schemaHasPlaceholder(schema) ? { placeholder: schema.placeholder } : {});
+  }, schemaHasHelp(schema) ? { help: schema.help.markdown } : {}), schemaHasPlaceholder(schema) ? { placeholder: schema.placeholder } : {}), schema.alert ? { alert: mapSchemaAlert(schema.alert) } : {});
 };
 var schemaHasDisabled = (schema) => Boolean("disabled" in schema && schema.disabled !== void 0);
 var schemaHasHelp = (schema) => Boolean("help" in schema && schema.help);
@@ -3441,27 +3468,27 @@ var numberSchemaToComponent = (schemaMapperProps, mapperProps) => {
   );
 };
 
-// src/revamp/domain/components/ObjectComponent.ts
-var createObjectComponent = (objectProps) => {
+// src/revamp/domain/components/AllOfComponent.ts
+var createAllOfComponent = (allOfProps) => {
   const {
     uid,
     analyticsId,
-    componentMap,
+    alert,
+    components,
     control,
     description,
-    displayOrder,
     help,
     hidden,
     icon,
     image,
-    summariser,
     title
-  } = objectProps;
+  } = allOfProps;
   return {
-    type: "object",
+    type: "all-of",
     uid,
     analyticsId,
-    componentMap,
+    alert,
+    components,
     control,
     description,
     help,
@@ -3470,123 +3497,13 @@ var createObjectComponent = (objectProps) => {
     image,
     title,
     getChildren() {
-      return displayOrder.map((propName) => this.componentMap[propName]);
+      return this.components;
+    },
+    getSummary() {
+      return summariseFromChildren(this.getChildren());
     },
     async getSubmittableValue() {
-      return Promise.all(
-        displayOrder.map(
-          async (propName) => this.componentMap[propName].getSubmittableValue().then((value) => ({ value, propName }))
-        )
-      ).then(
-        (values) => values.reduce(
-          (acc, { value, propName }) => __spreadValues(__spreadValues({}, acc), value === null ? {} : { [propName]: value }),
-          {}
-        )
-      );
-    },
-    getSubmittableValueSync() {
-      return mergeChildrenValues(
-        displayOrder,
-        (propName) => this.componentMap[propName].getSubmittableValueSync()
-      );
-    },
-    getSummary() {
-      const summary = summariser(this.getLocalValue());
-      const childSummary = summariseFromChildren(this.getChildren());
-      return mergeSummaries(summary, childSummary);
-    },
-    getLocalValue() {
-      return mergeChildrenValues(
-        displayOrder,
-        (propName) => this.componentMap[propName].getLocalValue()
-      );
-    },
-    validate() {
-      return hidden ? true : validateComponents(this.getChildren());
-    }
-  };
-};
-var mergeChildrenValues = (displayOrder, getComponentValue) => displayOrder.reduce((acc, propName) => {
-  const componentValue = getComponentValue(propName);
-  return __spreadValues(__spreadValues({}, acc), componentValue === null ? {} : { [propName]: componentValue });
-}, {});
-
-// src/revamp/domain/mappers/schema/objectSchemaToComponent/objectSchemaToComponent.ts
-var objectSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { uid, localValue, schema, model, validationErrors } = schemaMapperProps;
-  const { $id, displayOrder, properties, required } = schema;
-  validateDisplayOrder($id, displayOrder, properties, mapperProps.logEvent);
-  const componentMap = displayOrder.reduce((acc, propName) => {
-    var _a;
-    const propSchema = properties[propName];
-    if (propSchema === void 0) {
-      throw new Error(`Object schema ${$id} has no property named ${propName}`);
-    }
-    return __spreadProps(__spreadValues({}, acc), {
-      [propName]: mapSchemaToComponent(
-        {
-          uid: `${uid}.obj-${propName}`,
-          schema: propSchema,
-          model: isObjectModel(model) ? model[propName] : null,
-          localValue: isObjectLocalValue(localValue) ? localValue[propName] : null,
-          required: (_a = required == null ? void 0 : required.includes(propName)) != null ? _a : false,
-          validationErrors: isObject(validationErrors) ? validationErrors[propName] : void 0
-        },
-        mapperProps
-      )
-    });
-  }, {});
-  return createObjectComponent(__spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-    componentMap,
-    displayOrder
-  }));
-};
-var validateDisplayOrder = ($id, displayOrder, properties, logEvent) => {
-  if (!displayOrder) {
-    const message = `Object schema ${$id} has no displayOrder property.`;
-    logEvent("error", message);
-    throw new Error(message);
-  }
-  const propertyNames = Object.keys(properties);
-  displayOrder.forEach((propName) => {
-    if (!properties[propName]) {
-      const message = `Object schema ${$id} has no property named "${propName}", but it is listed in the displayOrder array.`;
-      logEvent("error", message);
-      throw new Error(message);
-    }
-  });
-  propertyNames.forEach((propName) => {
-    if (!displayOrder.includes(propName)) {
-      const message = `Object schema ${$id} has a "${propName}" property which is missing in the displayOrder array.`;
-      logEvent("error", message);
-      throw new Error(message);
-    }
-  });
-};
-
-// src/revamp/domain/components/AllOfComponent.ts
-var createAllOfComponent = (allOfProps) => {
-  const { uid, analyticsId, components, control, description, help, hidden, icon, image, title } = allOfProps;
-  return {
-    type: "all-of",
-    uid,
-    analyticsId,
-    components,
-    control,
-    description,
-    help,
-    hidden,
-    icon,
-    image,
-    title,
-    getChildren() {
-      return this.components;
-    },
-    getSummary() {
-      return summariseFromChildren(this.getChildren());
-    },
-    async getSubmittableValue() {
-      return getSubmittableData(this.components);
+      return getSubmittableData(this.components);
     },
     getSubmittableValueSync() {
       return getSubmittableDataSync(this.components);
@@ -3622,415 +3539,456 @@ var allOfSchemaToComponent = (schemaMapperProps, mapperProps) => {
   }));
 };
 
-// src/revamp/domain/components/ConstComponent.ts
-var createConstComponent = (hiddenProps) => {
-  const { uid, analyticsId, value, summary } = hiddenProps;
-  return {
-    type: "const",
-    uid,
-    analyticsId,
-    getLocalValue: () => value,
-    getSubmittableValue: async () => value,
-    getSubmittableValueSync: () => value,
-    getSummary: () => summary,
-    validate: () => true
-  };
-};
-
-// src/revamp/domain/mappers/schema/constSchemaToComponent.ts
-var constSchemaToComponent = (uid, schemaMapperProps) => {
-  var _a;
-  const { schema } = schemaMapperProps;
-  const { title, const: constValue, analyticsId, $id } = schema;
-  const titleOrValue = (_a = title != null ? title : constValue) != null ? _a : null;
-  return createConstComponent({
-    uid,
-    analyticsId: analyticsId != null ? analyticsId : $id,
-    summary: getConstSummary(schema, titleOrValue),
-    value: schema.const
-  });
-};
-
-// src/revamp/domain/components/IntegerInputComponent.ts
-var createIntegerInputComponent = (integerInputProps, updateComponent) => {
-  const _a = integerInputProps, {
+// src/revamp/domain/components/RepeatableComponent.ts
+var createRepeatableComponent = (repeatableProps, updateComponent) => {
+  const _a = repeatableProps, {
     uid,
     id,
     checks,
-    value,
-    performPersistAsync,
-    performRefresh,
-    performValidationAsync,
+    components,
+    summary,
     onValueChange,
+    createEditableComponent,
     summariser
-  } = _a, rest = __objRest(_a, [
+  } = _a, componentProps = __objRest(_a, [
     "uid",
     "id",
     "checks",
-    "value",
-    "performPersistAsync",
-    "performRefresh",
-    "performValidationAsync",
+    "components",
+    "summary",
     "onValueChange",
+    "createEditableComponent",
     "summariser"
   ]);
   const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
-  const integerComponent = __spreadValues({
-    type: "integer",
+  const repeatableComponent = __spreadProps(__spreadValues({
     uid,
     id,
-    value,
+    type: "repeatable",
+    components,
+    editableComponent: null,
+    editableIndex: null,
+    summaryDefaults: {
+      title: summary == null ? void 0 : summary.defaultTitle,
+      description: summary == null ? void 0 : summary.defaultDescription,
+      icon: summary == null ? void 0 : summary.defaultIcon,
+      image: summary == null ? void 0 : summary.defaultImage
+    }
+  }, componentProps), {
     _update(updateFn) {
       update(this, updateFn);
     },
-    onBlur() {
-      this.validate();
-      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh.flush();
-    },
-    onFocus() {
+    onEdit(itemIndex) {
+      this._update((draft) => {
+        draft.editableComponent = createEditableComponent(
+          draft.components[itemIndex].getLocalValue()
+        );
+        draft.editableIndex = itemIndex;
+      });
     },
-    // Noop
-    onChange(updatedValue) {
-      const prevValue = this.value;
+    onAdd() {
       this._update((draft) => {
+        draft.editableComponent = createEditableComponent(null);
+        draft.editableIndex = null;
         draft.errors = [];
-        draft.validationAsyncState.messages = {};
-        draft.value = updatedValue;
       });
-      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
+    },
+    onSave() {
+      var _a2;
+      const isValid = (_a2 = this.editableComponent) == null ? void 0 : _a2.validate();
+      if (!isValid) {
+        return false;
+      }
+      this._update((draft) => {
+        if (draft.editableComponent === null) {
+          return;
+        }
+        if (draft.editableIndex === null) {
+          const newComponent = __spreadValues({}, draft.editableComponent);
+          draft.components = [...this.components, newComponent];
+        } else {
+          draft.components[draft.editableIndex] = __spreadProps(__spreadValues({}, draft.editableComponent), {
+            uid: draft.components[draft.editableIndex].uid
+          });
+        }
+        draft.editableComponent = null;
+        draft.editableIndex = null;
+      });
+      onValueChange();
+      return true;
+    },
+    onRemove() {
+      this._update((draft) => {
+        if (draft.editableIndex === null) {
+          return;
+        }
+        draft.components.splice(draft.editableIndex, 1);
+        draft.editableComponent = null;
+        draft.editableIndex = null;
+      });
       onValueChange();
     },
+    getChildren() {
+      return this.editableComponent !== null ? [...this.components, this.editableComponent] : this.components;
+    },
     async getSubmittableValue() {
-      return this.getSubmittableValueSync();
+      return Promise.all(this.components.map(async (component) => component.getSubmittableValue()));
     },
     getSubmittableValueSync() {
-      var _a2;
-      return (_a2 = this.getLocalValue()) != null ? _a2 : null;
+      return this.components.map((component) => component.getSubmittableValueSync());
     },
     getSummary() {
-      return summariser(this.getLocalValue());
+      return summariser(null);
     },
     getLocalValue() {
-      return this.value;
+      return this.components.map((component) => component.getLocalValue());
     },
     validate() {
-      const errors = getValidationErrors(this.getLocalValue());
+      const messages = getValidationErrors(this.getLocalValue());
+      const childComponentsValid = validateComponents(this.getChildren());
       this._update((draft) => {
-        draft.errors = errors;
+        draft.errors = messages;
       });
-      return errors.length === 0;
+      return messages.length === 0 && childComponentsValid;
     }
-  }, rest);
-  if (performRefresh) {
-    return integerComponent;
-  }
-  if (performPersistAsync) {
-    const persist = getComponentPersistAsync(update, performPersistAsync);
-    return __spreadProps(__spreadValues({}, integerComponent), {
-      onBlur() {
-        if (this.validate()) {
-          persist(this, this.getLocalValue()).catch(() => {
-          });
-        }
-      },
-      async getSubmittableValue() {
-        return persist(this, this.getLocalValue());
-      },
-      getSubmittableValueSync() {
-        return this.persistedState.lastResponse;
-      }
-    });
-  }
-  if (performValidationAsync) {
-    const validateAsync = getDebouncedComponentValidationAsync(update, performValidationAsync);
-    return __spreadProps(__spreadValues({}, integerComponent), {
-      onBlur() {
-        if (this.validate()) {
-          validateAsync.flush();
-        }
-      },
-      onChange(updatedValue) {
-        integerComponent.onChange.call(this, updatedValue);
-        if (getValidationErrors(updatedValue).length === 0) {
-          validateAsync(this, updatedValue);
-        }
-      }
-    });
-  }
-  return integerComponent;
+  });
+  return repeatableComponent;
 };
 
-// src/revamp/domain/mappers/schema/integerSchemaToComponent.ts
-var integerSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { schema, localValue, model, required = false } = schemaMapperProps;
-  const { autocompleteHint, validationMessages, default: defaultValue, maximum, minimum } = schema;
-  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
-  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
-  const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
-    schemaMapperProps,
-    mapperProps
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToRepeatableComponent.ts
+var arraySchemaToRepeatableComponent = (schemaMapperProps, mapperProps) => {
+  const { getErrorMessageFunctions } = mapperProps;
+  const {
+    uid,
+    localValue,
+    schema,
+    model: initialModel,
+    required = false,
+    validationErrors
+  } = schemaMapperProps;
+  const { items, addItemTitle, editItemTitle, maxItems, minItems, summary } = schema;
+  const value = isArray(localValue) ? localValue : [];
+  const components = initialModel == null ? void 0 : initialModel.map(
+    (item, index) => mapSchemaToComponent(
+      {
+        uid: `${uid}.arr-${index}`,
+        schema: items,
+        model: item,
+        localValue: value == null ? void 0 : value[index],
+        // TODO tests for this
+        validationErrors
+      },
+      mapperProps
+    )
   );
-  const { performValidationAsync, validationAsyncState } = getValidationAsyncInitialState(
-    schemaMapperProps,
+  const createEditableComponent = (editableValue) => mapSchemaToComponent(
+    {
+      uid: `${uid}.arr-rnd-${getRandomInt()}`,
+      schema: items,
+      localValue: editableValue,
+      model: localValueToJsonElement(editableValue),
+      validationErrors: void 0,
+      required: true
+    },
     mapperProps
   );
-  const validLocalValue = isInteger(localValue) ? localValue : null;
-  const validModel = isInteger(model) ? model : defaultValue != null ? defaultValue : null;
-  const value = performPersistAsync ? validLocalValue : validModel;
-  const checks = [
-    getRequiredCheck(required, errorMessageFunctions),
-    getBelowMinimumCheck(schema, errorMessageFunctions),
-    getAboveMaximumCheck(schema, errorMessageFunctions)
-  ];
-  return createIntegerInputComponent(
+  const { onValueChange } = mapperProps;
+  const errorMessageFunctions = getErrorMessageFunctions(schema.validationMessages);
+  return createRepeatableComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      autoComplete: getAutocompleteString(autocompleteHint),
-      checks,
-      maximum,
-      minimum,
-      persistedState,
-      value,
-      validationAsyncState,
-      performPersistAsync,
-      performRefresh: getPerformRefresh(schema, onRefresh),
-      performValidationAsync,
+      addItemTitle,
+      checks: schema.hidden ? [] : [
+        getRequiredCheck(required, errorMessageFunctions),
+        getAboveMaxItemsCheck(schema, errorMessageFunctions),
+        getBelowMinItemsCheck(schema, errorMessageFunctions)
+      ],
+      components: components != null ? components : [],
+      editItemTitle,
+      maxItems,
+      minItems,
+      summary: __spreadProps(__spreadValues({}, summary), {
+        defaultImage: mapSpecImage(summary == null ? void 0 : summary.defaultImage)
+      }),
+      createEditableComponent,
       onValueChange
     }),
-    updateComponent
+    mapperProps.updateComponent
   );
 };
-
-// src/revamp/domain/components/utils/isPartialModelMatch.ts
-var isPartialModelMatch = (localModel, incomingModel) => {
-  if (isArrayModel(localModel) && isArrayModel(incomingModel)) {
-    return localModel.length === incomingModel.length && localModel.every((value, index) => isPartialModelMatch(value, incomingModel[index]));
+var localValueToJsonElement = (localValue) => {
+  if (localValue instanceof Array) {
+    return localValue.map(localValueToJsonElement);
   }
-  if (isObjectModel(localModel) && isObjectModel(incomingModel)) {
-    if (Object.keys(localModel).length === 0 && Object.keys(incomingModel).length === 0) {
-      return true;
-    }
-    const nonNullishKeysInBoth = nonNullishKeys(localModel).filter(
-      (key) => nonNullishKeys(incomingModel).includes(key)
+  if (isObject(localValue)) {
+    return Object.fromEntries(
+      Object.entries(localValue).map(([key, value]) => [key, localValueToJsonElement(value)])
     );
-    return nonNullishKeysInBoth.length > 0 && nonNullishKeysInBoth.every((key) => isPartialModelMatch(localModel[key], incomingModel[key]));
   }
-  return localModel === incomingModel;
+  if (localValue instanceof File) {
+    return localValue.name;
+  }
+  return localValue;
 };
-var nonNullishKeys = (model) => Object.keys(model).filter((key) => !isNullish(model[key]));
+var getRandomInt = () => Math.floor(Math.random() * 1e8);
 
-// src/revamp/domain/components/SelectInputComponent.ts
-var createSelectInputComponent = (selectProps, updateComponent) => {
-  const _a = selectProps, { uid, checks, initialModel, options, performRefresh, onValueChange, summariser } = _a, rest = __objRest(_a, ["uid", "checks", "initialModel", "options", "performRefresh", "onValueChange", "summariser"]);
-  const children = options.map((option) => option.component);
-  const matchingOptions = options.map(
-    (option) => isPartialModelMatch(option.component.getSubmittableValueSync(), initialModel)
-  );
-  const selectedIndex = matchingOptions.filter((match) => match).length === 1 ? matchingOptions.indexOf(true) : null;
+// src/revamp/domain/components/utils/file-utils.ts
+var toBase64 = async (file) => new Promise((resolve, reject) => {
+  const reader = new FileReader();
+  reader.addEventListener("load", () => resolve(reader.result));
+  reader.addEventListener("error", reject);
+  reader.readAsDataURL(file);
+});
+var base64dataUrltoFile = (dataurl, filename) => {
+  if (!isBase64DataUrl(dataurl)) {
+    return null;
+  }
+  const [, base64data] = dataurl.split(",");
+  return new File([base64ToBytes(base64data)], filename, { type: getMimeType(dataurl) });
+};
+var isBase64DataUrl = (dataurl) => dataurl.startsWith("data:") && dataurl.includes("base64") && dataurl.includes(",");
+var getMimeType = (base64dataUrl) => base64dataUrl.substring("data:".length).split(";")[0];
+var base64ToBytes = (base64) => {
+  const charCodes = atob(base64).split("").map((m) => m.charCodeAt(0));
+  return Uint8Array.from(charCodes);
+};
+
+// src/revamp/domain/components/MultiUploadInputComponent.ts
+var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
+  const _a = uploadInputProps, {
+    uid,
+    id,
+    checks,
+    fileChecks,
+    format,
+    performPersistAsync,
+    onValueChange,
+    summariser
+  } = _a, rest = __objRest(_a, [
+    "uid",
+    "id",
+    "checks",
+    "fileChecks",
+    "format",
+    "performPersistAsync",
+    "onValueChange",
+    "summariser"
+  ]);
   const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
-  const component = __spreadProps(__spreadValues({
+  const getFileValidationErrors = getLocalValueValidator(fileChecks);
+  const uploadComponent = __spreadValues({
+    type: "multi-upload",
     uid,
-    type: "select",
-    children,
-    options,
-    selectedIndex,
-    value: null
-  }, rest), {
+    id,
+    format: "base64",
+    files: [],
     _update(updateFn) {
       update(this, updateFn);
     },
-    getChildren() {
-      return this.children;
+    onBlur() {
+      this.validate();
     },
-    getSelectedChild() {
-      return this.selectedIndex !== null ? this.children[this.selectedIndex] : null;
+    onFocus() {
+    },
+    // Noop
+    async onRemoveFile(index) {
+      this._update((draft) => {
+        draft.value.splice(index, 1);
+        draft.files.splice(index, 1);
+      });
+    },
+    async onInsertFile(index, file) {
+      const fileErrors = getFileValidationErrors(file);
+      const fileId = getRandomId();
+      this._update((draft) => {
+        draft.value.splice(index, 0, file);
+        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors });
+        draft.errors = [];
+      });
+      onValueChange();
+      return fileId;
     },
     async getSubmittableValue() {
-      var _a2, _b;
-      return (_b = await ((_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSubmittableValue())) != null ? _b : null;
+      const files = this.getLocalValue();
+      return files ? Promise.all(files.map(toBase64)) : null;
     },
     getSubmittableValueSync() {
-      var _a2, _b;
-      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSubmittableValueSync()) != null ? _b : null;
+      return null;
     },
     getSummary() {
-      var _a2, _b;
-      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSummary()) != null ? _b : {};
+      return summariser(this.getLocalValue().map(({ name }) => name));
     },
     getLocalValue() {
-      var _a2, _b;
-      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getLocalValue()) != null ? _b : null;
-    },
-    onBlur() {
-      this.validate();
-    },
-    onFocus() {
+      return this.value;
     },
-    // noop
-    onSelect(updatedIndex) {
-      if (updatedIndex === this.selectedIndex) {
-        return;
-      }
-      if (updatedIndex !== null && this.analyticsId) {
-        selectProps.trackEvent("OneOf Selected", {
-          oneOfId: this.analyticsId,
-          schemaId: this.children[updatedIndex].analyticsId
-        });
-      }
+    validate() {
+      const errorMsgs = getValidationErrors(this.getLocalValue());
       this._update((draft) => {
-        draft.errors = [];
-        draft.selectedIndex = updatedIndex;
+        draft.errors = errorMsgs;
       });
-      performRefresh == null ? void 0 : performRefresh();
-      onValueChange();
+      return errorMsgs.length === 0 && this.files.every(({ errors }) => errors.length === 0);
+    }
+  }, rest);
+  if (!performPersistAsync) {
+    return uploadComponent;
+  }
+  const persist = getComponentMultiPersistAsync(update, performPersistAsync);
+  return __spreadProps(__spreadValues({}, uploadComponent), {
+    format,
+    async onInsertFile(index, file) {
+      const fileId = await uploadComponent.onInsertFile.call(this, index, file);
+      const submission = format === "blob" ? file : await toBase64(file);
+      await persist(this, index, submission);
+      onValueChange();
+      return fileId;
     },
-    validate() {
-      var _a2, _b;
-      const validChild = (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.validate()) != null ? _b : true;
-      const errors = getValidationErrors(this.getLocalValue());
+    async onRemoveFile(index) {
+      var _a2;
+      await uploadComponent.onRemoveFile.call(this, index);
+      (_a2 = this.persistedState[index]) == null ? void 0 : _a2.abortController.abort();
       this._update((draft) => {
-        draft.errors = errors;
+        draft.persistedState = draft.persistedState.splice(index, 1);
       });
-      return errors.length === 0 && validChild;
+    },
+    async getSubmittableValue() {
+      return Promise.all(this.persistedState.map(async ({ submission }) => submission));
+    },
+    getSubmittableValueSync() {
+      return this.persistedState.map(({ lastResponse }) => lastResponse);
     }
   });
-  return component;
 };
 
-// src/revamp/domain/mappers/schema/oneOfSchemaToComponent/oneOfSchemaToComponent.ts
-var oneOfSchemaToComponent = (schemaMapperProps, mapperProps) => {
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToMultiUploadComponent.ts
+var arraySchemaToMultiUploadComponent = (schemaMapperProps, mapperProps) => {
   var _a;
-  const {
-    uid,
-    localValue,
-    schema,
-    model,
-    validationErrors: initialError,
-    required = false
-  } = schemaMapperProps;
-  const initialModel = (_a = model != null ? model : schema.default) != null ? _a : null;
-  if (schema.oneOf.length === 1 && isFormSectionSchema(schema.oneOf[0])) {
-    return mapSchemaToComponent(
-      {
-        uid,
-        schema: supressSchemaTitleAndDescription(schema.oneOf[0]),
-        model: initialModel,
-        localValue,
-        validationErrors: initialError,
-        required
-      },
-      mapperProps
-    );
-  }
-  const options = schema.oneOf.map((childSchema, index) => {
-    const { title = "", description, image, icon, keywords = [] } = childSchema;
-    return {
-      title,
-      description,
-      image: mapSpecImage(image),
-      icon,
-      keywords,
-      disabled: "disabled" in childSchema ? Boolean(childSchema.disabled) : false,
-      component: mapSchemaToComponent(
-        {
-          uid: `${uid}.oneOf-${index}`,
-          schema: isFormSectionSchema(childSchema) ? supressSchemaTitleAndDescription(childSchema) : childSchema,
-          model: initialModel,
-          localValue,
-          validationErrors: initialError,
-          required
-        },
-        mapperProps
-      )
-    };
+  const { getErrorMessageFunctions } = mapperProps;
+  const { localValue, model, schema, required = false } = schemaMapperProps;
+  const uploadSchema = getUploadSchema(schema.items);
+  const { accepts, cameraConfig, maxSize } = uploadSchema;
+  const { minItems, maxItems, title, validationMessages } = schema;
+  const arrayErrorMessageFunctions = getErrorMessageFunctions(validationMessages);
+  const fileErrorMessageFunctions = getErrorMessageFunctions(uploadSchema.validationMessages);
+  const checks = [
+    getRequiredCheck(required, arrayErrorMessageFunctions),
+    getAboveMaxFilesCheck(schema, arrayErrorMessageFunctions),
+    getBelowMinFilesCheck(schema, arrayErrorMessageFunctions)
+  ];
+  const fileChecks = [
+    getFileSizeCheck(schema.items, fileErrorMessageFunctions),
+    getFileTypeCheck(schema.items, fileErrorMessageFunctions)
+  ];
+  const persistAsyncConfig = getPersistAsyncConfig(schema.items);
+  const format = getFormat(schema.items);
+  const combinedSchemaProps = __spreadProps(__spreadValues({}, schemaMapperProps), {
+    persistAsyncConfig,
+    schema: __spreadProps(__spreadValues({}, uploadSchema), { hidden: (_a = schema.hidden) != null ? _a : uploadSchema.hidden, alert: schema.alert })
   });
-  const { getErrorMessageFunctions, updateComponent, trackEvent, onRefresh, onValueChange } = mapperProps;
-  const { validationMessages } = schema;
-  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
-  return createSelectInputComponent(
-    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      autoComplete: getAutocompleteString(schema.autocompleteHint),
-      checks: schema.hidden ? [] : [getRequiredCheck(required, errorMessageFunctions)],
-      options,
-      initialModel,
-      performRefresh: getPerformRefresh(schema, onRefresh),
-      onValueChange,
-      trackEvent
+  const { onValueChange } = mapperProps;
+  const { performPersistAsync } = getPersistAsyncInitialState(combinedSchemaProps, mapperProps);
+  const value = performPersistAsync ? getValueForPersistAsync(localValue) : [];
+  const persistedState = performPersistAsync && isArray(model) ? model.map((itemModel) => getInitialPersistedState(null, itemModel)) : [];
+  return createMultiUploadInputComponent(
+    __spreadProps(__spreadValues({}, mapCommonSchemaProps(combinedSchemaProps)), {
+      title,
+      cameraConfig,
+      uploadLabel: uploadSchema.title,
+      accepts,
+      autoComplete: "off",
+      checks: schema.hidden ? [] : checks,
+      fileChecks: schema.hidden ? [] : fileChecks,
+      format,
+      maxSize,
+      minItems,
+      maxItems,
+      required,
+      source: uploadSchema.source,
+      value,
+      persistedState,
+      performPersistAsync,
+      onValueChange
     }),
-    updateComponent
+    mapperProps.updateComponent
   );
 };
-var isFormSectionSchema = (schema) => isObjectSchema(schema) || isArrayTupleSchema(schema) || isAllOfSchema(schema);
-var supressSchemaTitleAndDescription = (schema) => {
-  const _a = schema, { title, description } = _a, headlessSchema = __objRest(_a, ["title", "description"]);
-  return headlessSchema;
+var getFormat = (schema) => {
+  if (isStringSchemaWithUpload(schema)) {
+    return "base64";
+  }
+  return isBlobSchema(schema.persistAsync.schema) ? "blob" : "base64";
+};
+var getUploadSchema = (schema) => {
+  if (isStringSchemaWithUpload(schema)) {
+    return schema;
+  }
+  return schema.persistAsync.schema;
+};
+var getPersistAsyncConfig = (schema) => {
+  if (!isSchemaWithPersistAsync(schema)) {
+    return void 0;
+  }
+  const { persistAsync } = schema;
+  const { idProperty, method, param, url } = persistAsync;
+  return { idProperty, method, param, url };
 };
+var getValueForPersistAsync = (localValue) => isArray(localValue) && localValue.every(isFile) ? localValue : [];
 
-// src/revamp/domain/components/DateInputComponent.ts
-var createDateInputComponent = (textInputProps, updateComponent) => {
-  const _a = textInputProps, {
+// src/revamp/domain/components/MultiSelectInputComponent.ts
+var createMultiSelectComponent = (multiSelectProps, updateComponent) => {
+  const _a = multiSelectProps, {
     uid,
-    id,
     checks,
-    performPersistAsync,
-    performRefresh,
+    options,
+    initialValue,
     performValidationAsync,
-    onValueChange,
-    summariser,
-    value
+    performRefresh,
+    onValueChange
   } = _a, rest = __objRest(_a, [
     "uid",
-    "id",
     "checks",
-    "performPersistAsync",
-    "performRefresh",
+    "options",
+    "initialValue",
     "performValidationAsync",
-    "onValueChange",
-    "summariser",
-    "value"
+    "performRefresh",
+    "onValueChange"
   ]);
   const update = getInputUpdateFunction(updateComponent);
+  const children = options.map((option) => option.component);
+  const selectedIndices = getInitialModelIndices(initialValue, children);
   const getValidationErrors = getLocalValueValidator(checks);
-  const dateInputComponent = __spreadValues({
-    type: "date",
+  const inputComponent = __spreadProps(__spreadValues({
     uid,
-    id,
-    value,
+    type: "multi-select",
+    children,
+    options,
+    selectedIndices,
+    value: null
+  }, rest), {
     _update(updateFn) {
       update(this, updateFn);
     },
-    onBlur() {
-      this.validate();
-    },
-    onFocus() {
-    },
-    // Noop
-    onChange(updatedValue) {
-      const prevValue = this.value;
+    onSelect(indices) {
       this._update((draft) => {
+        draft.selectedIndices = indices;
         draft.errors = [];
-        draft.validationAsyncState.messages = {};
-        draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performRefresh == null ? void 0 : performRefresh();
-      }
+      performRefresh == null ? void 0 : performRefresh();
       onValueChange();
+      const errors = getValidationErrors(this.getLocalValue());
+      this._update((draft) => {
+        draft.errors = errors;
+      });
     },
-    async getSubmittableValue() {
-      return this.getSubmittableValueSync();
-    },
-    getSubmittableValueSync() {
-      var _a2;
-      return (_a2 = this.getLocalValue()) != null ? _a2 : null;
+    onBlur() {
     },
-    getSummary() {
-      return summariser(this.getLocalValue());
+    // Noop
+    onFocus() {
     },
+    // Noop
     getLocalValue() {
-      return this.value;
+      var _a2, _b;
+      return (_b = (_a2 = this.getSelectedChildren()) == null ? void 0 : _a2.map((child) => child.getLocalValue())) != null ? _b : null;
     },
     validate() {
       const errors = getValidationErrors(this.getLocalValue());
@@ -4038,34 +3996,34 @@ var createDateInputComponent = (textInputProps, updateComponent) => {
         draft.errors = errors;
       });
       return errors.length === 0;
+    },
+    async getSubmittableValue() {
+      const selected = this.getSelectedChildren();
+      if (selected) {
+        return Promise.all(selected.map(async (child) => child.getSubmittableValue()));
+      }
+      return null;
+    },
+    getSubmittableValueSync() {
+      var _a2, _b;
+      return (_b = (_a2 = this.getSelectedChildren()) == null ? void 0 : _a2.map((child) => child.getSubmittableValueSync())) != null ? _b : null;
+    },
+    getSummary: () => ({}),
+    getChildren() {
+      return this.children;
+    },
+    getSelectedChildren() {
+      return this.selectedIndices.map((i) => this.children[i]);
     }
-  }, rest);
+  });
   if (performRefresh) {
-    return dateInputComponent;
-  }
-  if (performPersistAsync) {
-    const persist = getComponentPersistAsync(update, performPersistAsync);
-    return __spreadProps(__spreadValues({}, dateInputComponent), {
-      onChange(updatedValue) {
-        dateInputComponent.onChange.call(this, updatedValue);
-        const isValid = getValidationErrors(updatedValue).length === 0;
-        if (isValid) {
-          persist(this, this.getLocalValue()).catch(() => {
-          });
-        }
-      },
-      async getSubmittableValue() {
-        return persist(this, this.getLocalValue());
-      },
-      getSubmittableValueSync() {
-        return this.persistedState.lastResponse;
-      }
-    });
+    return inputComponent;
   }
   if (performValidationAsync) {
     const validateAsync = getComponentValidationAsync(update, performValidationAsync);
-    return __spreadProps(__spreadValues({}, dateInputComponent), {
-      onBlur() {
+    return __spreadProps(__spreadValues({}, inputComponent), {
+      onSelect(indices) {
+        inputComponent.onSelect.call(this, indices);
         if (this.validate()) {
           validateAsync(this, this.getLocalValue()).catch(() => {
           });
@@ -4073,79 +4031,181 @@ var createDateInputComponent = (textInputProps, updateComponent) => {
       }
     });
   }
-  return dateInputComponent;
+  return inputComponent;
+};
+var getInitialModelIndices = (model, options) => {
+  if (!isArray(model)) {
+    return [];
+  }
+  return model.map((m) => options.findIndex((o) => o.getLocalValue() === m)).filter((n) => n >= 0);
 };
 
-// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToDateInputComponent.ts
-var stringSchemaToDateInputComponent = (schemaMapperProps, mapperProps) => {
-  const { schema, localValue, model, required = false } = schemaMapperProps;
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToMultiSelectComponent.ts
+var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
   const {
-    autocompleteHint,
-    default: defaultValue,
-    minimum: minimumDate,
-    maximum: maximumDate,
-    suggestions
-  } = schema;
-  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
-  const errorMessageFunctions = getErrorMessageFunctions(schema.validationMessages);
-  const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
-    schemaMapperProps,
-    mapperProps
-  );
+    uid,
+    localValue,
+    schema,
+    model,
+    required = false,
+    validationErrors: initialError
+  } = schemaMapperProps;
+  const initialModel = model != null ? model : null;
+  const options = schema.items.oneOf.map((childSchema, index) => {
+    const { title: title2 = "", description, image, icon, keywords = [] } = childSchema;
+    return {
+      title: title2,
+      description,
+      image: mapSpecImage(image),
+      icon,
+      keywords,
+      disabled: "disabled" in childSchema ? Boolean(childSchema.disabled) : false,
+      component: mapSchemaToComponent(
+        {
+          uid: `${uid}.oneOf-${index}`,
+          schema: childSchema,
+          model: initialModel,
+          localValue,
+          validationErrors: initialError,
+          required
+        },
+        mapperProps
+      )
+    };
+  });
+  const { maxItems, minItems, title, validationMessages } = schema;
+  const { getErrorMessageFunctions, onRefresh, onValueChange, updateComponent } = mapperProps;
+  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
   const { performValidationAsync, validationAsyncState } = getValidationAsyncInitialState(
     schemaMapperProps,
     mapperProps
   );
-  const validLocalValue = isString(localValue) ? localValue : null;
-  const validModel = isString(model) ? model : defaultValue != null ? defaultValue : null;
-  const value = performPersistAsync ? validLocalValue : validModel;
-  return createDateInputComponent(
+  const initialValue = model != null ? model : null;
+  return createMultiSelectComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      autoComplete: getAutocompleteString(autocompleteHint),
+      autoComplete: "off",
       checks: schema.hidden ? [] : [
         getRequiredCheck(required, errorMessageFunctions),
-        getAboveMaximumDateCheck(schema, errorMessageFunctions),
-        getBelowMinimumDateCheck(schema, errorMessageFunctions)
+        getAboveMaxItemsCheck(schema, errorMessageFunctions),
+        getBelowMinItemsCheck(schema, errorMessageFunctions)
       ],
-      minimumDate,
-      maximumDate,
-      suggestions: suggestions ? {
-        values: suggestions.values.map((suggestion) => __spreadProps(__spreadValues({}, suggestion), {
-          image: mapSpecImage(suggestion.image)
-        }))
-      } : void 0,
-      value,
-      persistedState,
+      initialValue,
+      maxItems,
+      minItems,
+      options,
+      required,
+      title,
       validationAsyncState,
-      performPersistAsync,
-      performRefresh: getPerformRefresh(schema, onRefresh),
       performValidationAsync,
+      performRefresh: getPerformRefresh(schema, onRefresh),
       onValueChange
     }),
     updateComponent
   );
 };
 
-// src/revamp/domain/components/utils/file-utils.ts
-var toBase64 = async (file) => new Promise((resolve, reject) => {
-  const reader = new FileReader();
-  reader.addEventListener("load", () => resolve(reader.result));
-  reader.addEventListener("error", reject);
-  reader.readAsDataURL(file);
-});
-var base64dataUrltoFile = (dataurl, filename) => {
-  if (!isBase64DataUrl(dataurl)) {
-    return null;
-  }
-  const [, base64data] = dataurl.split(",");
-  return new File([base64ToBytes(base64data)], filename, { type: getMimeType(dataurl) });
+// src/revamp/domain/components/TupleComponent.ts
+var createTupleComponent = (tupleProps) => {
+  const {
+    uid,
+    analyticsId,
+    alert,
+    components,
+    control,
+    description,
+    help,
+    hidden,
+    icon,
+    image,
+    summariser,
+    title
+  } = tupleProps;
+  return {
+    type: "tuple",
+    uid,
+    analyticsId,
+    alert,
+    components,
+    control,
+    description,
+    help,
+    hidden,
+    icon,
+    image,
+    title,
+    getChildren() {
+      return this.components;
+    },
+    async getSubmittableValue() {
+      return Promise.all(this.components.map(async (child) => child.getSubmittableValue()));
+    },
+    getSubmittableValueSync() {
+      return this.components.map((child) => child.getSubmittableValueSync());
+    },
+    getSummary() {
+      const summary = summariser(this.getLocalValue());
+      const childSummary = summariseFromChildren(this.getChildren());
+      return mergeSummaries(summary, childSummary);
+    },
+    getLocalValue() {
+      return this.components.map((child) => child.getLocalValue());
+    },
+    validate() {
+      return hidden ? true : validateComponents(this.getChildren());
+    }
+  };
 };
-var isBase64DataUrl = (dataurl) => dataurl.startsWith("data:") && dataurl.includes("base64") && dataurl.includes(",");
-var getMimeType = (base64dataUrl) => base64dataUrl.substring("data:".length).split(";")[0];
-var base64ToBytes = (base64) => {
-  const charCodes = atob(base64).split("").map((m) => m.charCodeAt(0));
-  return Uint8Array.from(charCodes);
+
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToTupleComponent.ts
+var arraySchemaToTupleComponent = (schemaMapperProps, mapperProps) => {
+  const {
+    uid,
+    localValue,
+    schema,
+    model: initialModel,
+    required = false,
+    validationErrors
+  } = schemaMapperProps;
+  const { items } = schema;
+  const components = items.map(
+    (childSchema, index) => {
+      var _a, _b;
+      return mapSchemaToComponent(
+        {
+          uid: `${uid}-arr.${index}`,
+          schema: childSchema,
+          model: isArray(initialModel) ? (_a = initialModel[index]) != null ? _a : null : null,
+          localValue: isArray(localValue) ? (_b = localValue[index]) != null ? _b : null : null,
+          validationErrors: isArray(validationErrors) ? validationErrors[index] : void 0,
+          required
+        },
+        mapperProps
+      );
+    }
+  );
+  return createTupleComponent(__spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+    components
+  }));
+};
+
+// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToComponent.ts
+var arraySchemaToComponent = (schemaMapperProps, mapperProps) => {
+  const { schema, model: originalModel } = schemaMapperProps;
+  const model = isNullish(originalModel) || isArrayModel(originalModel) ? originalModel : null;
+  if (isArraySchemaListWithMultiFileUpload(schema)) {
+    return arraySchemaToMultiUploadComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
+  }
+  if (isArraySchemaListWithMultiSelect(schema)) {
+    return arraySchemaToMultiSelectComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
+  }
+  if (isArrayTupleSchema(schema)) {
+    return arraySchemaToTupleComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
+  }
+  return arraySchemaToRepeatableComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
 };
+var isArraySchemaListWithMultiFileUpload = (schema) => isArrayListSchema(schema) && (isPersistAsyncWithUploadSchema(schema.items) || isStringSchemaWithUpload(schema.items));
+var isPersistAsyncWithUploadSchema = (schema) => isSchemaWithPersistAsync(schema) && (isBlobSchema(schema.persistAsync.schema) || isStringSchemaWithUpload(schema.persistAsync.schema));
+var isArraySchemaListWithMultiSelect = (schema) => isArrayListSchema(schema) && "oneOf" in schema.items && schema.items.oneOf.every(isConstSchema);
 
 // src/revamp/domain/components/UploadInputComponent.ts
 var createUploadInputComponent = (uploadInputProps, updateComponent) => {
@@ -4251,70 +4311,222 @@ var createUploadInputComponent = (uploadInputProps, updateComponent) => {
   });
 };
 
-// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToUploadInputComponent.ts
-var stringSchemaToUploadInputComponent = (schemaMapperProps, mapperProps) => {
-  var _a;
+// src/revamp/domain/mappers/schema/blobSchemaToComponent.ts
+var blobSchemaToComponent = (schemaMapperProps, mapperProps) => {
   const { schema, localValue, model, required = false } = schemaMapperProps;
-  const { accepts, autocompleteHint, cameraConfig, hidden, maxSize, source, validationMessages } = schema;
-  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
+  const { accepts, cameraConfig, maxSize, source, validationMessages } = schema;
+  const { getErrorMessageFunctions, updateComponent, onValueChange } = mapperProps;
   const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
   const { performPersistAsync } = getPersistAsyncInitialState(schemaMapperProps, mapperProps);
   const persistedState = performPersistAsync ? getInitialPersistedState(null, model) : getInitialPersistedState();
   const validLocalValue = isFile(localValue) ? localValue : null;
-  const value = (_a = getFileFromModel(model)) != null ? _a : validLocalValue;
-  const checks = hidden ? [] : [
-    getRequiredCheck(required, errorMessageFunctions),
-    getFileSizeCheck(schema, errorMessageFunctions),
-    getFileTypeCheck(schema, errorMessageFunctions)
-  ];
+  const value = performPersistAsync ? validLocalValue : null;
   return createUploadInputComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
       accepts,
-      autoComplete: getAutocompleteString(autocompleteHint),
+      autoComplete: "off",
       cameraConfig,
-      checks,
-      format: "base64",
+      format: "blob",
       maxSize,
       source,
       value,
       persistedState,
       performPersistAsync,
-      performRefresh: getPerformRefresh(schema, onRefresh),
+      checks: schema.hidden ? [] : [getRequiredCheck(required, errorMessageFunctions)],
       onValueChange
     }),
     updateComponent
   );
 };
-var getFileFromModel = (model) => isString(model) ? base64dataUrltoFile(model, "") : null;
 
-// src/revamp/domain/components/TextInputComponent.ts
-var createTextInputComponent = (textInputProps, updateComponent) => {
-  const _a = textInputProps, {
+// src/revamp/domain/components/BooleanInputComponent.ts
+var createBooleanInputComponent = (booleanInputProps, updateComponent) => {
+  const _a = booleanInputProps, {
+    uid,
+    id,
+    value,
+    performPersistAsync,
+    performRefresh,
+    performValidationAsync,
+    onValueChange,
+    summariser
+  } = _a, rest = __objRest(_a, [
+    "uid",
+    "id",
+    "value",
+    "performPersistAsync",
+    "performRefresh",
+    "performValidationAsync",
+    "onValueChange",
+    "summariser"
+  ]);
+  const update = getInputUpdateFunction(updateComponent);
+  const booleanComponent = __spreadValues({
+    type: "boolean",
+    uid,
+    id,
+    autoComplete: "",
+    value,
+    _update(updateFn) {
+      update(this, updateFn);
+    },
+    onBlur() {
+    },
+    // Noop
+    onFocus() {
+    },
+    // Noop
+    onChange(updatedValue) {
+      this._update((draft) => {
+        draft.errors = [];
+        draft.value = updatedValue;
+      });
+      performRefresh == null ? void 0 : performRefresh();
+      onValueChange();
+    },
+    async getSubmittableValue() {
+      return this.getSubmittableValueSync();
+    },
+    getSubmittableValueSync() {
+      return this.getLocalValue();
+    },
+    getSummary() {
+      return summariser(this.getLocalValue());
+    },
+    getLocalValue() {
+      return this.value;
+    },
+    validate: () => true
+  }, rest);
+  if (performRefresh) {
+    return booleanComponent;
+  }
+  if (performPersistAsync) {
+    const persist = getComponentPersistAsync(update, performPersistAsync);
+    return __spreadProps(__spreadValues({}, booleanComponent), {
+      onChange(updatedValue) {
+        booleanComponent.onChange.call(this, updatedValue);
+        persist(this, this.getLocalValue()).catch(() => {
+        });
+      },
+      async getSubmittableValue() {
+        return persist(this, this.getLocalValue());
+      },
+      getSubmittableValueSync() {
+        return this.persistedState.lastResponse;
+      }
+    });
+  }
+  if (performValidationAsync) {
+    const validateAsync = getComponentValidationAsync(update, performValidationAsync);
+    return __spreadProps(__spreadValues({}, booleanComponent), {
+      onChange(updatedValue) {
+        booleanComponent.onChange.call(this, updatedValue);
+        validateAsync(this, this.getLocalValue()).catch(() => {
+        });
+      }
+    });
+  }
+  return booleanComponent;
+};
+
+// src/revamp/domain/mappers/schema/booleanSchemaToComponent.ts
+var booleanSchemaToComponent = (schemaMapperProps, mapperProps) => {
+  const { schema, localValue, model } = schemaMapperProps;
+  const { default: defaultValue } = schema;
+  const { updateComponent, onRefresh, onValueChange } = mapperProps;
+  const performRefresh = getPerformRefresh(schema, onRefresh);
+  const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
+    schemaMapperProps,
+    mapperProps
+  );
+  const { performValidationAsync, validationAsyncState } = getValidationAsyncInitialState(
+    schemaMapperProps,
+    mapperProps
+  );
+  const validLocalValue = isBoolean(localValue) ? localValue : false;
+  const validModel = getValidModel(model, defaultValue);
+  const value = performPersistAsync ? validLocalValue : validModel;
+  return createBooleanInputComponent(
+    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+      value: value != null ? value : false,
+      persistedState,
+      validationAsyncState,
+      performPersistAsync,
+      performRefresh,
+      performValidationAsync,
+      onValueChange
+    }),
+    updateComponent
+  );
+};
+var getValidModel = (model, defaultValue) => {
+  if (isBoolean(model)) {
+    return model;
+  }
+  if (isBoolean(defaultValue)) {
+    return defaultValue;
+  }
+  return false;
+};
+
+// src/revamp/domain/components/ConstComponent.ts
+var createConstComponent = (hiddenProps) => {
+  const { uid, analyticsId, value, summary } = hiddenProps;
+  return {
+    type: "const",
+    uid,
+    analyticsId,
+    getLocalValue: () => value,
+    getSubmittableValue: async () => value,
+    getSubmittableValueSync: () => value,
+    getSummary: () => summary,
+    validate: () => true
+  };
+};
+
+// src/revamp/domain/mappers/schema/constSchemaToComponent.ts
+var constSchemaToComponent = (uid, schemaMapperProps) => {
+  var _a;
+  const { schema } = schemaMapperProps;
+  const { title, const: constValue, analyticsId, $id } = schema;
+  const titleOrValue = (_a = title != null ? title : constValue) != null ? _a : null;
+  return createConstComponent({
+    uid,
+    analyticsId: analyticsId != null ? analyticsId : $id,
+    summary: getConstSummary(schema, titleOrValue),
+    value: schema.const
+  });
+};
+
+// src/revamp/domain/components/IntegerInputComponent.ts
+var createIntegerInputComponent = (integerInputProps, updateComponent) => {
+  const _a = integerInputProps, {
     uid,
     id,
     checks,
+    value,
     performPersistAsync,
     performRefresh,
     performValidationAsync,
     onValueChange,
-    summariser,
-    value
+    summariser
   } = _a, rest = __objRest(_a, [
     "uid",
     "id",
     "checks",
+    "value",
     "performPersistAsync",
     "performRefresh",
     "performValidationAsync",
     "onValueChange",
-    "summariser",
-    "value"
+    "summariser"
   ]);
   const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
   const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
-  const inputComponent = __spreadValues({
-    type: "text",
+  const integerComponent = __spreadValues({
+    type: "integer",
     uid,
     id,
     value,
@@ -4342,7 +4554,8 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
       return this.getSubmittableValueSync();
     },
     getSubmittableValueSync() {
-      return this.getLocalValue() || null;
+      var _a2;
+      return (_a2 = this.getLocalValue()) != null ? _a2 : null;
     },
     getSummary() {
       return summariser(this.getLocalValue());
@@ -4359,11 +4572,11 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
     }
   }, rest);
   if (performRefresh) {
-    return inputComponent;
+    return integerComponent;
   }
   if (performPersistAsync) {
     const persist = getComponentPersistAsync(update, performPersistAsync);
-    return __spreadProps(__spreadValues({}, inputComponent), {
+    return __spreadProps(__spreadValues({}, integerComponent), {
       onBlur() {
         if (this.validate()) {
           persist(this, this.getLocalValue()).catch(() => {
@@ -4380,43 +4593,28 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
   }
   if (performValidationAsync) {
     const validateAsync = getDebouncedComponentValidationAsync(update, performValidationAsync);
-    return __spreadProps(__spreadValues({}, inputComponent), {
+    return __spreadProps(__spreadValues({}, integerComponent), {
       onBlur() {
         if (this.validate()) {
           validateAsync.flush();
         }
       },
       onChange(updatedValue) {
-        inputComponent.onChange.call(this, updatedValue);
+        integerComponent.onChange.call(this, updatedValue);
         if (getValidationErrors(updatedValue).length === 0) {
           validateAsync(this, updatedValue);
         }
-        if (!updatedValue) {
-          validateAsync.cancel();
-        }
       }
     });
   }
-  return inputComponent;
+  return integerComponent;
 };
 
-// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToTextInputComponent.ts
-var stringSchemaToTextInputComponent = (schemaMapperProps, mapperProps) => {
+// src/revamp/domain/mappers/schema/integerSchemaToComponent.ts
+var integerSchemaToComponent = (schemaMapperProps, mapperProps) => {
   const { schema, localValue, model, required = false } = schemaMapperProps;
-  const {
-    autocapitalization,
-    autocompleteHint,
-    control,
-    default: defaultValue,
-    displayFormat,
-    format,
-    maxLength,
-    minLength,
-    suggestions,
-    validationMessages
-  } = schema;
-  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange, logEvent } = mapperProps;
-  const controlForLegacyFormat = getControlForLegacyFormat(format);
+  const { autocompleteHint, validationMessages, default: defaultValue, maximum, minimum } = schema;
+  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
   const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
   const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
     schemaMapperProps,
@@ -4426,30 +4624,22 @@ var stringSchemaToTextInputComponent = (schemaMapperProps, mapperProps) => {
     schemaMapperProps,
     mapperProps
   );
-  const validLocalValue = isString(localValue) ? localValue : null;
-  const validModel = isString(model) ? model : defaultValue != null ? defaultValue : null;
+  const validLocalValue = isInteger(localValue) ? localValue : null;
+  const validModel = isInteger(model) ? model : defaultValue != null ? defaultValue : null;
   const value = performPersistAsync ? validLocalValue : validModel;
-  return createTextInputComponent(
+  const checks = [
+    getRequiredCheck(required, errorMessageFunctions),
+    getBelowMinimumCheck(schema, errorMessageFunctions),
+    getAboveMaximumCheck(schema, errorMessageFunctions)
+  ];
+  return createIntegerInputComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      autocapitalization,
       autoComplete: getAutocompleteString(autocompleteHint),
-      checks: schema.hidden ? [] : [
-        getRequiredCheck(required, errorMessageFunctions),
-        getAboveMaxLengthCheck(schema, errorMessageFunctions),
-        getBelowMinLengthCheck(schema, errorMessageFunctions),
-        getNotAdheringToPatternCheck(schema, errorMessageFunctions, { logEvent })
-      ],
-      control: control != null ? control : controlForLegacyFormat,
-      displayFormat,
-      maxLength,
-      minLength,
-      suggestions: suggestions ? {
-        values: suggestions.values.map((suggestion) => __spreadProps(__spreadValues({}, suggestion), {
-          image: mapSpecImage(suggestion.image)
-        }))
-      } : void 0,
-      value,
+      checks,
+      maximum,
+      minimum,
       persistedState,
+      value,
       validationAsyncState,
       performPersistAsync,
       performRefresh: getPerformRefresh(schema, onRefresh),
@@ -4459,548 +4649,258 @@ var stringSchemaToTextInputComponent = (schemaMapperProps, mapperProps) => {
     updateComponent
   );
 };
-var getControlForLegacyFormat = (format) => {
-  if (format && ["numeric", "phone-number", "email", "password"].includes(format)) {
-    return format;
-  }
-  return void 0;
-};
 
-// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToComponent.ts
-var stringSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { schema } = schemaMapperProps;
-  if (isStringSchemaWithBase64(schema)) {
-    return stringSchemaToUploadInputComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema }), mapperProps);
-  }
-  switch (schema.format) {
-    case "date":
-      return stringSchemaToDateInputComponent(schemaMapperProps, mapperProps);
-    default:
-      return stringSchemaToTextInputComponent(schemaMapperProps, mapperProps);
-  }
-};
-var isStringSchemaWithBase64 = (schema) => {
-  return schema.format === "base64url" && !("persistAsync" in schema);
-};
-
-// src/revamp/domain/components/ContainerComponent.ts
-var createContainerComponent = (containerProps) => __spreadProps(__spreadValues({}, containerProps), {
-  type: "container",
-  getChildren() {
-    return this.components;
-  },
-  async getSubmittableValue() {
-    return getSubmittableData(this.components);
-  },
-  getSubmittableValueSync() {
-    return getSubmittableDataSync(this.components);
-  },
-  getSummary() {
-    return summariseFromChildren(this.getChildren());
-  },
-  getLocalValue() {
-    return getLocalValues(this.components);
-  },
-  validate() {
-    return validateComponents(this.getChildren());
-  }
-});
-
-// src/revamp/domain/components/RepeatableComponent.ts
-var createRepeatableComponent = (repeatableProps, updateComponent) => {
-  const _a = repeatableProps, {
+// src/revamp/domain/components/ObjectComponent.ts
+var createObjectComponent = (objectProps) => {
+  const {
     uid,
-    id,
-    checks,
-    components,
-    summary,
-    onValueChange,
-    createEditableComponent,
-    summariser
-  } = _a, componentProps = __objRest(_a, [
-    "uid",
-    "id",
-    "checks",
-    "components",
-    "summary",
-    "onValueChange",
-    "createEditableComponent",
-    "summariser"
-  ]);
-  const update = getInputUpdateFunction(updateComponent);
-  const getValidationErrors = getLocalValueValidator(checks);
-  const repeatableComponent = __spreadProps(__spreadValues({
+    analyticsId,
+    alert,
+    componentMap,
+    control,
+    description,
+    displayOrder,
+    help,
+    hidden,
+    icon,
+    image,
+    summariser,
+    title
+  } = objectProps;
+  return {
+    type: "object",
     uid,
-    id,
-    type: "repeatable",
-    components,
-    editableComponent: null,
-    editableIndex: null,
-    summaryDefaults: {
-      title: summary == null ? void 0 : summary.defaultTitle,
-      description: summary == null ? void 0 : summary.defaultDescription,
-      icon: summary == null ? void 0 : summary.defaultIcon,
-      image: summary == null ? void 0 : summary.defaultImage
-    }
-  }, componentProps), {
-    _update(updateFn) {
-      update(this, updateFn);
-    },
-    onEdit(itemIndex) {
-      this._update((draft) => {
-        draft.editableComponent = createEditableComponent(
-          draft.components[itemIndex].getLocalValue()
-        );
-        draft.editableIndex = itemIndex;
-      });
-    },
-    onAdd() {
-      this._update((draft) => {
-        draft.editableComponent = createEditableComponent(null);
-        draft.editableIndex = null;
-        draft.errors = [];
-      });
-    },
-    onSave() {
-      var _a2;
-      const isValid = (_a2 = this.editableComponent) == null ? void 0 : _a2.validate();
-      if (!isValid) {
-        return false;
-      }
-      this._update((draft) => {
-        if (draft.editableComponent === null) {
-          return;
-        }
-        if (draft.editableIndex === null) {
-          const newComponent = __spreadValues({}, draft.editableComponent);
-          draft.components = [...this.components, newComponent];
-        } else {
-          draft.components[draft.editableIndex] = __spreadProps(__spreadValues({}, draft.editableComponent), {
-            uid: draft.components[draft.editableIndex].uid
-          });
-        }
-        draft.editableComponent = null;
-        draft.editableIndex = null;
-      });
-      onValueChange();
-      return true;
-    },
-    onRemove() {
-      this._update((draft) => {
-        if (draft.editableIndex === null) {
-          return;
-        }
-        draft.components.splice(draft.editableIndex, 1);
-        draft.editableComponent = null;
-        draft.editableIndex = null;
-      });
-      onValueChange();
-    },
+    analyticsId,
+    alert,
+    componentMap,
+    control,
+    description,
+    help,
+    hidden,
+    icon,
+    image,
+    title,
     getChildren() {
-      return this.editableComponent !== null ? [...this.components, this.editableComponent] : this.components;
+      return displayOrder.map((propName) => this.componentMap[propName]);
     },
     async getSubmittableValue() {
-      return Promise.all(this.components.map(async (component) => component.getSubmittableValue()));
+      return Promise.all(
+        displayOrder.map(
+          async (propName) => this.componentMap[propName].getSubmittableValue().then((value) => ({ value, propName }))
+        )
+      ).then(
+        (values) => values.reduce(
+          (acc, { value, propName }) => __spreadValues(__spreadValues({}, acc), value === null ? {} : { [propName]: value }),
+          {}
+        )
+      );
     },
     getSubmittableValueSync() {
-      return this.components.map((component) => component.getSubmittableValueSync());
+      return mergeChildrenValues(
+        displayOrder,
+        (propName) => this.componentMap[propName].getSubmittableValueSync()
+      );
     },
     getSummary() {
-      return summariser(null);
+      const summary = summariser(this.getLocalValue());
+      const childSummary = summariseFromChildren(this.getChildren());
+      return mergeSummaries(summary, childSummary);
     },
     getLocalValue() {
-      return this.components.map((component) => component.getLocalValue());
+      return mergeChildrenValues(
+        displayOrder,
+        (propName) => this.componentMap[propName].getLocalValue()
+      );
     },
     validate() {
-      const messages = getValidationErrors(this.getLocalValue());
-      const childComponentsValid = validateComponents(this.getChildren());
-      this._update((draft) => {
-        draft.errors = messages;
-      });
-      return messages.length === 0 && childComponentsValid;
+      return hidden ? true : validateComponents(this.getChildren());
     }
-  });
-  return repeatableComponent;
-};
-
-// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToRepeatableComponent.ts
-var arraySchemaToRepeatableComponent = (schemaMapperProps, mapperProps) => {
-  const { getErrorMessageFunctions } = mapperProps;
-  const {
-    uid,
-    localValue,
-    schema,
-    model: initialModel,
-    required = false,
-    validationErrors
-  } = schemaMapperProps;
-  const { items, addItemTitle, editItemTitle, maxItems, minItems, summary } = schema;
-  const value = isArray(localValue) ? localValue : [];
-  const components = initialModel == null ? void 0 : initialModel.map(
-    (item, index) => mapSchemaToComponent(
-      {
-        uid: `${uid}.arr-${index}`,
-        schema: items,
-        model: item,
-        localValue: value == null ? void 0 : value[index],
-        // TODO tests for this
-        validationErrors
-      },
-      mapperProps
-    )
-  );
-  const createEditableComponent = (editableValue) => mapSchemaToComponent(
-    {
-      uid: `${uid}.arr-rnd-${getRandomInt()}`,
-      schema: items,
-      localValue: editableValue,
-      model: localValueToJsonElement(editableValue),
-      validationErrors: void 0,
-      required: true
-    },
-    mapperProps
-  );
-  const { onValueChange } = mapperProps;
-  const errorMessageFunctions = getErrorMessageFunctions(schema.validationMessages);
-  return createRepeatableComponent(
-    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      addItemTitle,
-      checks: schema.hidden ? [] : [
-        getRequiredCheck(required, errorMessageFunctions),
-        getAboveMaxItemsCheck(schema, errorMessageFunctions),
-        getBelowMinItemsCheck(schema, errorMessageFunctions)
-      ],
-      components: components != null ? components : [],
-      editItemTitle,
-      maxItems,
-      minItems,
-      summary: __spreadProps(__spreadValues({}, summary), {
-        defaultImage: mapSpecImage(summary == null ? void 0 : summary.defaultImage)
-      }),
-      createEditableComponent,
-      onValueChange
-    }),
-    mapperProps.updateComponent
-  );
-};
-var localValueToJsonElement = (localValue) => {
-  if (localValue instanceof Array) {
-    return localValue.map(localValueToJsonElement);
-  }
-  if (isObject(localValue)) {
-    return Object.fromEntries(
-      Object.entries(localValue).map(([key, value]) => [key, localValueToJsonElement(value)])
-    );
-  }
-  if (localValue instanceof File) {
-    return localValue.name;
-  }
-  return localValue;
+  };
 };
-var getRandomInt = () => Math.floor(Math.random() * 1e8);
+var mergeChildrenValues = (displayOrder, getComponentValue) => displayOrder.reduce((acc, propName) => {
+  const componentValue = getComponentValue(propName);
+  return __spreadValues(__spreadValues({}, acc), componentValue === null ? {} : { [propName]: componentValue });
+}, {});
 
-// src/revamp/domain/components/MultiUploadInputComponent.ts
-var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
-  const _a = uploadInputProps, {
-    uid,
-    id,
-    checks,
-    fileChecks,
-    format,
-    performPersistAsync,
-    onValueChange,
-    summariser
-  } = _a, rest = __objRest(_a, [
-    "uid",
-    "id",
-    "checks",
-    "fileChecks",
-    "format",
-    "performPersistAsync",
-    "onValueChange",
-    "summariser"
-  ]);
-  const update = getInputUpdateFunction(updateComponent);
-  const getValidationErrors = getLocalValueValidator(checks);
-  const getFileValidationErrors = getLocalValueValidator(fileChecks);
-  const uploadComponent = __spreadValues({
-    type: "multi-upload",
-    uid,
-    id,
-    format: "base64",
-    files: [],
-    _update(updateFn) {
-      update(this, updateFn);
-    },
-    onBlur() {
-      this.validate();
-    },
-    onFocus() {
-    },
-    // Noop
-    async onRemoveFile(index) {
-      this._update((draft) => {
-        draft.value.splice(index, 1);
-        draft.files.splice(index, 1);
-      });
-    },
-    async onInsertFile(index, file) {
-      const fileErrors = getFileValidationErrors(file);
-      const fileId = getRandomId();
-      this._update((draft) => {
-        draft.value.splice(index, 0, file);
-        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors });
-        draft.errors = [];
-      });
-      onValueChange();
-      return fileId;
-    },
-    async getSubmittableValue() {
-      const files = this.getLocalValue();
-      return files ? Promise.all(files.map(toBase64)) : null;
-    },
-    getSubmittableValueSync() {
-      return null;
-    },
-    getSummary() {
-      return summariser(this.getLocalValue().map(({ name }) => name));
-    },
-    getLocalValue() {
-      return this.value;
-    },
-    validate() {
-      const errorMsgs = getValidationErrors(this.getLocalValue());
-      this._update((draft) => {
-        draft.errors = errorMsgs;
-      });
-      return errorMsgs.length === 0 && this.files.every(({ errors }) => errors.length === 0);
+// src/revamp/domain/mappers/schema/objectSchemaToComponent/objectSchemaToComponent.ts
+var objectSchemaToComponent = (schemaMapperProps, mapperProps) => {
+  const { uid, localValue, schema, model, validationErrors } = schemaMapperProps;
+  const { $id, displayOrder, properties, required } = schema;
+  validateDisplayOrder($id, displayOrder, properties, mapperProps.logEvent);
+  const componentMap = displayOrder.reduce((acc, propName) => {
+    var _a;
+    const propSchema = properties[propName];
+    if (propSchema === void 0) {
+      throw new Error(`Object schema ${$id} has no property named ${propName}`);
     }
-  }, rest);
-  if (!performPersistAsync) {
-    return uploadComponent;
+    return __spreadProps(__spreadValues({}, acc), {
+      [propName]: mapSchemaToComponent(
+        {
+          uid: `${uid}.obj-${propName}`,
+          schema: propSchema,
+          model: isObjectModel(model) ? model[propName] : null,
+          localValue: isObjectLocalValue(localValue) ? localValue[propName] : null,
+          required: (_a = required == null ? void 0 : required.includes(propName)) != null ? _a : false,
+          validationErrors: isObject(validationErrors) ? validationErrors[propName] : void 0
+        },
+        mapperProps
+      )
+    });
+  }, {});
+  return createObjectComponent(__spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+    componentMap,
+    displayOrder
+  }));
+};
+var validateDisplayOrder = ($id, displayOrder, properties, logEvent) => {
+  if (!displayOrder) {
+    const message = `Object schema ${$id} has no displayOrder property.`;
+    logEvent("error", message);
+    throw new Error(message);
   }
-  const persist = getComponentMultiPersistAsync(update, performPersistAsync);
-  return __spreadProps(__spreadValues({}, uploadComponent), {
-    format,
-    async onInsertFile(index, file) {
-      const fileId = await uploadComponent.onInsertFile.call(this, index, file);
-      const submission = format === "blob" ? file : await toBase64(file);
-      await persist(this, index, submission);
-      onValueChange();
-      return fileId;
-    },
-    async onRemoveFile(index) {
-      var _a2;
-      await uploadComponent.onRemoveFile.call(this, index);
-      (_a2 = this.persistedState[index]) == null ? void 0 : _a2.abortController.abort();
-      this._update((draft) => {
-        draft.persistedState = draft.persistedState.splice(index, 1);
-      });
-    },
-    async getSubmittableValue() {
-      return Promise.all(this.persistedState.map(async ({ submission }) => submission));
-    },
-    getSubmittableValueSync() {
-      return this.persistedState.map(({ lastResponse }) => lastResponse);
+  const propertyNames = Object.keys(properties);
+  displayOrder.forEach((propName) => {
+    if (!properties[propName]) {
+      const message = `Object schema ${$id} has no property named "${propName}", but it is listed in the displayOrder array.`;
+      logEvent("error", message);
+      throw new Error(message);
     }
   });
-};
-
-// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToMultiUploadComponent.ts
-var arraySchemaToMultiUploadComponent = (schemaMapperProps, mapperProps) => {
-  var _a;
-  const { getErrorMessageFunctions } = mapperProps;
-  const { localValue, model, schema, required = false } = schemaMapperProps;
-  const uploadSchema = getUploadSchema(schema.items);
-  const { accepts, cameraConfig, maxSize } = uploadSchema;
-  const { minItems, maxItems, title, validationMessages } = schema;
-  const arrayErrorMessageFunctions = getErrorMessageFunctions(validationMessages);
-  const fileErrorMessageFunctions = getErrorMessageFunctions(uploadSchema.validationMessages);
-  const checks = [
-    getRequiredCheck(required, arrayErrorMessageFunctions),
-    getAboveMaxFilesCheck(schema, arrayErrorMessageFunctions),
-    getBelowMinFilesCheck(schema, arrayErrorMessageFunctions)
-  ];
-  const fileChecks = [
-    getFileSizeCheck(schema.items, fileErrorMessageFunctions),
-    getFileTypeCheck(schema.items, fileErrorMessageFunctions)
-  ];
-  const persistAsyncConfig = getPersistAsyncConfig(schema.items);
-  const format = getFormat(schema.items);
-  const combinedSchemaProps = __spreadProps(__spreadValues({}, schemaMapperProps), {
-    persistAsyncConfig,
-    schema: __spreadProps(__spreadValues({}, uploadSchema), { hidden: (_a = schema.hidden) != null ? _a : uploadSchema.hidden })
+  propertyNames.forEach((propName) => {
+    if (!displayOrder.includes(propName)) {
+      const message = `Object schema ${$id} has a "${propName}" property which is missing in the displayOrder array.`;
+      logEvent("error", message);
+      throw new Error(message);
+    }
   });
-  const { onValueChange } = mapperProps;
-  const { performPersistAsync } = getPersistAsyncInitialState(combinedSchemaProps, mapperProps);
-  const value = performPersistAsync ? getValueForPersistAsync(localValue) : [];
-  const persistedState = performPersistAsync && isArray(model) ? model.map((itemModel) => getInitialPersistedState(null, itemModel)) : [];
-  return createMultiUploadInputComponent(
-    __spreadProps(__spreadValues({}, mapCommonSchemaProps(combinedSchemaProps)), {
-      title,
-      cameraConfig,
-      uploadLabel: uploadSchema.title,
-      accepts,
-      autoComplete: "off",
-      checks: schema.hidden ? [] : checks,
-      fileChecks: schema.hidden ? [] : fileChecks,
-      format,
-      maxSize,
-      minItems,
-      maxItems,
-      required,
-      source: uploadSchema.source,
-      value,
-      persistedState,
-      performPersistAsync,
-      onValueChange
-    }),
-    mapperProps.updateComponent
-  );
-};
-var getFormat = (schema) => {
-  if (isStringSchemaWithUpload(schema)) {
-    return "base64";
-  }
-  return isBlobSchema(schema.persistAsync.schema) ? "blob" : "base64";
 };
-var getUploadSchema = (schema) => {
-  if (isStringSchemaWithUpload(schema)) {
-    return schema;
+
+// src/revamp/domain/components/utils/isPartialModelMatch.ts
+var isPartialModelMatch = (localModel, incomingModel) => {
+  if (isArrayModel(localModel) && isArrayModel(incomingModel)) {
+    return localModel.length === incomingModel.length && localModel.every((value, index) => isPartialModelMatch(value, incomingModel[index]));
   }
-  return schema.persistAsync.schema;
-};
-var getPersistAsyncConfig = (schema) => {
-  if (!isSchemaWithPersistAsync(schema)) {
-    return void 0;
+  if (isObjectModel(localModel) && isObjectModel(incomingModel)) {
+    if (Object.keys(localModel).length === 0 && Object.keys(incomingModel).length === 0) {
+      return true;
+    }
+    const nonNullishKeysInBoth = nonNullishKeys(localModel).filter(
+      (key) => nonNullishKeys(incomingModel).includes(key)
+    );
+    return nonNullishKeysInBoth.length > 0 && nonNullishKeysInBoth.every((key) => isPartialModelMatch(localModel[key], incomingModel[key]));
   }
-  const { persistAsync } = schema;
-  const { idProperty, method, param, url } = persistAsync;
-  return { idProperty, method, param, url };
+  return localModel === incomingModel;
 };
-var getValueForPersistAsync = (localValue) => isArray(localValue) && localValue.every(isFile) ? localValue : [];
+var nonNullishKeys = (model) => Object.keys(model).filter((key) => !isNullish(model[key]));
 
-// src/revamp/domain/components/MultiSelectInputComponent.ts
-var createMultiSelectComponent = (multiSelectProps, updateComponent) => {
-  const _a = multiSelectProps, {
-    uid,
-    checks,
-    options,
-    initialValue,
-    performValidationAsync,
-    performRefresh,
-    onValueChange
-  } = _a, rest = __objRest(_a, [
-    "uid",
-    "checks",
-    "options",
-    "initialValue",
-    "performValidationAsync",
-    "performRefresh",
-    "onValueChange"
-  ]);
-  const update = getInputUpdateFunction(updateComponent);
+// src/revamp/domain/components/SelectInputComponent.ts
+var createSelectInputComponent = (selectProps, updateComponent) => {
+  const _a = selectProps, { uid, checks, initialModel, options, performRefresh, onValueChange, summariser } = _a, rest = __objRest(_a, ["uid", "checks", "initialModel", "options", "performRefresh", "onValueChange", "summariser"]);
   const children = options.map((option) => option.component);
-  const selectedIndices = getInitialModelIndices(initialValue, children);
+  const matchingOptions = options.map(
+    (option) => isPartialModelMatch(option.component.getSubmittableValueSync(), initialModel)
+  );
+  const selectedIndex = matchingOptions.filter((match) => match).length === 1 ? matchingOptions.indexOf(true) : null;
+  const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
-  const inputComponent = __spreadProps(__spreadValues({
+  const component = __spreadProps(__spreadValues({
     uid,
-    type: "multi-select",
+    type: "select",
     children,
     options,
-    selectedIndices,
+    selectedIndex,
     value: null
   }, rest), {
     _update(updateFn) {
       update(this, updateFn);
     },
-    onSelect(indices) {
-      this._update((draft) => {
-        draft.selectedIndices = indices;
-        draft.errors = [];
-      });
-      performRefresh == null ? void 0 : performRefresh();
-      onValueChange();
-      const errors = getValidationErrors(this.getLocalValue());
-      this._update((draft) => {
-        draft.errors = errors;
-      });
-    },
-    onBlur() {
+    getChildren() {
+      return this.children;
     },
-    // Noop
-    onFocus() {
+    getSelectedChild() {
+      return this.selectedIndex !== null ? this.children[this.selectedIndex] : null;
     },
-    // Noop
-    getLocalValue() {
+    async getSubmittableValue() {
       var _a2, _b;
-      return (_b = (_a2 = this.getSelectedChildren()) == null ? void 0 : _a2.map((child) => child.getLocalValue())) != null ? _b : null;
+      return (_b = await ((_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSubmittableValue())) != null ? _b : null;
     },
-    validate() {
-      const errors = getValidationErrors(this.getLocalValue());
-      this._update((draft) => {
-        draft.errors = errors;
-      });
-      return errors.length === 0;
+    getSubmittableValueSync() {
+      var _a2, _b;
+      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSubmittableValueSync()) != null ? _b : null;
     },
-    async getSubmittableValue() {
-      const selected = this.getSelectedChildren();
-      if (selected) {
-        return Promise.all(selected.map(async (child) => child.getSubmittableValue()));
-      }
-      return null;
+    getSummary() {
+      var _a2, _b;
+      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getSummary()) != null ? _b : {};
     },
-    getSubmittableValueSync() {
+    getLocalValue() {
       var _a2, _b;
-      return (_b = (_a2 = this.getSelectedChildren()) == null ? void 0 : _a2.map((child) => child.getSubmittableValueSync())) != null ? _b : null;
+      return (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.getLocalValue()) != null ? _b : null;
     },
-    getSummary: () => ({}),
-    getChildren() {
-      return this.children;
+    onBlur() {
+      this.validate();
     },
-    getSelectedChildren() {
-      return this.selectedIndices.map((i) => this.children[i]);
-    }
-  });
-  if (performRefresh) {
-    return inputComponent;
-  }
-  if (performValidationAsync) {
-    const validateAsync = getComponentValidationAsync(update, performValidationAsync);
-    return __spreadProps(__spreadValues({}, inputComponent), {
-      onSelect(indices) {
-        inputComponent.onSelect.call(this, indices);
-        if (this.validate()) {
-          validateAsync(this, this.getLocalValue()).catch(() => {
-          });
-        }
+    onFocus() {
+    },
+    // noop
+    onSelect(updatedIndex) {
+      if (updatedIndex === this.selectedIndex) {
+        return;
       }
-    });
-  }
-  return inputComponent;
-};
-var getInitialModelIndices = (model, options) => {
-  if (!isArray(model)) {
-    return [];
-  }
-  return model.map((m) => options.findIndex((o) => o.getLocalValue() === m)).filter((n) => n >= 0);
+      if (updatedIndex !== null && this.analyticsId) {
+        selectProps.trackEvent("OneOf Selected", {
+          oneOfId: this.analyticsId,
+          schemaId: this.children[updatedIndex].analyticsId
+        });
+      }
+      this._update((draft) => {
+        draft.errors = [];
+        draft.selectedIndex = updatedIndex;
+      });
+      performRefresh == null ? void 0 : performRefresh();
+      onValueChange();
+    },
+    validate() {
+      var _a2, _b;
+      const validChild = (_b = (_a2 = this.getSelectedChild()) == null ? void 0 : _a2.validate()) != null ? _b : true;
+      const errors = getValidationErrors(this.getLocalValue());
+      this._update((draft) => {
+        draft.errors = errors;
+      });
+      return errors.length === 0 && validChild;
+    }
+  });
+  return component;
 };
 
-// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToMultiSelectComponent.ts
-var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
+// src/revamp/domain/mappers/schema/oneOfSchemaToComponent/oneOfSchemaToComponent.ts
+var oneOfSchemaToComponent = (schemaMapperProps, mapperProps) => {
+  var _a;
   const {
     uid,
     localValue,
     schema,
     model,
-    required = false,
-    validationErrors: initialError
+    validationErrors: initialError,
+    required = false
   } = schemaMapperProps;
-  const initialModel = model != null ? model : null;
-  const options = schema.items.oneOf.map((childSchema, index) => {
-    const { title: title2 = "", description, image, icon, keywords = [] } = childSchema;
+  const initialModel = (_a = model != null ? model : schema.default) != null ? _a : null;
+  if (schema.oneOf.length === 1 && isFormSectionSchema(schema.oneOf[0])) {
+    return mapSchemaToComponent(
+      {
+        uid,
+        schema: supressSchemaTitleAndDescription(schema.oneOf[0]),
+        model: initialModel,
+        localValue,
+        validationErrors: initialError,
+        required
+      },
+      mapperProps
+    );
+  }
+  const options = schema.oneOf.map((childSchema, index) => {
+    const { title = "", description, image, icon, keywords = [] } = childSchema;
     return {
-      title: title2,
+      title,
       description,
       image: mapSpecImage(image),
       icon,
@@ -5009,7 +4909,7 @@ var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
       component: mapSchemaToComponent(
         {
           uid: `${uid}.oneOf-${index}`,
-          schema: childSchema,
+          schema: isFormSectionSchema(childSchema) ? supressSchemaTitleAndDescription(childSchema) : childSchema,
           model: initialModel,
           localValue,
           validationErrors: initialError,
@@ -5019,188 +4919,278 @@ var arraySchemaToMultiSelectComponent = (schemaMapperProps, mapperProps) => {
       )
     };
   });
-  const { maxItems, minItems, title, validationMessages } = schema;
-  const { getErrorMessageFunctions, onRefresh, onValueChange, updateComponent } = mapperProps;
+  const { getErrorMessageFunctions, updateComponent, trackEvent, onRefresh, onValueChange } = mapperProps;
+  const { validationMessages } = schema;
   const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
-  const { performValidationAsync, validationAsyncState } = getValidationAsyncInitialState(
-    schemaMapperProps,
-    mapperProps
-  );
-  const initialValue = model != null ? model : null;
-  return createMultiSelectComponent(
+  return createSelectInputComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      autoComplete: "off",
-      checks: schema.hidden ? [] : [
-        getRequiredCheck(required, errorMessageFunctions),
-        getAboveMaxItemsCheck(schema, errorMessageFunctions),
-        getBelowMinItemsCheck(schema, errorMessageFunctions)
-      ],
-      initialValue,
-      maxItems,
-      minItems,
+      autoComplete: getAutocompleteString(schema.autocompleteHint),
+      checks: schema.hidden ? [] : [getRequiredCheck(required, errorMessageFunctions)],
       options,
-      required,
-      title,
-      validationAsyncState,
-      performValidationAsync,
+      initialModel,
       performRefresh: getPerformRefresh(schema, onRefresh),
-      onValueChange
+      onValueChange,
+      trackEvent
     }),
     updateComponent
   );
 };
+var isFormSectionSchema = (schema) => isObjectSchema(schema) || isArrayTupleSchema(schema) || isAllOfSchema(schema);
+var supressSchemaTitleAndDescription = (schema) => {
+  const _a = schema, { title, description } = _a, headlessSchema = __objRest(_a, ["title", "description"]);
+  return headlessSchema;
+};
 
-// src/revamp/domain/components/TupleComponent.ts
-var createTupleComponent = (tupleProps) => {
-  const {
+// src/revamp/domain/components/DateInputComponent.ts
+var createDateInputComponent = (textInputProps, updateComponent) => {
+  const _a = textInputProps, {
     uid,
-    analyticsId,
-    components,
-    control,
-    description,
-    help,
-    hidden,
-    icon,
-    image,
+    id,
+    checks,
+    performPersistAsync,
+    performRefresh,
+    performValidationAsync,
+    onValueChange,
     summariser,
-    title
-  } = tupleProps;
-  return {
-    type: "tuple",
+    value
+  } = _a, rest = __objRest(_a, [
+    "uid",
+    "id",
+    "checks",
+    "performPersistAsync",
+    "performRefresh",
+    "performValidationAsync",
+    "onValueChange",
+    "summariser",
+    "value"
+  ]);
+  const update = getInputUpdateFunction(updateComponent);
+  const getValidationErrors = getLocalValueValidator(checks);
+  const dateInputComponent = __spreadValues({
+    type: "date",
     uid,
-    analyticsId,
-    components,
-    control,
-    description,
-    help,
-    hidden,
-    icon,
-    image,
-    title,
-    getChildren() {
-      return this.components;
+    id,
+    value,
+    _update(updateFn) {
+      update(this, updateFn);
+    },
+    onBlur() {
+      this.validate();
+    },
+    onFocus() {
+    },
+    // Noop
+    onChange(updatedValue) {
+      const prevValue = this.value;
+      this._update((draft) => {
+        draft.errors = [];
+        draft.validationAsyncState.messages = {};
+        draft.value = updatedValue;
+      });
+      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
+        performRefresh == null ? void 0 : performRefresh();
+      }
+      onValueChange();
     },
     async getSubmittableValue() {
-      return Promise.all(this.components.map(async (child) => child.getSubmittableValue()));
+      return this.getSubmittableValueSync();
     },
     getSubmittableValueSync() {
-      return this.components.map((child) => child.getSubmittableValueSync());
+      var _a2;
+      return (_a2 = this.getLocalValue()) != null ? _a2 : null;
     },
     getSummary() {
-      const summary = summariser(this.getLocalValue());
-      const childSummary = summariseFromChildren(this.getChildren());
-      return mergeSummaries(summary, childSummary);
+      return summariser(this.getLocalValue());
     },
     getLocalValue() {
-      return this.components.map((child) => child.getLocalValue());
+      return this.value;
     },
     validate() {
-      return hidden ? true : validateComponents(this.getChildren());
+      const errors = getValidationErrors(this.getLocalValue());
+      this._update((draft) => {
+        draft.errors = errors;
+      });
+      return errors.length === 0;
     }
-  };
+  }, rest);
+  if (performRefresh) {
+    return dateInputComponent;
+  }
+  if (performPersistAsync) {
+    const persist = getComponentPersistAsync(update, performPersistAsync);
+    return __spreadProps(__spreadValues({}, dateInputComponent), {
+      onChange(updatedValue) {
+        dateInputComponent.onChange.call(this, updatedValue);
+        const isValid = getValidationErrors(updatedValue).length === 0;
+        if (isValid) {
+          persist(this, this.getLocalValue()).catch(() => {
+          });
+        }
+      },
+      async getSubmittableValue() {
+        return persist(this, this.getLocalValue());
+      },
+      getSubmittableValueSync() {
+        return this.persistedState.lastResponse;
+      }
+    });
+  }
+  if (performValidationAsync) {
+    const validateAsync = getComponentValidationAsync(update, performValidationAsync);
+    return __spreadProps(__spreadValues({}, dateInputComponent), {
+      onBlur() {
+        if (this.validate()) {
+          validateAsync(this, this.getLocalValue()).catch(() => {
+          });
+        }
+      }
+    });
+  }
+  return dateInputComponent;
 };
 
-// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToTupleComponent.ts
-var arraySchemaToTupleComponent = (schemaMapperProps, mapperProps) => {
+// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToDateInputComponent.ts
+var stringSchemaToDateInputComponent = (schemaMapperProps, mapperProps) => {
+  const { schema, localValue, model, required = false } = schemaMapperProps;
   const {
-    uid,
-    localValue,
-    schema,
-    model: initialModel,
-    required = false,
-    validationErrors
-  } = schemaMapperProps;
-  const { items } = schema;
-  const components = items.map(
-    (childSchema, index) => {
-      var _a, _b;
-      return mapSchemaToComponent(
-        {
-          uid: `${uid}-arr.${index}`,
-          schema: childSchema,
-          model: isArray(initialModel) ? (_a = initialModel[index]) != null ? _a : null : null,
-          localValue: isArray(localValue) ? (_b = localValue[index]) != null ? _b : null : null,
-          validationErrors: isArray(validationErrors) ? validationErrors[index] : void 0,
-          required
-        },
-        mapperProps
-      );
-    }
+    autocompleteHint,
+    default: defaultValue,
+    minimum: minimumDate,
+    maximum: maximumDate,
+    suggestions
+  } = schema;
+  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
+  const errorMessageFunctions = getErrorMessageFunctions(schema.validationMessages);
+  const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
+    schemaMapperProps,
+    mapperProps
+  );
+  const { performValidationAsync, validationAsyncState } = getValidationAsyncInitialState(
+    schemaMapperProps,
+    mapperProps
+  );
+  const validLocalValue = isString(localValue) ? localValue : null;
+  const validModel = isString(model) ? model : defaultValue != null ? defaultValue : null;
+  const value = performPersistAsync ? validLocalValue : validModel;
+  return createDateInputComponent(
+    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+      autoComplete: getAutocompleteString(autocompleteHint),
+      checks: schema.hidden ? [] : [
+        getRequiredCheck(required, errorMessageFunctions),
+        getAboveMaximumDateCheck(schema, errorMessageFunctions),
+        getBelowMinimumDateCheck(schema, errorMessageFunctions)
+      ],
+      minimumDate,
+      maximumDate,
+      suggestions: suggestions ? {
+        values: suggestions.values.map((suggestion) => __spreadProps(__spreadValues({}, suggestion), {
+          image: mapSpecImage(suggestion.image)
+        }))
+      } : void 0,
+      value,
+      persistedState,
+      validationAsyncState,
+      performPersistAsync,
+      performRefresh: getPerformRefresh(schema, onRefresh),
+      performValidationAsync,
+      onValueChange
+    }),
+    updateComponent
   );
-  return createTupleComponent(__spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-    components
-  }));
 };
 
-// src/revamp/domain/mappers/schema/arraySchemaToComponent/arraySchemaToComponent.ts
-var arraySchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { schema, model: originalModel } = schemaMapperProps;
-  const model = isNullish(originalModel) || isArrayModel(originalModel) ? originalModel : null;
-  if (isArraySchemaListWithMultiFileUpload(schema)) {
-    return arraySchemaToMultiUploadComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
-  }
-  if (isArraySchemaListWithMultiSelect(schema)) {
-    return arraySchemaToMultiSelectComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
-  }
-  if (isArrayTupleSchema(schema)) {
-    return arraySchemaToTupleComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
-  }
-  return arraySchemaToRepeatableComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema, model }), mapperProps);
+// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToUploadInputComponent.ts
+var stringSchemaToUploadInputComponent = (schemaMapperProps, mapperProps) => {
+  var _a;
+  const { schema, localValue, model, required = false } = schemaMapperProps;
+  const { accepts, autocompleteHint, cameraConfig, hidden, maxSize, source, validationMessages } = schema;
+  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange } = mapperProps;
+  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
+  const { performPersistAsync } = getPersistAsyncInitialState(schemaMapperProps, mapperProps);
+  const persistedState = performPersistAsync ? getInitialPersistedState(null, model) : getInitialPersistedState();
+  const validLocalValue = isFile(localValue) ? localValue : null;
+  const value = (_a = getFileFromModel(model)) != null ? _a : validLocalValue;
+  const checks = hidden ? [] : [
+    getRequiredCheck(required, errorMessageFunctions),
+    getFileSizeCheck(schema, errorMessageFunctions),
+    getFileTypeCheck(schema, errorMessageFunctions)
+  ];
+  return createUploadInputComponent(
+    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
+      accepts,
+      autoComplete: getAutocompleteString(autocompleteHint),
+      cameraConfig,
+      checks,
+      format: "base64",
+      maxSize,
+      source,
+      value,
+      persistedState,
+      performPersistAsync,
+      performRefresh: getPerformRefresh(schema, onRefresh),
+      onValueChange
+    }),
+    updateComponent
+  );
 };
-var isArraySchemaListWithMultiFileUpload = (schema) => isArrayListSchema(schema) && (isPersistAsyncWithUploadSchema(schema.items) || isStringSchemaWithUpload(schema.items));
-var isPersistAsyncWithUploadSchema = (schema) => isSchemaWithPersistAsync(schema) && (isBlobSchema(schema.persistAsync.schema) || isStringSchemaWithUpload(schema.persistAsync.schema));
-var isArraySchemaListWithMultiSelect = (schema) => isArrayListSchema(schema) && "oneOf" in schema.items && schema.items.oneOf.every(isConstSchema);
+var getFileFromModel = (model) => isString(model) ? base64dataUrltoFile(model, "") : null;
 
-// src/revamp/domain/components/BooleanInputComponent.ts
-var createBooleanInputComponent = (booleanInputProps, updateComponent) => {
-  const _a = booleanInputProps, {
+// src/revamp/domain/components/TextInputComponent.ts
+var createTextInputComponent = (textInputProps, updateComponent) => {
+  const _a = textInputProps, {
     uid,
     id,
-    value,
+    checks,
     performPersistAsync,
     performRefresh,
     performValidationAsync,
     onValueChange,
-    summariser
+    summariser,
+    value
   } = _a, rest = __objRest(_a, [
     "uid",
     "id",
-    "value",
+    "checks",
     "performPersistAsync",
     "performRefresh",
     "performValidationAsync",
     "onValueChange",
-    "summariser"
+    "summariser",
+    "value"
   ]);
   const update = getInputUpdateFunction(updateComponent);
-  const booleanComponent = __spreadValues({
-    type: "boolean",
+  const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
+  const inputComponent = __spreadValues({
+    type: "text",
     uid,
     id,
-    autoComplete: "",
     value,
     _update(updateFn) {
       update(this, updateFn);
     },
     onBlur() {
+      this.validate();
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh.flush();
     },
-    // Noop
     onFocus() {
     },
     // Noop
     onChange(updatedValue) {
+      const prevValue = this.value;
       this._update((draft) => {
         draft.errors = [];
+        draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      performRefresh == null ? void 0 : performRefresh();
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
       return this.getSubmittableValueSync();
     },
     getSubmittableValueSync() {
-      return this.getLocalValue();
+      return this.getLocalValue() || null;
     },
     getSummary() {
       return summariser(this.getLocalValue());
@@ -5208,18 +5198,25 @@ var createBooleanInputComponent = (booleanInputProps, updateComponent) => {
     getLocalValue() {
       return this.value;
     },
-    validate: () => true
+    validate() {
+      const errors = getValidationErrors(this.getLocalValue());
+      this._update((draft) => {
+        draft.errors = errors;
+      });
+      return errors.length === 0;
+    }
   }, rest);
   if (performRefresh) {
-    return booleanComponent;
+    return inputComponent;
   }
   if (performPersistAsync) {
     const persist = getComponentPersistAsync(update, performPersistAsync);
-    return __spreadProps(__spreadValues({}, booleanComponent), {
-      onChange(updatedValue) {
-        booleanComponent.onChange.call(this, updatedValue);
-        persist(this, this.getLocalValue()).catch(() => {
-        });
+    return __spreadProps(__spreadValues({}, inputComponent), {
+      onBlur() {
+        if (this.validate()) {
+          persist(this, this.getLocalValue()).catch(() => {
+          });
+        }
       },
       async getSubmittableValue() {
         return persist(this, this.getLocalValue());
@@ -5230,24 +5227,45 @@ var createBooleanInputComponent = (booleanInputProps, updateComponent) => {
     });
   }
   if (performValidationAsync) {
-    const validateAsync = getComponentValidationAsync(update, performValidationAsync);
-    return __spreadProps(__spreadValues({}, booleanComponent), {
+    const validateAsync = getDebouncedComponentValidationAsync(update, performValidationAsync);
+    return __spreadProps(__spreadValues({}, inputComponent), {
+      onBlur() {
+        if (this.validate()) {
+          validateAsync.flush();
+        }
+      },
       onChange(updatedValue) {
-        booleanComponent.onChange.call(this, updatedValue);
-        validateAsync(this, this.getLocalValue()).catch(() => {
-        });
+        inputComponent.onChange.call(this, updatedValue);
+        if (getValidationErrors(updatedValue).length === 0) {
+          validateAsync(this, updatedValue);
+        }
+        if (!updatedValue) {
+          validateAsync.cancel();
+        }
       }
     });
   }
-  return booleanComponent;
+  return inputComponent;
 };
 
-// src/revamp/domain/mappers/schema/booleanSchemaToComponent.ts
-var booleanSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { schema, localValue, model } = schemaMapperProps;
-  const { default: defaultValue } = schema;
-  const { updateComponent, onRefresh, onValueChange } = mapperProps;
-  const performRefresh = getPerformRefresh(schema, onRefresh);
+// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToTextInputComponent.ts
+var stringSchemaToTextInputComponent = (schemaMapperProps, mapperProps) => {
+  const { schema, localValue, model, required = false } = schemaMapperProps;
+  const {
+    autocapitalization,
+    autocompleteHint,
+    control,
+    default: defaultValue,
+    displayFormat,
+    format,
+    maxLength,
+    minLength,
+    suggestions,
+    validationMessages
+  } = schema;
+  const { getErrorMessageFunctions, updateComponent, onRefresh, onValueChange, logEvent } = mapperProps;
+  const controlForLegacyFormat = getControlForLegacyFormat(format);
+  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
   const { performPersistAsync, persistedState } = getPersistAsyncInitialState(
     schemaMapperProps,
     mapperProps
@@ -5256,76 +5274,65 @@ var booleanSchemaToComponent = (schemaMapperProps, mapperProps) => {
     schemaMapperProps,
     mapperProps
   );
-  const validLocalValue = isBoolean(localValue) ? localValue : false;
-  const validModel = getValidModel(model, defaultValue);
+  const validLocalValue = isString(localValue) ? localValue : null;
+  const validModel = isString(model) ? model : defaultValue != null ? defaultValue : null;
   const value = performPersistAsync ? validLocalValue : validModel;
-  return createBooleanInputComponent(
+  return createTextInputComponent(
     __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      value: value != null ? value : false,
+      autocapitalization,
+      autoComplete: getAutocompleteString(autocompleteHint),
+      checks: schema.hidden ? [] : [
+        getRequiredCheck(required, errorMessageFunctions),
+        getAboveMaxLengthCheck(schema, errorMessageFunctions),
+        getBelowMinLengthCheck(schema, errorMessageFunctions),
+        getNotAdheringToPatternCheck(schema, errorMessageFunctions, { logEvent })
+      ],
+      control: control != null ? control : controlForLegacyFormat,
+      displayFormat,
+      maxLength,
+      minLength,
+      suggestions: suggestions ? {
+        values: suggestions.values.map((suggestion) => __spreadProps(__spreadValues({}, suggestion), {
+          image: mapSpecImage(suggestion.image)
+        }))
+      } : void 0,
+      value,
       persistedState,
       validationAsyncState,
       performPersistAsync,
-      performRefresh,
+      performRefresh: getPerformRefresh(schema, onRefresh),
       performValidationAsync,
       onValueChange
     }),
     updateComponent
   );
 };
-var getValidModel = (model, defaultValue) => {
-  if (isBoolean(model)) {
-    return model;
-  }
-  if (isBoolean(defaultValue)) {
-    return defaultValue;
+var getControlForLegacyFormat = (format) => {
+  if (format && ["numeric", "phone-number", "email", "password"].includes(format)) {
+    return format;
   }
-  return false;
+  return void 0;
 };
 
-// src/revamp/domain/mappers/schema/blobSchemaToComponent.ts
-var blobSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { schema, localValue, model, required = false } = schemaMapperProps;
-  const { accepts, cameraConfig, maxSize, source, validationMessages } = schema;
-  const { getErrorMessageFunctions, updateComponent, onValueChange } = mapperProps;
-  const errorMessageFunctions = getErrorMessageFunctions(validationMessages);
-  const { performPersistAsync } = getPersistAsyncInitialState(schemaMapperProps, mapperProps);
-  const persistedState = performPersistAsync ? getInitialPersistedState(null, model) : getInitialPersistedState();
-  const validLocalValue = isFile(localValue) ? localValue : null;
-  const value = performPersistAsync ? validLocalValue : null;
-  return createUploadInputComponent(
-    __spreadProps(__spreadValues({}, mapCommonSchemaProps(schemaMapperProps)), {
-      accepts,
-      autoComplete: "off",
-      cameraConfig,
-      format: "blob",
-      maxSize,
-      source,
-      value,
-      persistedState,
-      performPersistAsync,
-      checks: schema.hidden ? [] : [getRequiredCheck(required, errorMessageFunctions)],
-      onValueChange
-    }),
-    updateComponent
-  );
+// src/revamp/domain/mappers/schema/stringSchemaToComponent/stringSchemaToComponent.ts
+var stringSchemaToComponent = (schemaMapperProps, mapperProps) => {
+  const { schema } = schemaMapperProps;
+  if (isStringSchemaWithBase64(schema)) {
+    return stringSchemaToUploadInputComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { schema }), mapperProps);
+  }
+  switch (schema.format) {
+    case "date":
+      return stringSchemaToDateInputComponent(schemaMapperProps, mapperProps);
+    default:
+      return stringSchemaToTextInputComponent(schemaMapperProps, mapperProps);
+  }
+};
+var isStringSchemaWithBase64 = (schema) => {
+  return schema.format === "base64url" && !("persistAsync" in schema);
 };
 
 // src/revamp/domain/mappers/mapSchemaToComponent.ts
 var mapSchemaToComponent = (schemaMapperProps, mapperProps) => {
-  const { uid, schema } = schemaMapperProps;
-  const { alert } = schema;
-  if (alert) {
-    return createContainerComponent({
-      uid,
-      components: [
-        alertLayoutToComponent(`${uid}.container.alert`, alert, mapperProps),
-        getSchemaComponent(__spreadProps(__spreadValues({}, schemaMapperProps), { uid: `${uid}.container` }), mapperProps)
-      ]
-    });
-  }
-  return getSchemaComponent(schemaMapperProps, mapperProps);
-};
-var getSchemaComponent = (schemaMapperProps, mapperProps) => {
   const { uid, schema } = schemaMapperProps;
   if (isConstSchema(schema)) {
     return constSchemaToComponent(uid, __spreadProps(__spreadValues({}, schemaMapperProps), { schema }));