@aemforms/af-core 0.22.16 → 0.22.17

package/lib/utils/FormUtils.js

@@ -7,7 +7,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ADOBE NOR ITS THIRD PARTY PROVIDERS AND PARTNERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dataURItoBlob = exports.extractFileInfo = exports.IdGenerator = exports.sizeToBytes = exports.getFileSizeInBytes = exports.getAttachments = exports.isEmpty = exports.randomWord = void 0;
+exports.dataURItoBlob = exports.extractFileInfo = exports.IdGenerator = exports.getFileSizeInBytes = exports.getAttachments = exports.isEmpty = exports.randomWord = void 0;
 /**
  * Defines generic utilities to interact with form runtime model
  */
@@ -85,7 +85,7 @@ const getFileSizeInBytes = (str) => {
     if (typeof str === 'string') {
         const matches = fileSizeRegex.exec(str.trim());
         if (matches != null) {
-            retVal = (0, exports.sizeToBytes)(parseFloat(matches[1]), (matches[2] || 'kb').toUpperCase());
+            retVal = sizeToBytes(parseFloat(matches[1]), (matches[2] || 'kb').toUpperCase());
         }
     }
     return retVal;
@@ -103,7 +103,6 @@ const sizeToBytes = (size, symbol) => {
     const i = Math.pow(1024, sizes[symbol]);
     return Math.round(size * i);
 };
-exports.sizeToBytes = sizeToBytes;
 /**
  * ID Generator
  * @param initial
@@ -138,12 +137,11 @@ const IdGenerator = function* (initial = 50) {
 exports.IdGenerator = IdGenerator;
 /**
  * Utility to extract {@link FileObject} from string or HTML File data type
- * @param files list of files as string , string [] of file[]
+ * @param file
  * @returns list of {@link FileObject}
  */
-const extractFileInfo = (files) => {
-    return (files instanceof Array ? files : [files])
-        .map((file) => {
+const extractFileInfo = (file) => {
+    if (file !== null) {
         let retVal = null;
         if (file instanceof FileObject_1.FileObject) {
             retVal = file;
@@ -152,20 +150,23 @@ const extractFileInfo = (files) => {
             // case: file object
             retVal = {
                 name: file.name,
-                mediaType: file.type,
+                type: file.type,
                 size: file.size,
                 data: file
             };
         }
         else if (typeof file === 'string' && (0, ValidationUtils_1.isDataUrl)(file)) {
             // case: data URL
-            const { blob, name } = (0, exports.dataURItoBlob)(file);
-            retVal = {
-                name: name,
-                mediaType: blob.type,
-                size: blob.size,
-                data: blob
-            };
+            const result = (0, exports.dataURItoBlob)(file);
+            if (result !== null) {
+                const { blob, name } = result;
+                retVal = {
+                    name: name,
+                    type: blob.type,
+                    size: blob.size,
+                    data: blob
+                };
+            }
         }
         else {
             // case: string as file object
@@ -179,20 +180,23 @@ const extractFileInfo = (files) => {
             }
             if (typeof (jFile === null || jFile === void 0 ? void 0 : jFile.data) === 'string' && (0, ValidationUtils_1.isDataUrl)(jFile === null || jFile === void 0 ? void 0 : jFile.data)) {
                 // case: data URL
-                const { blob } = (0, exports.dataURItoBlob)(jFile === null || jFile === void 0 ? void 0 : jFile.data);
-                retVal = {
-                    name: jFile === null || jFile === void 0 ? void 0 : jFile.name,
-                    mediaType: jFile === null || jFile === void 0 ? void 0 : jFile.type,
-                    size: blob.size,
-                    data: blob
-                };
+                const result = (0, exports.dataURItoBlob)(jFile === null || jFile === void 0 ? void 0 : jFile.data);
+                if (result !== null) {
+                    const blob = result.blob;
+                    retVal = {
+                        name: jFile === null || jFile === void 0 ? void 0 : jFile.name,
+                        type: jFile === null || jFile === void 0 ? void 0 : jFile.type,
+                        size: blob.size,
+                        data: blob
+                    };
+                }
             }
             else if (typeof jFile === 'string') {
                 // case: data as external url
                 const fileName = jFile.split('/').pop();
                 retVal = {
                     name: fileName,
-                    mediaType: 'application/octet-stream',
+                    type: 'application/octet-stream',
                     size: 0,
                     data: jFile
                 };
@@ -201,14 +205,20 @@ const extractFileInfo = (files) => {
                 // todo: just added for ease of integration for the view layer
                 retVal = {
                     name: jFile === null || jFile === void 0 ? void 0 : jFile.name,
-                    mediaType: (jFile === null || jFile === void 0 ? void 0 : jFile.type) || (jFile === null || jFile === void 0 ? void 0 : jFile.mediaType),
+                    type: jFile === null || jFile === void 0 ? void 0 : jFile.type,
                     size: jFile === null || jFile === void 0 ? void 0 : jFile.size,
                     data: jFile === null || jFile === void 0 ? void 0 : jFile.data
                 };
             }
         }
-        return new FileObject_1.FileObject(retVal);
-    });
+        if (retVal !== null && retVal.data != null) {
+            return new FileObject_1.FileObject(retVal);
+        }
+        return null;
+    }
+    else {
+        return null;
+    }
 };
 exports.extractFileInfo = extractFileInfo;
 /**
@@ -217,34 +227,28 @@ exports.extractFileInfo = extractFileInfo;
  * @returns `Blob` object for the data URI
  */
 const dataURItoBlob = (dataURI) => {
-    // Split metadata from data
-    const splitted = dataURI.split(',');
-    // Split params
-    const params = splitted[0].split(';');
-    // Get mime-type from params
-    const type = params[0].replace('data:', '');
-    // Filter the name property from params
-    const properties = params.filter(param => {
-        return param.split('=')[0] === 'name';
-    });
-    // Look for the name and use unknown if no name property.
-    let name;
-    if (properties.length !== 1) {
-        name = 'unknown';
+    const regex = /^data:([a-z]+\/[a-z0-9-+.]+)?(?:;name=([^;]+))?(;base64)?,(.+)$/;
+    const groups = regex.exec(dataURI);
+    if (groups !== null) {
+        const type = groups[1] || '';
+        const name = groups[2] || 'unknown';
+        const isBase64 = typeof groups[3] === 'string';
+        if (isBase64) {
+            const binary = atob(groups[4]);
+            const array = [];
+            for (let i = 0; i < binary.length; i++) {
+                array.push(binary.charCodeAt(i));
+            }
+            const blob = new window.Blob([new Uint8Array(array)], { type });
+            return { name, blob };
+        }
+        else {
+            const blob = new window.Blob([groups[4]], { type });
+            return { name, blob };
+        }
     }
     else {
-        // Because we filtered out the other property,
-        // we only have the name case here.
-        name = properties[0].split('=')[1];
-    }
-    // Built the Uint8Array Blob parameter from the base64 string.
-    const binary = atob(splitted[1]);
-    const array = [];
-    for (let i = 0; i < binary.length; i++) {
-        array.push(binary.charCodeAt(i));
+        return null;
     }
-    // Create the blob object
-    const blob = new window.Blob([new Uint8Array(array)], { type });
-    return { blob, name };
 };
 exports.dataURItoBlob = dataURItoBlob;

package/lib/utils/ValidationUtils.d.ts

@@ -149,5 +149,22 @@ export declare const Constraints: {
         valid: boolean;
         value: any;
     };
+    /**
+     *
+     * @param constraint
+     * @param value
+     */
+    accept: (constraint: string[], value: any) => {
+        valid: boolean;
+        value: any;
+    };
+    /**
+     * @param constraint
+     * @param value
+     */
+    maxFileSize: (constraint: number | string, value: any) => {
+        valid: boolean;
+        value: any;
+    };
 };
 export {};

package/lib/utils/ValidationUtils.js

@@ -8,6 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Constraints = exports.ValidConstraints = exports.isDataUrl = void 0;
+const FormUtils_1 = require("./FormUtils");
+const FileObject_1 = require("../FileObject");
 /**
  * Defines generic utilities to validate form runtime model based on the constraints defined
  * as per `adaptive form specification`
@@ -56,6 +58,16 @@ const checkNumber = (inputVal) => {
         value, valid
     };
 };
+const checkInteger = (inputVal) => {
+    let value = parseFloat(inputVal);
+    const valid = !isNaN(value) && Math.round(value) === value;
+    if (!valid) {
+        value = inputVal;
+    }
+    return {
+        value, valid
+    };
+};
 /**
  * Wraps a non-null value and not an array value into an array
  * @param inputVal input value
@@ -88,6 +100,33 @@ const checkBool = (inputVal) => {
     const value = typeof inputVal === 'boolean' ? inputVal : (valid ? inputVal === 'true' : inputVal);
     return { valid, value };
 };
+/**
+ *
+ * @param inputVal
+ */
+const checkFile = (inputVal) => {
+    const value = (0, FormUtils_1.extractFileInfo)(inputVal);
+    const valid = value !== null;
+    return {
+        value: valid ? value : inputVal,
+        valid
+    };
+};
+/**
+ * validates whether the mediaType is one present in the accepts list
+ * @param mediaType
+ * @param accepts
+ */
+const matchMediaType = (mediaType, accepts) => {
+    return !mediaType || accepts.some((accept) => {
+        const trimmedAccept = accept.trim();
+        const prefixAccept = trimmedAccept.split('/')[0];
+        const suffixAccept = trimmedAccept.split('.')[1];
+        return ((trimmedAccept.includes('*') && mediaType.startsWith(prefixAccept)) ||
+            (trimmedAccept.includes('.') && mediaType.endsWith(suffixAccept)) ||
+            (trimmedAccept === mediaType));
+    });
+};
 /**
  * Validates an array of values using a validator function.
  * @param inputVal
@@ -154,18 +193,25 @@ exports.Constraints = {
                 value = res.value;
                 break;
             case 'integer':
-                value = parseFloat(inputVal);
-                valid = !isNaN(value) && Math.round(value) === value;
-                if (!valid) {
-                    value = inputVal;
-                }
+                res = checkInteger(inputVal);
+                valid = res.valid;
+                value = res.value;
                 break;
-            case 'file' || 'file[]':
-                valid = true;
-                //valid = isFileObject(value);
-                if (!valid) {
-                    value = inputVal;
-                }
+            case 'integer[]':
+                res = partitionArray(inputVal, checkInteger);
+                valid = res[1].length === 0;
+                value = valid ? res[0] : inputVal;
+                break;
+            case 'file':
+                // for file types only, we support setting value via an array
+                res = checkFile(inputVal instanceof Array ? inputVal[0] : inputVal);
+                valid = res.valid;
+                value = res.value;
+                break;
+            case 'file[]':
+                res = partitionArray(inputVal, checkFile);
+                valid = res[1].length === 0;
+                value = valid ? res[0] : inputVal;
                 break;
             case 'number[]':
                 res = partitionArray(inputVal, checkNumber);
@@ -338,5 +384,35 @@ exports.Constraints = {
             valid: constraint.indexOf(value) > -1,
             value
         };
+    },
+    /**
+     *
+     * @param constraint
+     * @param value
+     */
+    accept: (constraint, value) => {
+        if (!constraint || constraint.length === 0 || value === null || value === undefined) {
+            return {
+                valid: true,
+                value
+            };
+        }
+        const tempValue = value instanceof Array ? value : [value];
+        const invalidFile = tempValue.some((file) => !matchMediaType(file.type, constraint));
+        return {
+            valid: !invalidFile,
+            value
+        };
+    },
+    /**
+     * @param constraint
+     * @param value
+     */
+    maxFileSize: (constraint, value) => {
+        const sizeLimit = typeof constraint === 'string' ? (0, FormUtils_1.getFileSizeInBytes)(constraint) : constraint;
+        return {
+            valid: !(value instanceof FileObject_1.FileObject) || value.size <= sizeLimit,
+            value
+        };
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.16",
+  "version": "0.22.17",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,13 +35,14 @@
   },
   "dependencies": {
     "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.16"
+    "@aemforms/af-formatters": "^0.22.17"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",
     "@types/lodash": "^4.14.171",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
     "@typescript-eslint/parser": "^4.28.2",
+    "blob-polyfill": "^7.0.20220408",
     "eslint": "^7.30.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.23.4",