@aemforms/af-core 0.22.106 → 0.22.107

package/esm/afb-runtime.js

@@ -141,7 +141,8 @@ const getProperty = (data, key, def) => {
 const isFile = function (item) {
     return (item?.type === 'file' || item?.type === 'file[]') ||
         ((item?.type === 'string' || item?.type === 'string[]') &&
-            (item?.format === 'binary' || item?.format === 'data-url'));
+            (item?.format === 'binary' || item?.format === 'data-url')) ||
+        item?.fieldType === 'file-input';
 };
 const isCheckbox = function (item) {
     const fieldType = item?.fieldType || defaultFieldTypes(item);
@@ -223,6 +224,23 @@ class DataValue {
         return (!enabled && this.$_fields.length);
     }
     get $value() {
+        const formInFileInput = this.$_fields.find(x => {
+            if (isFile(x)) {
+                return x;
+            }
+        });
+        if (formInFileInput && (this.$_type === 'string' || this.$_type === 'string[]' || this.$_type === 'array')) {
+            const attachmentMap = formInFileInput.form._exportDataAttachmentMap;
+            if (attachmentMap && attachmentMap[formInFileInput.id]) {
+                const attachment = attachmentMap[formInFileInput.id];
+                if (Array.isArray(attachment)) {
+                    return attachment.map(item => item.data);
+                }
+                else {
+                    return attachment.data;
+                }
+            }
+        }
         return this.$_value;
     }
     setValue(typedValue, originalValue, fromField) {
@@ -656,33 +674,77 @@ const randomWord = (l) => {
     }
     return ret.join('');
 };
-const getAttachments = (input, excludeUnbound = false) => {
-    const items = input.items || [];
-    return items?.reduce((acc, item) => {
-        if (excludeUnbound && item.dataRef === null) {
-            return acc;
-        }
-        let ret = null;
-        if (item.isContainer) {
-            ret = getAttachments(item, excludeUnbound);
-        }
-        else {
-            if (isFile(item.getState())) {
-                ret = {};
-                const name = item.name || '';
-                const dataRef = (item.dataRef != null)
-                    ? item.dataRef
-                    : (name.length > 0 ? item.name : undefined);
-                if (item.value instanceof Array) {
+const processItem = (item, excludeUnbound, isAsync) => {
+    if (excludeUnbound && item.dataRef === null) {
+        return isAsync ? Promise.resolve(null) : null;
+    }
+    let ret = null;
+    if (item.isContainer) {
+        return isAsync
+            ? readAttachments(item, excludeUnbound).then(res => res)
+            : getAttachments(item, excludeUnbound);
+    }
+    else {
+        if (isFile(item.getState())) {
+            ret = {};
+            const name = item.name || '';
+            const dataRef = (item.dataRef != null)
+                ? item.dataRef
+                : (name.length > 0 ? item.name : undefined);
+            if (item.value instanceof Array) {
+                if (item.type === 'string[]') {
+                    if (isAsync) {
+                        return item.serialize().then(serializedFiles => {
+                            ret[item.id] = serializedFiles.map((x) => {
+                                return { ...x, 'dataRef': dataRef };
+                            });
+                            return ret;
+                        });
+                    }
+                    else {
+                        ret[item.id] = item.value.map((x) => {
+                            return { ...x, 'dataRef': dataRef };
+                        });
+                    }
+                }
+                else {
                     ret[item.id] = item.value.map((x) => {
                         return { ...x, 'dataRef': dataRef };
                     });
                 }
-                else if (item.value != null) {
+            }
+            else if (item.value != null) {
+                if (item.type === 'string') {
+                    if (isAsync) {
+                        return item.serialize().then(serializedFile => {
+                            ret[item.id] = { ...serializedFile[0], 'dataRef': dataRef };
+                            return ret;
+                        });
+                    }
+                    else {
+                        ret[item.id] = { ...item.value, 'dataRef': dataRef };
+                    }
+                }
+                else {
                     ret[item.id] = { ...item.value, 'dataRef': dataRef };
                 }
             }
         }
+    }
+    return isAsync ? Promise.resolve(ret) : ret;
+};
+const readAttachments = async (input, excludeUnbound = false) => {
+    const items = input.items || [];
+    return items.reduce(async (accPromise, item) => {
+        const acc = await accPromise;
+        const ret = await processItem(item, excludeUnbound, true);
+        return Object.assign(acc, ret);
+    }, Promise.resolve({}));
+};
+const getAttachments = (input, excludeUnbound = false) => {
+    const items = input.items || [];
+    return items.reduce((acc, item) => {
+        const ret = processItem(item, excludeUnbound, false);
         return Object.assign(acc, ret);
     }, {});
 };
@@ -2657,10 +2719,10 @@ const urlEncoded = (data) => {
 const submit = async (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => {
     const endpoint = action || context.form.action;
     let data = input_data;
+    const attachments = await getAttachments(context.form, true);
     if (typeof data != 'object' || data == null) {
-        data = context.form.exportData();
+        data = context.form.exportData(attachments);
     }
-    const attachments = getAttachments(context.form, true);
     let submitContentType = submitAs;
     const submitDataAndMetaData = { 'data': data, ...metadata };
     let formData = submitDataAndMetaData;
@@ -3087,7 +3149,17 @@ class FunctionRuntimeImpl {
                             interpreter.globals.form.dispatch(event);
                         }
                         else {
-                            interpreter.globals.form.getElement(element.$id).dispatch(event);
+                            const dispatchEventOnElement = (element, event, interpreter) => {
+                                interpreter.globals.form.getElement(element.$id).dispatch(event);
+                            };
+                            if (Array.isArray(element) && element.length > 0 && typeof element.$id === 'undefined') {
+                                element.forEach(el => {
+                                    dispatchEventOnElement(el, event, interpreter);
+                                });
+                            }
+                            else {
+                                dispatchEventOnElement(element, event, interpreter);
+                            }
                         }
                     }
                     return {};
@@ -3153,6 +3225,7 @@ class Form extends Container {
     _fields = {};
     _ids;
     _invalidFields = [];
+    _exportDataAttachmentMap = {};
     _captcha = null;
     constructor(n, fieldFactory, _ruleEngine, _eventQueue = new EventQueue(), logLevel = 'off', mode = 'create') {
         super(n, { fieldFactory: fieldFactory, mode });
@@ -3217,8 +3290,11 @@ class Form extends Container {
         this.syncDataAndFormModel(this.getDataNode());
         this._eventQueue.runPendingQueue();
     }
-    exportData() {
-        return this.getDataNode()?.$value;
+    exportData(attachmentSerializedMap = {}) {
+        this._exportDataAttachmentMap = attachmentSerializedMap;
+        const finalData = this.getDataNode()?.$value;
+        this._exportDataAttachmentMap = {};
+        return finalData;
     }
     setAdditionalSubmitMetadata(metadata) {
         this.additionalSubmitMetadata = { ...this.additionalSubmitMetadata, ...metadata };
@@ -3431,7 +3507,7 @@ class Form extends Container {
     }
     submit(action, context) {
         const validate_form = action?.payload?.validate_form;
-        if (!validate_form || this.validate().length === 0) {
+        if (validate_form === false || this.validate().length === 0) {
             const payload = action?.payload || {};
             const successEventName = payload?.success ? payload?.success : 'submitSuccess';
             const failureEventName = payload?.error ? payload?.error : 'submitError';
@@ -4684,7 +4760,7 @@ class Button extends Field {
             return;
         }
         if (this._jsonModel.buttonType === 'submit') {
-            return this.form.dispatch(new Submit());
+            return this.form.dispatch(new Submit({ validate_form: true }));
         }
         if (this._jsonModel.buttonType === 'reset') {
             return this.form.dispatch(new Reset());

package/esm/types/src/Form.d.ts

@@ -15,6 +15,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     private _fields;
     _ids: Generator<string, void, string>;
     private _invalidFields;
+    _exportDataAttachmentMap: Record<string, any>;
     private _captcha;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
     protected _applyDefaultsInModel(): void;
@@ -28,7 +29,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     get action(): string | undefined;
     get isFragment(): boolean;
     importData(dataModel: any): void;
-    exportData(): any;
+    exportData(attachmentSerializedMap?: {}): any;
     setAdditionalSubmitMetadata(metadata: Record<string, any>): void;
     get specVersion(): Version;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;

package/esm/types/src/utils/FormUtils.d.ts

@@ -1,6 +1,7 @@
 import { ContainerModel } from '../types/index';
 export declare const randomWord: (l: number) => string;
 export declare const isEmpty: (value: any) => boolean;
+export declare const readAttachments: (input: ContainerModel, excludeUnbound?: boolean) => Promise<any>;
 export declare const getAttachments: (input: ContainerModel, excludeUnbound?: boolean) => any;
 export declare const getFileSizeInBytes: (str: any) => number;
 export declare const IdGenerator: (initial?: number) => Generator<string, void, string>;

package/lib/Button.js

@@ -12,7 +12,7 @@ class Button extends Field_1.default {
             return;
         }
         if (this._jsonModel.buttonType === 'submit') {
-            return this.form.dispatch(new Events_1.Submit());
+            return this.form.dispatch(new Events_1.Submit({ validate_form: true }));
         }
         if (this._jsonModel.buttonType === 'reset') {
             return this.form.dispatch(new Events_1.Reset());

package/lib/Form.d.ts

@@ -15,6 +15,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     private _fields;
     _ids: Generator<string, void, string>;
     private _invalidFields;
+    _exportDataAttachmentMap: Record<string, any>;
     private _captcha;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
     protected _applyDefaultsInModel(): void;
@@ -28,7 +29,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     get action(): string | undefined;
     get isFragment(): boolean;
     importData(dataModel: any): void;
-    exportData(): any;
+    exportData(attachmentSerializedMap?: {}): any;
     setAdditionalSubmitMetadata(metadata: Record<string, any>): void;
     get specVersion(): Version;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;

package/lib/Form.js

@@ -32,6 +32,7 @@ class Form extends Container_1.default {
         this.additionalSubmitMetadata = {};
         this._fields = {};
         this._invalidFields = [];
+        this._exportDataAttachmentMap = {};
         this._captcha = null;
         this.dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
         this._logger = new Logger_1.Logger(logLevel);
@@ -91,9 +92,12 @@ class Form extends Container_1.default {
         this.syncDataAndFormModel(this.getDataNode());
         this._eventQueue.runPendingQueue();
     }
-    exportData() {
+    exportData(attachmentSerializedMap = {}) {
         var _a;
-        return (_a = this.getDataNode()) === null || _a === void 0 ? void 0 : _a.$value;
+        this._exportDataAttachmentMap = attachmentSerializedMap;
+        const finalData = (_a = this.getDataNode()) === null || _a === void 0 ? void 0 : _a.$value;
+        this._exportDataAttachmentMap = {};
+        return finalData;
     }
     setAdditionalSubmitMetadata(metadata) {
         this.additionalSubmitMetadata = Object.assign(Object.assign({}, this.additionalSubmitMetadata), metadata);
@@ -264,7 +268,7 @@ class Form extends Container_1.default {
     submit(action, context) {
         var _a;
         const validate_form = (_a = action === null || action === void 0 ? void 0 : action.payload) === null || _a === void 0 ? void 0 : _a.validate_form;
-        if (!validate_form || this.validate().length === 0) {
+        if (validate_form === false || this.validate().length === 0) {
             const payload = (action === null || action === void 0 ? void 0 : action.payload) || {};
             const successEventName = (payload === null || payload === void 0 ? void 0 : payload.success) ? payload === null || payload === void 0 ? void 0 : payload.success : 'submitSuccess';
             const failureEventName = (payload === null || payload === void 0 ? void 0 : payload.error) ? payload === null || payload === void 0 ? void 0 : payload.error : 'submitError';

package/lib/data/DataValue.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const JsonUtils_1 = require("../utils/JsonUtils");
 class DataValue {
     constructor($_name, $_value, $_type = typeof $_value, parent) {
         this.$_name = $_name;
@@ -19,6 +20,23 @@ class DataValue {
         return (!enabled && this.$_fields.length);
     }
     get $value() {
+        const formInFileInput = this.$_fields.find(x => {
+            if ((0, JsonUtils_1.isFile)(x)) {
+                return x;
+            }
+        });
+        if (formInFileInput && (this.$_type === 'string' || this.$_type === 'string[]' || this.$_type === 'array')) {
+            const attachmentMap = formInFileInput.form._exportDataAttachmentMap;
+            if (attachmentMap && attachmentMap[formInFileInput.id]) {
+                const attachment = attachmentMap[formInFileInput.id];
+                if (Array.isArray(attachment)) {
+                    return attachment.map(item => item.data);
+                }
+                else {
+                    return attachment.data;
+                }
+            }
+        }
         return this.$_value;
     }
     setValue(typedValue, originalValue, fromField) {

package/lib/rules/FunctionRuntime.js

@@ -95,10 +95,10 @@ const urlEncoded = (data) => {
 const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => __awaiter(void 0, void 0, void 0, function* () {
     const endpoint = action || context.form.action;
     let data = input_data;
+    const attachments = yield (0, FormUtils_1.getAttachments)(context.form, true);
     if (typeof data != 'object' || data == null) {
-        data = context.form.exportData();
+        data = context.form.exportData(attachments);
     }
-    const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
     let submitContentType = submitAs;
     const submitDataAndMetaData = Object.assign({ 'data': data }, metadata);
     let formData = submitDataAndMetaData;
@@ -527,7 +527,17 @@ class FunctionRuntimeImpl {
                             interpreter.globals.form.dispatch(event);
                         }
                         else {
-                            interpreter.globals.form.getElement(element.$id).dispatch(event);
+                            const dispatchEventOnElement = (element, event, interpreter) => {
+                                interpreter.globals.form.getElement(element.$id).dispatch(event);
+                            };
+                            if (Array.isArray(element) && element.length > 0 && typeof element.$id === 'undefined') {
+                                element.forEach(el => {
+                                    dispatchEventOnElement(el, event, interpreter);
+                                });
+                            }
+                            else {
+                                dispatchEventOnElement(element, event, interpreter);
+                            }
                         }
                     }
                     return {};

package/lib/utils/FormUtils.d.ts

@@ -1,6 +1,7 @@
 import { ContainerModel } from '../types/index';
 export declare const randomWord: (l: number) => string;
 export declare const isEmpty: (value: any) => boolean;
+export declare const readAttachments: (input: ContainerModel, excludeUnbound?: boolean) => Promise<any>;
 export declare const getAttachments: (input: ContainerModel, excludeUnbound?: boolean) => any;
 export declare const getFileSizeInBytes: (str: any) => number;
 export declare const IdGenerator: (initial?: number) => Generator<string, void, string>;

package/lib/utils/FormUtils.js

@@ -1,6 +1,15 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceTemplatePlaceholders = exports.sitesModelToFormModel = exports.dataURItoBlob = exports.extractFileInfo = exports.isDataUrl = exports.IdGenerator = exports.getFileSizeInBytes = exports.getAttachments = exports.isEmpty = exports.randomWord = void 0;
+exports.replaceTemplatePlaceholders = exports.sitesModelToFormModel = exports.dataURItoBlob = exports.extractFileInfo = exports.isDataUrl = exports.IdGenerator = exports.getFileSizeInBytes = exports.getAttachments = exports.readAttachments = exports.isEmpty = exports.randomWord = void 0;
 const JsonUtils_1 = require("./JsonUtils");
 const FileObject_1 = require("../FileObject");
 const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'.split('');
@@ -24,33 +33,78 @@ const isEmpty = (value) => {
     return value === '' || value === null || value === undefined;
 };
 exports.isEmpty = isEmpty;
-const getAttachments = (input, excludeUnbound = false) => {
-    const items = input.items || [];
-    return items === null || items === void 0 ? void 0 : items.reduce((acc, item) => {
-        if (excludeUnbound && item.dataRef === null) {
-            return acc;
-        }
-        let ret = null;
-        if (item.isContainer) {
-            ret = (0, exports.getAttachments)(item, excludeUnbound);
-        }
-        else {
-            if ((0, JsonUtils_1.isFile)(item.getState())) {
-                ret = {};
-                const name = item.name || '';
-                const dataRef = (item.dataRef != null)
-                    ? item.dataRef
-                    : (name.length > 0 ? item.name : undefined);
-                if (item.value instanceof Array) {
+const processItem = (item, excludeUnbound, isAsync) => {
+    if (excludeUnbound && item.dataRef === null) {
+        return isAsync ? Promise.resolve(null) : null;
+    }
+    let ret = null;
+    if (item.isContainer) {
+        return isAsync
+            ? (0, exports.readAttachments)(item, excludeUnbound).then(res => res)
+            : (0, exports.getAttachments)(item, excludeUnbound);
+    }
+    else {
+        if ((0, JsonUtils_1.isFile)(item.getState())) {
+            ret = {};
+            const name = item.name || '';
+            const dataRef = (item.dataRef != null)
+                ? item.dataRef
+                : (name.length > 0 ? item.name : undefined);
+            if (item.value instanceof Array) {
+                if (item.type === 'string[]') {
+                    if (isAsync) {
+                        return item.serialize().then(serializedFiles => {
+                            ret[item.id] = serializedFiles.map((x) => {
+                                return Object.assign(Object.assign({}, x), { 'dataRef': dataRef });
+                            });
+                            return ret;
+                        });
+                    }
+                    else {
+                        ret[item.id] = item.value.map((x) => {
+                            return Object.assign(Object.assign({}, x), { 'dataRef': dataRef });
+                        });
+                    }
+                }
+                else {
                     ret[item.id] = item.value.map((x) => {
                         return Object.assign(Object.assign({}, x), { 'dataRef': dataRef });
                     });
                 }
-                else if (item.value != null) {
+            }
+            else if (item.value != null) {
+                if (item.type === 'string') {
+                    if (isAsync) {
+                        return item.serialize().then(serializedFile => {
+                            ret[item.id] = Object.assign(Object.assign({}, serializedFile[0]), { 'dataRef': dataRef });
+                            return ret;
+                        });
+                    }
+                    else {
+                        ret[item.id] = Object.assign(Object.assign({}, item.value), { 'dataRef': dataRef });
+                    }
+                }
+                else {
                     ret[item.id] = Object.assign(Object.assign({}, item.value), { 'dataRef': dataRef });
                 }
             }
         }
+    }
+    return isAsync ? Promise.resolve(ret) : ret;
+};
+const readAttachments = (input, excludeUnbound = false) => __awaiter(void 0, void 0, void 0, function* () {
+    const items = input.items || [];
+    return items.reduce((accPromise, item) => __awaiter(void 0, void 0, void 0, function* () {
+        const acc = yield accPromise;
+        const ret = yield processItem(item, excludeUnbound, true);
+        return Object.assign(acc, ret);
+    }), Promise.resolve({}));
+});
+exports.readAttachments = readAttachments;
+const getAttachments = (input, excludeUnbound = false) => {
+    const items = input.items || [];
+    return items.reduce((acc, item) => {
+        const ret = processItem(item, excludeUnbound, false);
         return Object.assign(acc, ret);
     }, {});
 };

package/lib/utils/JsonUtils.js

@@ -19,7 +19,8 @@ exports.getProperty = getProperty;
 const isFile = function (item) {
     return ((item === null || item === void 0 ? void 0 : item.type) === 'file' || (item === null || item === void 0 ? void 0 : item.type) === 'file[]') ||
         (((item === null || item === void 0 ? void 0 : item.type) === 'string' || (item === null || item === void 0 ? void 0 : item.type) === 'string[]') &&
-            ((item === null || item === void 0 ? void 0 : item.format) === 'binary' || (item === null || item === void 0 ? void 0 : item.format) === 'data-url'));
+            ((item === null || item === void 0 ? void 0 : item.format) === 'binary' || (item === null || item === void 0 ? void 0 : item.format) === 'data-url')) ||
+        (item === null || item === void 0 ? void 0 : item.fieldType) === 'file-input';
 };
 exports.isFile = isFile;
 const checkIfConstraintsArePresent = function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.106",
+  "version": "0.22.107",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.106"
+    "@aemforms/af-formatters": "^0.22.107"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",