@wise/dynamic-flow-client 4.9.1 → 4.10.0

package/build/main.js

@@ -3124,36 +3124,51 @@ var createExternalConfirmation = (uid, url, updateComponent) => {
   };
 };
 
-// src/revamp/utils/component-utils.ts
-var getSubmittableData = async (components) => Promise.all(components.map(async (component) => component.getSubmittableValue())).then(
-  (values) => values.reduce((acc, value) => mergeModels(acc, value), null)
-);
-var getSubmittableDataSync = (components) => components.map((component) => component.getSubmittableValueSync()).reduce((acc, value) => mergeModels(acc, value), null);
-var getLocalValues = (components) => components.map((component) => component.getLocalValue()).reduce((acc, value) => mergeLocalValues(acc, value), null);
-var mergeLocalValues = (valueA, valueB) => {
+// src/revamp/utils/recursiveMerge.ts
+function recursiveMerge(valueA, valueB) {
   if (valueA === null) {
     return valueB;
   }
   if (valueB === null) {
     return valueA;
   }
-  if (isObjectLocalValue(valueA) && isObjectLocalValue(valueB)) {
-    return __spreadValues(__spreadValues({}, valueA), valueB);
+  if (isObject2(valueA) && isObject2(valueB)) {
+    return mergeObjects(valueA, valueB);
   }
-  return valueB;
-};
-var mergeModels = (valueA, valueB) => {
-  if (valueA === null) {
-    return valueB;
-  }
-  if (valueB === null) {
-    return valueA;
-  }
-  if (isObjectModel(valueA) && isObjectModel(valueB)) {
-    return __spreadValues(__spreadValues({}, valueA), valueB);
+  if (Array.isArray(valueA) && Array.isArray(valueB)) {
+    return mergeArrays(valueA, valueB);
   }
   return valueB;
-};
+}
+function isObject2(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) && !(value instanceof File);
+}
+function mergeObjects(valueA, valueB) {
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(valueA), ...Object.keys(valueB)]);
+  const entries = Array.from(allKeys).map((key) => {
+    var _a, _b;
+    const value = recursiveMerge((_a = valueA[key]) != null ? _a : null, (_b = valueB[key]) != null ? _b : null);
+    return [key, value];
+  });
+  return Object.fromEntries(entries);
+}
+function mergeArrays(valueA, valueB) {
+  const length = Math.max(valueA.length, valueB.length);
+  return Array.from(
+    { length },
+    (_, index) => {
+      var _a, _b;
+      return recursiveMerge((_a = valueA[index]) != null ? _a : null, (_b = valueB[index]) != null ? _b : null);
+    }
+  );
+}
+
+// src/revamp/utils/component-utils.ts
+var getSubmittableData = async (components) => Promise.all(components.map(async (component) => component.getSubmittableValue())).then(
+  (values) => values.reduce((acc, value) => recursiveMerge(acc, value), null)
+);
+var getSubmittableDataSync = (components) => components.map((component) => component.getSubmittableValueSync()).reduce((acc, value) => recursiveMerge(acc, value), null);
+var getLocalValues = (components) => components.map((component) => component.getLocalValue()).reduce((acc, value) => recursiveMerge(acc, value), null);
 
 // src/revamp/domain/components/step/StepDomainComponent.ts
 var createStepComponent = (stepProps) => {
@@ -4298,12 +4313,13 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
   const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
   const getFileValidationErrors = getLocalValueValidator(fileChecks);
+  const persist = performPersistAsync ? getComponentMultiPersistAsync(update, performPersistAsync) : void 0;
   const uploadComponent = __spreadValues({
     type: "multi-upload",
     kind: "input",
     uid,
     id,
-    format: "base64",
+    format,
     files: [],
     _update(updateFn) {
       update(this, updateFn);
@@ -4315,28 +4331,44 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
     },
     // Noop
     async onRemoveFile(index) {
+      var _a2;
       this._update((draft) => {
         draft.value.splice(index, 1);
         draft.files.splice(index, 1);
       });
+      if (persist) {
+        (_a2 = this.persistedState[index]) == null ? void 0 : _a2.abortController.abort();
+        this._update((draft) => {
+          draft.persistedState.splice(index, 1);
+        });
+      }
     },
     async onInsertFile(index, file) {
       const fileErrors = getFileValidationErrors(file);
       const fileId = getRandomId();
+      const base64Value = format === "base64" ? await toBase64(file) : null;
       this._update((draft) => {
         draft.value.splice(index, 0, file);
-        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors });
+        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors, base64Value });
         draft.errors = [];
       });
+      if (persist) {
+        await persist(this, index, format === "blob" ? file : base64Value);
+      }
       onValueChange();
       return fileId;
     },
     async getSubmittableValue() {
-      const files = this.getLocalValue();
-      return files ? Promise.all(files.map(toBase64)) : null;
+      if (persist) {
+        return Promise.all(this.persistedState.map(async ({ submission }) => submission));
+      }
+      return this.files.map(({ base64Value }) => base64Value);
     },
     getSubmittableValueSync() {
-      return null;
+      if (persist) {
+        return this.persistedState.map(({ lastResponse }) => lastResponse);
+      }
+      return this.files.map(({ base64Value }) => base64Value);
     },
     getSummary() {
       return summariser(this.getLocalValue().map(({ name }) => name));
@@ -4352,34 +4384,7 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
       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;
-    },
-    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);
-    }
-  });
+  return uploadComponent;
 };
 
 // src/revamp/domain/features/persistAsync/getInitialPersistedState.ts
