@aemforms/af-core 0.22.8 → 0.22.10

package/lib/FileUpload.js

@@ -116,11 +116,12 @@ class FileUpload extends Field_1.default {
         }
         accepts = Array.isArray(accepts) ? accepts : accepts.split(',');
         accepts.forEach((accept) => {
-            const prefixAccept = accept.split('/')[0];
-            const suffixAccept = accept.split('.')[1];
-            if ((accept.includes('*') && type.startsWith(prefixAccept)) ||
-                (accept.includes('.') && type.endsWith(suffixAccept)) ||
-                (accept === type)) {
+            const trimmedAccept = accept.trim();
+            const prefixAccept = trimmedAccept.split('/')[0];
+            const suffixAccept = trimmedAccept.split('.')[1];
+            if ((trimmedAccept.includes('*') && type.startsWith(prefixAccept)) ||
+                (trimmedAccept.includes('.') && type.endsWith(suffixAccept)) ||
+                (trimmedAccept === type)) {
                 validFileType = true;
             }
         });

package/lib/rules/FunctionRuntime.js

@@ -90,35 +90,25 @@ const multipartFormData = (data, attachments) => {
             formData.append(key, value);
         }
     });
-    // const transformAttachment = (objValue: any, formData: any) : any => {
-    //     const newValue = {
-    //         ':name' : objValue.name,
-    //         ':contentType' : objValue.mediaType,
-    //         ':data' : objValue.data,
-    //         ':bindRef' : objValue.dataRef
-    //     };
-    //     if (objValue?.data instanceof File) {
-    //         let attIdentifier = `${objValue?.dataRef}/${objValue?.name}`;
-    //         if (!attIdentifier.startsWith('/')) {
-    //             attIdentifier = `/${attIdentifier}`;
-    //         }
-    //         formData.append(attIdentifier, objValue.data);
-    //         newValue[':data'] = `#${attIdentifier}`;
-    //     }
-    //     return newValue;
-    // };
+    const addAttachmentToFormData = (objValue, formData) => {
+        if ((objValue === null || objValue === void 0 ? void 0 : objValue.data) instanceof File) {
+            let attIdentifier = `${objValue === null || objValue === void 0 ? void 0 : objValue.dataRef}/${objValue === null || objValue === void 0 ? void 0 : objValue.name}`;
+            if (!attIdentifier.startsWith('/')) {
+                attIdentifier = `/${attIdentifier}`;
+            }
+            formData.append(attIdentifier, objValue.data);
+        }
+    };
     // @ts-ignore
-    /*const submitAttachments = Object.keys(attachments).reduce((acc, curr) => {
+    Object.keys(attachments).reduce((acc, curr) => {
         const objValue = attachments[curr];
-        if(objValue && objValue instanceof Array) {
-            return [...acc, ...objValue.map((x)=>transformAttachment(x, formData))];
-        } else {
-            return [...acc, transformAttachment(objValue, formData)];
+        if (objValue && objValue instanceof Array) {
+            return [...acc, ...objValue.map((x) => addAttachmentToFormData(x, formData))];
+        }
+        else {
+            return [...acc, addAttachmentToFormData(objValue, formData)];
         }
     }, []);
-    if (submitAttachments?.length > 0) {
-        formData.append(':attachments', jsonString(submitAttachments));
-    }*/
     return formData;
 };
 const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null) => __awaiter(void 0, void 0, void 0, function* () {
@@ -129,7 +119,7 @@ const submit = (context, success, error, submitAs = 'multipart/form-data', input
     }
     // todo: have to implement sending of attachments here
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const attachments = (0, FormUtils_1.getAttachments)(context.$form);
+    const attachments = (0, FormUtils_1.getAttachments)(context.form);
     let submitContentType = submitAs;
     let formData;
     if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {

package/lib/utils/FormUtils.d.ts

@@ -13,8 +13,9 @@ export declare const randomWord: (l: number) => string;
  */
 export declare const isEmpty: (value: any) => boolean;
 /**
- * @param input
- * @private
+ * Returns the list of attachments with its data reference
+ * @param input form model
+ * @returns list of file attachments {@link FileObject} present in the form
  */
 export declare const getAttachments: (input: ContainerModel) => any;
 /**

package/lib/utils/FormUtils.js

@@ -40,8 +40,9 @@ const isEmpty = (value) => {
 };
 exports.isEmpty = isEmpty;
 /**
- * @param input
- * @private
+ * Returns the list of attachments with its data reference
+ * @param input form model
+ * @returns list of file attachments {@link FileObject} present in the form
  */
 const getAttachments = (input) => {
     const items = input.items || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.8",
+  "version": "0.22.10",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.8"
+    "@aemforms/af-formatters": "^0.22.9"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",