@@ -6234,7 +6239,7 @@ var executeSubmission = async (props) => {
       if (method === "GET") {
         return void 0;
       }
-      const payload = mergeModels(model, (_a = action.data) != null ? _a : null);
+      const payload = recursiveMerge(model, (_a = action.data) != null ? _a : null);
       return payload !== null ? JSON.stringify(payload) : null;
     };
     const response = await getSafeHttpClient(httpClient)(url != null ? url : "", {
@@ -6255,7 +6260,7 @@ var executeSubmission = async (props) => {
       const responseType = await getResponseType(response);
       const body = await parseResponseBodyAsJsonElement(response);
       if (exit) {
-        return { type: "complete", result: mergeModels(body, result) };
+        return { type: "complete", result: recursiveMerge(body, result) };
       }
       switch (responseType) {
         case "step": {
@@ -6266,7 +6271,7 @@ var executeSubmission = async (props) => {
         }
         case "exit": {
           trackSubmissionEvent("Action Succeeded", { actionId });
-          return { type: "complete", result: mergeModels(body, result) };
+          return { type: "complete", result: recursiveMerge(body, result) };
         }
         case "action": {
           assertActionResponseBody(body);
@@ -7141,13 +7146,13 @@ var isInteger2 = (value) => {
   return isNumber2(value) && Math.floor(value) === value;
 };
 var isBoolean2 = (value) => typeof value === "boolean";
-var isObject2 = (value) => !isNull2(value) && !isUndefined2(value) && (value == null ? void 0 : value.constructor) === Object;
+var isObject3 = (value) => !isNull2(value) && !isUndefined2(value) && (value == null ? void 0 : value.constructor) === Object;
 var isArray2 = (value) => Array.isArray(value);
 var isNull2 = (value) => value === null;
 var isUndefined2 = (value) => typeof value === "undefined";
 
 // src/legacy/common/validators/values/value-validators.ts
-var isEmpty = (value) => isString2(value) && value.length === 0 || (isObject2(value) || isArray2(value)) && Object.keys(value).length === 0;
+var isEmpty = (value) => isString2(value) && value.length === 0 || (isObject3(value) || isArray2(value)) && Object.keys(value).length === 0;
 
 // src/legacy/common/validators/models/model-utils.ts
 function cleanBasicModelWithOneOfSchema(model, schema) {
@@ -7491,7 +7496,7 @@ function isValidConstSchema(value, schema) {
   return !getConstValidationFailures(value, schema).length;
 }
 function isValidObjectSchema(value, schema) {
-  if (!isObject2(value) || schema.type !== "object" || !isObject2(schema.properties)) {
+  if (!isObject3(value) || schema.type !== "object" || !isObject3(schema.properties)) {
     return false;
   }
   return Object.keys(schema.properties).map(
@@ -7512,7 +7517,7 @@ function isObjectPropertyValid(propertyValue, propertySchema, isRequired) {
   return isValidSchema(propertyValue, propertySchema);
 }
 function isValidArraySchema(value, schema) {
-  if (schema.type !== "array" || !isObject2(schema.items)) {
+  if (schema.type !== "array" || !isObject3(schema.items)) {
     return false;
   }
   if (getArrayValidationFailures(value, schema).length > 0) {
@@ -7680,7 +7685,7 @@ var isReadOnlySchema = (schema) => Boolean(schema.readOnly) && isBasicSchema(sch
 var isPromotedOneOfSchema = (schema) => Boolean(schema.oneOf) && Boolean(schema.promotion);
 var basicTypes = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean"]);
 function isBasicSchema(schema) {
-  return basicTypes.has(schema.type || "") || "const" in schema && schema.const !== void 0 && !isObject2(schema.const);
+  return basicTypes.has(schema.type || "") || "const" in schema && schema.const !== void 0 && !isObject3(schema.const);
 }
 function isObjectSchema2(schema) {
   return schema.type === "object";
@@ -8606,7 +8611,7 @@ function constructUploadResponse(response) {
 }
 function constructUploadError(response) {
   const isError = response instanceof Error;
-  const hasValidData = isObject2(response) && "data" in response;
+  const hasValidData = isObject3(response) && "data" in response;
   const isInvalidResponseData = !hasValidData && !isError;
   if (isInvalidResponseData) {
     return isString2(response) ? response : void 0;
@@ -9282,7 +9287,7 @@ function RepeatableSchema({
   const [openModalType, setOpenModalType] = (0, import_react19.useState)(null);
   const [changed, setChanged] = (0, import_react19.useState)(false);
   const [itemSummaries, setItemSummaries] = (0, import_react19.useState)(() => {
-    if (isObject2(model) && !isArray2(model)) {
+    if (isObject3(model) && !isArray2(model)) {
       throw new Error(
         "RepeatableSchema does not support object models. Ensure your array schema is wrapped inside an object schema."
       );
@@ -9581,7 +9586,7 @@ var getSafeStringValue = (value, options = {}) => {
   if (isNull2(value)) {
     return void 0;
   }
-  if (isObject2(value)) {
+  if (isObject3(value)) {
     logInvalidTypeFallbackWarning({ received: "object", expected: "string" });
     return void 0;
   }
@@ -9604,7 +9609,7 @@ var getSafeStringOrNumberValue = (value, options = {}) => {
     return value;
   }
   const logProps = { received: typeof value, expected: "string or number" };
-  if (isObject2(value)) {
+  if (isObject3(value)) {
     logInvalidTypeFallbackWarning(logProps);
     return void 0;
   }
@@ -10657,7 +10662,7 @@ function PersistAsyncBlobSchema(props) {
 }
 var getResponseJsonObject = async (response) => {
   const json = await response.json().catch(() => ({}));
-  return isObject2(json) ? json : {};
+  return isObject3(json) ? json : {};
 };
 var PersistAsyncBlobSchema_default = PersistAsyncBlobSchema;
 
@@ -10921,7 +10926,7 @@ function ValidationAsyncSchema(props) {
     });
     try {
       const jsonResponse = await response.json();
-      if (!isObject2(jsonResponse)) {
+      if (!isObject3(jsonResponse)) {
         throw new Error("Response body is not an object");
       }
       onEvent("Dynamic Flow - ValidationAsync", { status: "success" });
@@ -11692,8 +11697,8 @@ var useSearch = (defaultSearchConfig) => {
   const results = state.status === "success" ? state.results : [];
   return { status: state.status, results, search };
 };
-var isValidResponseBody2 = (body) => isObject2(body) && "results" in body && isArray2(body.results) && body.results.every(
-  (result) => isObject2(result) && "title" in result && "type" in result && "value" in result
+var isValidResponseBody2 = (body) => isObject3(body) && "results" in body && isArray2(body.results) && body.results.every(
+  (result) => isObject3(result) && "title" in result && "type" in result && "value" in result
 );
 var isAbortError = (error) => error instanceof DOMException && error.name === "AbortError";
 var addQueryParameter2 = (url, key, value) => {
@@ -12032,7 +12037,7 @@ function PersistAsyncBasicSchema(props) {
       onPersistAsync(persistAsyncFetch);
       const response = await persistAsyncFetch;
       const responseBody = await response.json();
-      if (!isObject2(responseBody)) {
+      if (!isObject3(responseBody)) {
         throw new Error("Response is not an object");
       }
       const { idProperty, param } = schema.persistAsync;
@@ -12041,7 +12046,7 @@ function PersistAsyncBasicSchema(props) {
         onChange({ model: id, triggerSchema: schema, triggerModel: id });
       } else if (!response.ok) {
         const { validation } = responseBody;
-        const error = isObject2(validation) && (validation == null ? void 0 : validation[param]) || null;
+        const error = isObject3(validation) && (validation == null ? void 0 : validation[param]) || null;
         setPersistAsyncError(error);
         onChange({ model: null, triggerSchema: schema, triggerModel: null });
       } else {
@@ -12131,7 +12136,7 @@ var usePersistAsync = (persistAsync) => {
         return handleHTTPError(response);
       }
       const jsonResponse = await response.json();
-      if (isObject2(jsonResponse)) {
+      if (isObject3(jsonResponse)) {
         const id = jsonResponse[persistAsync.idProperty];
         if (isString2(id) || isNumber2(id)) {
           return { data: id };
@@ -12144,7 +12149,7 @@ var usePersistAsync = (persistAsync) => {
   }
   async function handleHTTPError(response) {
     const jsonResponse = await response.json();
-    if (isObject2(jsonResponse)) {
+    if (isObject3(jsonResponse)) {
       const error = getErrorFromResponse(persistAsync.param, jsonResponse);
       if (isString2(error)) {
         throw new Error(error);
@@ -12166,7 +12171,7 @@ function wrapInFormData2(key, value) {
   return formData;
 }
 function hasStringMessage(value) {
-  return isObject2(value) && "message" in value && typeof value.message === "string";
+  return isObject3(value) && "message" in value && typeof value.message === "string";
 }
 
 // src/legacy/common/hooks/usePolling/usePolling.tsx
@@ -13605,7 +13610,7 @@ var parseFetchResponseByResponseType = async (response, type) => {
 };
 var parseStepResponse = async (response) => {
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in response. Expected an object.");
   }
   const etag = response.headers.get("etag") || void 0;
@@ -13613,16 +13618,16 @@ var parseStepResponse = async (response) => {
 };
 var parseActionResponse = async (response) => {
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in response. Expected an object.");
   }
-  if (!isObject2(jsonBody.action)) {
+  if (!isObject3(jsonBody.action)) {
     throw new Error(
       "Incorrect response body in action response. Expected an object satisfying the type { action: Action }."
     );
   }
   const action = jsonBody.action;
-  if (action.exit === true && isObject2(action.result)) {
+  if (action.exit === true && isObject3(action.result)) {
     return { type: "exit", result: action.result };
   }
   return { type: "action", action: jsonBody.action };
@@ -13639,7 +13644,7 @@ var parseFetchResponse = async (response) => {
     return parseExitResponse(response);
   }
   const jsonBody = await parseResponseJson(response.clone());
-  if (isObject2(jsonBody) && jsonBody.action) {
+  if (isObject3(jsonBody) && jsonBody.action) {
     return parseActionResponse(response);
   }
   return parseStepResponse(response);
@@ -13647,7 +13652,7 @@ var parseFetchResponse = async (response) => {
 var parseErrorResponse = async (response) => {
   assertResponseIsValid2(response);
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in error response. Expected an object.");
   }
   if (!jsonBody.refreshFormUrl && !jsonBody.refreshUrl && !jsonBody.validation && !jsonBody.error) {
@@ -13658,7 +13663,7 @@ var parseErrorResponse = async (response) => {
 var getJsonObjectOrNull = async (response) => {
   assertResponseIsValid2(response);
   const result = await parseResponseJson(response);
-  return isObject2(result) ? result : null;
+  return isObject3(result) ? result : null;
 };
 var parseResponseJson = async (response) => {
   try {
@@ -13847,7 +13852,7 @@ var DynamicFlowComponent = ({
         void performAction(result.action, result.action.data);
       } else if (result.type === "exit") {
         dispatchEventAndComplete(
-          isObject2(actionResult) ? __spreadValues(__spreadValues({}, result.result), actionResult) : result.result
+          isObject3(actionResult) ? __spreadValues(__spreadValues({}, result.result), actionResult) : result.result
         );
       } else {
         updateStep(result.step, result.etag, fetchType);

package/build/main.mjs

@@ -3081,36 +3081,51 @@ var createExternalConfirmation = (uid, url, updateComponent) => {
   };
 };
 
-// src/revamp/utils/component-utils.ts
-var getSubmittableData = async (components) => Promise.all(components.map(async (component) => component.getSubmittableValue())).then(
-  (values) => values.reduce((acc, value) => mergeModels(acc, value), null)
-);
-var getSubmittableDataSync = (components) => components.map((component) => component.getSubmittableValueSync()).reduce((acc, value) => mergeModels(acc, value), null);
-var getLocalValues = (components) => components.map((component) => component.getLocalValue()).reduce((acc, value) => mergeLocalValues(acc, value), null);
-var mergeLocalValues = (valueA, valueB) => {
+// src/revamp/utils/recursiveMerge.ts
+function recursiveMerge(valueA, valueB) {
   if (valueA === null) {
     return valueB;
   }
   if (valueB === null) {
     return valueA;
   }
-  if (isObjectLocalValue(valueA) && isObjectLocalValue(valueB)) {
-    return __spreadValues(__spreadValues({}, valueA), valueB);
+  if (isObject2(valueA) && isObject2(valueB)) {
+    return mergeObjects(valueA, valueB);
   }
-  return valueB;
-};
-var mergeModels = (valueA, valueB) => {
-  if (valueA === null) {
-    return valueB;
-  }
-  if (valueB === null) {
-    return valueA;
-  }
-  if (isObjectModel(valueA) && isObjectModel(valueB)) {
-    return __spreadValues(__spreadValues({}, valueA), valueB);
+  if (Array.isArray(valueA) && Array.isArray(valueB)) {
+    return mergeArrays(valueA, valueB);
   }
   return valueB;
-};
+}
+function isObject2(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) && !(value instanceof File);
+}
+function mergeObjects(valueA, valueB) {
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(valueA), ...Object.keys(valueB)]);
+  const entries = Array.from(allKeys).map((key) => {
+    var _a, _b;
+    const value = recursiveMerge((_a = valueA[key]) != null ? _a : null, (_b = valueB[key]) != null ? _b : null);
+    return [key, value];
+  });
+  return Object.fromEntries(entries);
+}
+function mergeArrays(valueA, valueB) {
+  const length = Math.max(valueA.length, valueB.length);
+  return Array.from(
+    { length },
+    (_, index) => {
+      var _a, _b;
+      return recursiveMerge((_a = valueA[index]) != null ? _a : null, (_b = valueB[index]) != null ? _b : null);
+    }
+  );
+}
+
+// src/revamp/utils/component-utils.ts
+var getSubmittableData = async (components) => Promise.all(components.map(async (component) => component.getSubmittableValue())).then(
+  (values) => values.reduce((acc, value) => recursiveMerge(acc, value), null)
+);
+var getSubmittableDataSync = (components) => components.map((component) => component.getSubmittableValueSync()).reduce((acc, value) => recursiveMerge(acc, value), null);
+var getLocalValues = (components) => components.map((component) => component.getLocalValue()).reduce((acc, value) => recursiveMerge(acc, value), null);
 
 // src/revamp/domain/components/step/StepDomainComponent.ts
 var createStepComponent = (stepProps) => {
@@ -4255,12 +4270,13 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
   const update = getInputUpdateFunction(updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
   const getFileValidationErrors = getLocalValueValidator(fileChecks);
+  const persist = performPersistAsync ? getComponentMultiPersistAsync(update, performPersistAsync) : void 0;
   const uploadComponent = __spreadValues({
     type: "multi-upload",
     kind: "input",
     uid,
     id,
-    format: "base64",
+    format,
     files: [],
     _update(updateFn) {
       update(this, updateFn);
@@ -4272,28 +4288,44 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
     },
     // Noop
     async onRemoveFile(index) {
+      var _a2;
       this._update((draft) => {
         draft.value.splice(index, 1);
         draft.files.splice(index, 1);
       });
+      if (persist) {
+        (_a2 = this.persistedState[index]) == null ? void 0 : _a2.abortController.abort();
+        this._update((draft) => {
+          draft.persistedState.splice(index, 1);
+        });
+      }
     },
     async onInsertFile(index, file) {
       const fileErrors = getFileValidationErrors(file);
       const fileId = getRandomId();
+      const base64Value = format === "base64" ? await toBase64(file) : null;
       this._update((draft) => {
         draft.value.splice(index, 0, file);
-        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors });
+        draft.files.splice(index, 0, { file, id: fileId, errors: fileErrors, base64Value });
         draft.errors = [];
       });
+      if (persist) {
+        await persist(this, index, format === "blob" ? file : base64Value);
+      }
       onValueChange();
       return fileId;
     },
     async getSubmittableValue() {
-      const files = this.getLocalValue();
-      return files ? Promise.all(files.map(toBase64)) : null;
+      if (persist) {
+        return Promise.all(this.persistedState.map(async ({ submission }) => submission));
+      }
+      return this.files.map(({ base64Value }) => base64Value);
     },
     getSubmittableValueSync() {
-      return null;
+      if (persist) {
+        return this.persistedState.map(({ lastResponse }) => lastResponse);
+      }
+      return this.files.map(({ base64Value }) => base64Value);
     },
     getSummary() {
       return summariser(this.getLocalValue().map(({ name }) => name));
@@ -4309,34 +4341,7 @@ var createMultiUploadInputComponent = (uploadInputProps, updateComponent) => {
       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;
-    },
-    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);
-    }
-  });
+  return uploadComponent;
 };
 
 // src/revamp/domain/features/persistAsync/getInitialPersistedState.ts
@@ -6191,7 +6196,7 @@ var executeSubmission = async (props) => {
       if (method === "GET") {
         return void 0;
       }
-      const payload = mergeModels(model, (_a = action.data) != null ? _a : null);
+      const payload = recursiveMerge(model, (_a = action.data) != null ? _a : null);
       return payload !== null ? JSON.stringify(payload) : null;
     };
     const response = await getSafeHttpClient(httpClient)(url != null ? url : "", {
@@ -6212,7 +6217,7 @@ var executeSubmission = async (props) => {
       const responseType = await getResponseType(response);
       const body = await parseResponseBodyAsJsonElement(response);
       if (exit) {
-        return { type: "complete", result: mergeModels(body, result) };
+        return { type: "complete", result: recursiveMerge(body, result) };
       }
       switch (responseType) {
         case "step": {
@@ -6223,7 +6228,7 @@ var executeSubmission = async (props) => {
         }
         case "exit": {
           trackSubmissionEvent("Action Succeeded", { actionId });
-          return { type: "complete", result: mergeModels(body, result) };
+          return { type: "complete", result: recursiveMerge(body, result) };
         }
         case "action": {
           assertActionResponseBody(body);
@@ -7098,13 +7103,13 @@ var isInteger2 = (value) => {
   return isNumber2(value) && Math.floor(value) === value;
 };
 var isBoolean2 = (value) => typeof value === "boolean";
-var isObject2 = (value) => !isNull2(value) && !isUndefined2(value) && (value == null ? void 0 : value.constructor) === Object;
+var isObject3 = (value) => !isNull2(value) && !isUndefined2(value) && (value == null ? void 0 : value.constructor) === Object;
 var isArray2 = (value) => Array.isArray(value);
 var isNull2 = (value) => value === null;
 var isUndefined2 = (value) => typeof value === "undefined";
 
 // src/legacy/common/validators/values/value-validators.ts
-var isEmpty = (value) => isString2(value) && value.length === 0 || (isObject2(value) || isArray2(value)) && Object.keys(value).length === 0;
+var isEmpty = (value) => isString2(value) && value.length === 0 || (isObject3(value) || isArray2(value)) && Object.keys(value).length === 0;
 
 // src/legacy/common/validators/models/model-utils.ts
 function cleanBasicModelWithOneOfSchema(model, schema) {
@@ -7448,7 +7453,7 @@ function isValidConstSchema(value, schema) {
   return !getConstValidationFailures(value, schema).length;
 }
 function isValidObjectSchema(value, schema) {
-  if (!isObject2(value) || schema.type !== "object" || !isObject2(schema.properties)) {
+  if (!isObject3(value) || schema.type !== "object" || !isObject3(schema.properties)) {
     return false;
   }
   return Object.keys(schema.properties).map(
@@ -7469,7 +7474,7 @@ function isObjectPropertyValid(propertyValue, propertySchema, isRequired) {
   return isValidSchema(propertyValue, propertySchema);
 }
 function isValidArraySchema(value, schema) {
-  if (schema.type !== "array" || !isObject2(schema.items)) {
+  if (schema.type !== "array" || !isObject3(schema.items)) {
     return false;
   }
   if (getArrayValidationFailures(value, schema).length > 0) {
@@ -7637,7 +7642,7 @@ var isReadOnlySchema = (schema) => Boolean(schema.readOnly) && isBasicSchema(sch
 var isPromotedOneOfSchema = (schema) => Boolean(schema.oneOf) && Boolean(schema.promotion);
 var basicTypes = /* @__PURE__ */ new Set(["string", "number", "integer", "boolean"]);
 function isBasicSchema(schema) {
-  return basicTypes.has(schema.type || "") || "const" in schema && schema.const !== void 0 && !isObject2(schema.const);
+  return basicTypes.has(schema.type || "") || "const" in schema && schema.const !== void 0 && !isObject3(schema.const);
 }
 function isObjectSchema2(schema) {
   return schema.type === "object";
@@ -8566,7 +8571,7 @@ function constructUploadResponse(response) {
 }
 function constructUploadError(response) {
   const isError = response instanceof Error;
-  const hasValidData = isObject2(response) && "data" in response;
+  const hasValidData = isObject3(response) && "data" in response;
   const isInvalidResponseData = !hasValidData && !isError;
   if (isInvalidResponseData) {
     return isString2(response) ? response : void 0;
@@ -9242,7 +9247,7 @@ function RepeatableSchema({
   const [openModalType, setOpenModalType] = useState8(null);
   const [changed, setChanged] = useState8(false);
   const [itemSummaries, setItemSummaries] = useState8(() => {
-    if (isObject2(model) && !isArray2(model)) {
+    if (isObject3(model) && !isArray2(model)) {
       throw new Error(
         "RepeatableSchema does not support object models. Ensure your array schema is wrapped inside an object schema."
       );
@@ -9553,7 +9558,7 @@ var getSafeStringValue = (value, options = {}) => {
   if (isNull2(value)) {
     return void 0;
   }
-  if (isObject2(value)) {
+  if (isObject3(value)) {
     logInvalidTypeFallbackWarning({ received: "object", expected: "string" });
     return void 0;
   }
@@ -9576,7 +9581,7 @@ var getSafeStringOrNumberValue = (value, options = {}) => {
     return value;
   }
   const logProps = { received: typeof value, expected: "string or number" };
-  if (isObject2(value)) {
+  if (isObject3(value)) {
     logInvalidTypeFallbackWarning(logProps);
     return void 0;
   }
@@ -10629,7 +10634,7 @@ function PersistAsyncBlobSchema(props) {
 }
 var getResponseJsonObject = async (response) => {
   const json = await response.json().catch(() => ({}));
-  return isObject2(json) ? json : {};
+  return isObject3(json) ? json : {};
 };
 var PersistAsyncBlobSchema_default = PersistAsyncBlobSchema;
 
@@ -10893,7 +10898,7 @@ function ValidationAsyncSchema(props) {
     });
     try {
       const jsonResponse = await response.json();
-      if (!isObject2(jsonResponse)) {
+      if (!isObject3(jsonResponse)) {
         throw new Error("Response body is not an object");
       }
       onEvent("Dynamic Flow - ValidationAsync", { status: "success" });
@@ -11664,8 +11669,8 @@ var useSearch = (defaultSearchConfig) => {
   const results = state.status === "success" ? state.results : [];
   return { status: state.status, results, search };
 };
-var isValidResponseBody2 = (body) => isObject2(body) && "results" in body && isArray2(body.results) && body.results.every(
-  (result) => isObject2(result) && "title" in result && "type" in result && "value" in result
+var isValidResponseBody2 = (body) => isObject3(body) && "results" in body && isArray2(body.results) && body.results.every(
+  (result) => isObject3(result) && "title" in result && "type" in result && "value" in result
 );
 var isAbortError = (error) => error instanceof DOMException && error.name === "AbortError";
 var addQueryParameter2 = (url, key, value) => {
@@ -12004,7 +12009,7 @@ function PersistAsyncBasicSchema(props) {
       onPersistAsync(persistAsyncFetch);
       const response = await persistAsyncFetch;
       const responseBody = await response.json();
-      if (!isObject2(responseBody)) {
+      if (!isObject3(responseBody)) {
         throw new Error("Response is not an object");
       }
       const { idProperty, param } = schema.persistAsync;
@@ -12013,7 +12018,7 @@ function PersistAsyncBasicSchema(props) {
         onChange({ model: id, triggerSchema: schema, triggerModel: id });
       } else if (!response.ok) {
         const { validation } = responseBody;
-        const error = isObject2(validation) && (validation == null ? void 0 : validation[param]) || null;
+        const error = isObject3(validation) && (validation == null ? void 0 : validation[param]) || null;
         setPersistAsyncError(error);
         onChange({ model: null, triggerSchema: schema, triggerModel: null });
       } else {
@@ -12103,7 +12108,7 @@ var usePersistAsync = (persistAsync) => {
         return handleHTTPError(response);
       }
       const jsonResponse = await response.json();
-      if (isObject2(jsonResponse)) {
+      if (isObject3(jsonResponse)) {
         const id = jsonResponse[persistAsync.idProperty];
         if (isString2(id) || isNumber2(id)) {
           return { data: id };
@@ -12116,7 +12121,7 @@ var usePersistAsync = (persistAsync) => {
   }
   async function handleHTTPError(response) {
     const jsonResponse = await response.json();
-    if (isObject2(jsonResponse)) {
+    if (isObject3(jsonResponse)) {
       const error = getErrorFromResponse(persistAsync.param, jsonResponse);
       if (isString2(error)) {
         throw new Error(error);
@@ -12138,7 +12143,7 @@ function wrapInFormData2(key, value) {
   return formData;
 }
 function hasStringMessage(value) {
-  return isObject2(value) && "message" in value && typeof value.message === "string";
+  return isObject3(value) && "message" in value && typeof value.message === "string";
 }
 
 // src/legacy/common/hooks/usePolling/usePolling.tsx
@@ -13577,7 +13582,7 @@ var parseFetchResponseByResponseType = async (response, type) => {
 };
 var parseStepResponse = async (response) => {
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in response. Expected an object.");
   }
   const etag = response.headers.get("etag") || void 0;
@@ -13585,16 +13590,16 @@ var parseStepResponse = async (response) => {
 };
 var parseActionResponse = async (response) => {
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in response. Expected an object.");
   }
-  if (!isObject2(jsonBody.action)) {
+  if (!isObject3(jsonBody.action)) {
     throw new Error(
       "Incorrect response body in action response. Expected an object satisfying the type { action: Action }."
     );
   }
   const action = jsonBody.action;
-  if (action.exit === true && isObject2(action.result)) {
+  if (action.exit === true && isObject3(action.result)) {
     return { type: "exit", result: action.result };
   }
   return { type: "action", action: jsonBody.action };
@@ -13611,7 +13616,7 @@ var parseFetchResponse = async (response) => {
     return parseExitResponse(response);
   }
   const jsonBody = await parseResponseJson(response.clone());
-  if (isObject2(jsonBody) && jsonBody.action) {
+  if (isObject3(jsonBody) && jsonBody.action) {
     return parseActionResponse(response);
   }
   return parseStepResponse(response);
@@ -13619,7 +13624,7 @@ var parseFetchResponse = async (response) => {
 var parseErrorResponse = async (response) => {
   assertResponseIsValid2(response);
   const jsonBody = await parseResponseJson(response);
-  if (!isObject2(jsonBody)) {
+  if (!isObject3(jsonBody)) {
     throw new Error("Incorrect response body in error response. Expected an object.");
   }
   if (!jsonBody.refreshFormUrl && !jsonBody.refreshUrl && !jsonBody.validation && !jsonBody.error) {
@@ -13630,7 +13635,7 @@ var parseErrorResponse = async (response) => {
 var getJsonObjectOrNull = async (response) => {
   assertResponseIsValid2(response);
   const result = await parseResponseJson(response);
-  return isObject2(result) ? result : null;
+  return isObject3(result) ? result : null;
 };
 var parseResponseJson = async (response) => {
   try {
@@ -13819,7 +13824,7 @@ var DynamicFlowComponent = ({
         void performAction(result.action, result.action.data);
       } else if (result.type === "exit") {
         dispatchEventAndComplete(
-          isObject2(actionResult) ? __spreadValues(__spreadValues({}, result.result), actionResult) : result.result
+          isObject3(actionResult) ? __spreadValues(__spreadValues({}, result.result), actionResult) : result.result
         );
       } else {
         updateStep(result.step, result.etag, fetchType);

package/build/types/revamp/domain/components/MultiUploadInputComponent.d.ts

@@ -11,6 +11,7 @@ export type MultiUploadInputComponent = BaseInputComponent<File[]> & {
         file: File;
         errors: string[];
         id: string;
+        base64Value: string | null;
     }[];
     format: 'blob' | 'base64';
     maxItems?: number;

package/build/types/revamp/domain/mappers/schema/oneOfSchemaToComponent/oneOfSchemaToComponent.d.ts

@@ -256,6 +256,7 @@ export declare const oneOfSchemaToComponent: (schemaMapperProps: SchemaMapperPro
         file: File;
         errors: string[];
         id: string;
+        base64Value: string | null;
     }[];
     format: "blob" | "base64";
     maxItems?: number;

package/build/types/revamp/domain/mappers/schema/persistAsyncSchemaToComponent.d.ts

@@ -230,6 +230,7 @@ export declare const persistAsyncSchemaToComponent: (schemaMapperProps: SchemaMa
         file: File;
         errors: string[];
         id: string;
+        base64Value: string | null;
     }[];
     format: "blob" | "base64";
     maxItems?: number;

package/build/types/revamp/test-utils/DynamicFlowWise.d.ts

@@ -1,5 +1,5 @@
-import { DynamicFlowCorePropsWithInitialAction, DynamicFlowCorePropsWithInitialStep } from '../types';
 import { Theming } from '@wise/components-theming';
+import { DynamicFlowCorePropsWithInitialAction, DynamicFlowCorePropsWithInitialStep } from '../types';
 type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 export type DynamicFlowWisePropsWithInitialAction = MakeOptional<DynamicFlowCorePropsWithInitialAction, 'renderers' | 'onLink'>;
 export type DynamicFlowWisePropsWithInitialStep = MakeOptional<DynamicFlowCorePropsWithInitialStep, 'renderers' | 'onLink'>;

package/build/types/revamp/utils/component-utils.d.ts

@@ -1,7 +1,5 @@
-import type { Model } from '@wise/dynamic-flow-types/build/next';
-import type { SchemaComponent, LocalValue } from '../domain/types';
-export declare const getSubmittableData: (components: SchemaComponent[]) => Promise<Model>;
-export declare const getSubmittableDataSync: (components: SchemaComponent[]) => Model;
+import type { JsonElement } from '@wise/dynamic-flow-types/build/next';
+import type { LocalValue, SchemaComponent } from '../domain/types';
+export declare const getSubmittableData: (components: SchemaComponent[]) => Promise<JsonElement>;
+export declare const getSubmittableDataSync: (components: SchemaComponent[]) => JsonElement;
 export declare const getLocalValues: (components: SchemaComponent[]) => LocalValue;
-export declare const mergeLocalValues: (valueA: LocalValue, valueB: LocalValue) => LocalValue;
-export declare const mergeModels: (valueA: Model, valueB: Model) => Model;

package/build/types/revamp/utils/recursiveMerge.d.ts

@@ -0,0 +1,11 @@
+import { LocalValue } from '../domain/types';
+/**
+ * Recursively merges two local values.
+ * If both values are objects, it merges their properties.
+ * If both values are arrays, it merges their elements.
+ * Otherwise, it returns the second value.
+ *
+ * This function works with both LocalValue and JsonElement types.
+ * But, only because JsonElement is assignable to LocalValue.
+ */
+export declare function recursiveMerge<T extends LocalValue>(valueA: T, valueB: T): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise/dynamic-flow-client",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "description": "Dynamic Flow web client",
   "license": "Apache-2.0",
   "main": "./build/main.js",
@@ -30,38 +30,38 @@
     "url": "git+https://github.com/transferwise/dynamic-flow.git"
   },
   "devDependencies": {
-    "@babel/core": "7.27.7",
+    "@babel/core": "7.28.0",
     "@babel/plugin-syntax-flow": "7.27.1",
     "@babel/plugin-transform-react-jsx": "7.27.1",
-    "@babel/preset-env": "7.27.2",
+    "@babel/preset-env": "7.28.0",
     "@babel/preset-react": "7.27.1",
     "@babel/preset-typescript": "7.27.1",
     "@chromatic-com/storybook": "4.0.1",
     "@formatjs/cli": "^6.7.2",
-    "@storybook/addon-a11y": "^9.0.15",
-    "@storybook/addon-docs": "^9.0.15",
-    "@storybook/addon-links": "^9.0.15",
-    "@storybook/react-vite": "9.0.15",
+    "@storybook/addon-a11y": "^9.0.18",
+    "@storybook/addon-docs": "^9.0.18",
+    "@storybook/addon-links": "^9.0.18",
+    "@storybook/react-vite": "9.0.18",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.3.0",
     "@testing-library/user-event": "14.6.1",
     "@transferwise/components": "46.100.1",
-    "@transferwise/formatting": "^2.13.3",
+    "@transferwise/formatting": "^2.13.4",
     "@transferwise/icons": "3.22.3",
     "@transferwise/neptune-css": "14.24.5",
-    "@types/jest": "29.5.14",
-    "@types/node": "22.15.34",
+    "@types/jest": "30.0.0",
+    "@types/node": "22.16.5",
     "@types/react": "18.3.23",
     "@types/react-dom": "18.3.7",
     "@types/react-intl": "3.0.0",
     "@wise/art": "2.23.0",
     "@wise/components-theming": "^1.6.4",
-    "babel-jest": "30.0.2",
-    "esbuild": "0.25.5",
-    "eslint-plugin-storybook": "9.0.15",
-    "jest": "30.0.3",
-    "jest-environment-jsdom": "30.0.2",
+    "babel-jest": "30.0.5",
+    "esbuild": "0.25.8",
+    "eslint-plugin-storybook": "9.0.18",
+    "jest": "30.0.5",
+    "jest-environment-jsdom": "30.0.5",
     "jest-fetch-mock": "^3.0.3",
     "jest-watch-typeahead": "^3.0.1",
     "npm-run-all2": "7.0.2",
@@ -71,15 +71,15 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-intl": "6.8.9",
-    "storybook": "^9.0.15",
-    "stylelint": "16.21.0",
+    "storybook": "^9.0.18",
+    "stylelint": "16.22.0",
     "stylelint-config-standard": "36.0.1",
     "stylelint-no-unsupported-browser-features": "8.0.4",
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "tsx": "4.20.3",
     "typescript": "5.8.3",
-    "@wise/dynamic-flow-fixtures": "0.0.1",
-    "@wise/dynamic-flow-renderers": "0.0.0"
+    "@wise/dynamic-flow-renderers": "0.0.0",
+    "@wise/dynamic-flow-fixtures": "0.0.1"
   },
   "peerDependencies": {
     "@transferwise/components": "^46.92.0",
@@ -95,7 +95,7 @@
     "classnames": "2.5.1",
     "react-webcam": "^7.2.0",
     "screenfull": "^5.2.0",
-    "@wise/dynamic-flow-types": "3.8.0"
+    "@wise/dynamic-flow-types": "3.8.1"
   },
   "scripts": {
     "dev": "pnpm build:visual-tests && storybook dev -p 3003",