@aemforms/af-core 0.22.18 → 0.22.20

package/lib/{utils → esm/utils}/ValidationUtils.js

@@ -1,23 +1,6 @@
-"use strict";
-/*
- * Copyright 2022 Adobe, Inc.
- *
- * Your access and use of this software is governed by the Adobe Customer Feedback Program Terms and Conditions or other Beta License Agreement signed by your employer and Adobe, Inc.. This software is NOT open source and may not be used without one of the foregoing licenses. Even with a foregoing license, your access and use of this file is limited to the earlier of (a) 180 days, (b) general availability of the product(s) which utilize this software (i.e. AEM Forms), (c) January 1, 2023, (d) Adobe providing notice to you that you may no longer use the software or that your beta trial has otherwise ended.
- *
- * 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.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`
- */
-// issue with import
-//import {FieldJson, isFileObject} from '../types';
+import { extractFileInfo, getFileSizeInBytes } from './FormUtils.js';
+import { FileObject } from '../FileObject.js';
 const dateRegex = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
-const dataUrlRegex = /^data:([a-z]+\/[a-z0-9-+.]+)?;(?:name=(.*);)?base64,(.*)$/;
 const days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 const daysInMonth = (leapYear, month) => {
     if (leapYear && month == 2) {
@@ -28,26 +11,27 @@ const daysInMonth = (leapYear, month) => {
 const isLeapYear = (year) => {
     return year % 400 === 0 || year % 4 === 0 && year % 100 !== 0;
 };
-const isDataUrl = (str) => {
-    return dataUrlRegex.exec(str.trim()) != null;
+export const coerceType = (param, type) => {
+    let num;
+    switch (type) {
+        case 'string':
+            return param + '';
+        case 'number':
+            num = +param;
+            if (!isNaN(num)) {
+                return num;
+            }
+            break;
+        case 'boolean':
+            if (typeof param === 'string') {
+                return param === 'true';
+            }
+            else if (typeof param === 'number') {
+                return param !== 0;
+            }
+    }
+    throw `${param} has invalid type. Expected : ${type}, Actual ${typeof param}`;
 };
-exports.isDataUrl = isDataUrl;
-/**
- * Checks whether inputVal is valid number value or not
- *
- * ```
- * const x = checkNumber('12')
- * ```
- * would return
- * ```
- * {
- *     value : 12,
- *     valid : true
- * }
- * ```
- * @param inputVal input value
- * @returns {@link ValidationResult | Validation result}
- */
 const checkNumber = (inputVal) => {
     if (inputVal === '' || inputVal == null) {
         return {
@@ -63,10 +47,6 @@ const checkNumber = (inputVal) => {
         value, valid
     };
 };
-/**
- *
- * @param inputVal
- */
 const checkInteger = (inputVal) => {
     if (inputVal == '' || inputVal == null) {
         return {
@@ -82,55 +62,25 @@ const checkInteger = (inputVal) => {
         value, valid
     };
 };
-/**
- * Wraps a non-null value and not an array value into an array
- * @param inputVal input value
- * @returns wraps the input value into an array
- */
 const toArray = (inputVal) => {
     if (inputVal != null && !(inputVal instanceof Array)) {
         return [inputVal];
     }
     return inputVal;
 };
-/**
- * Checks whether inputVal is valid boolean value or not
- *
- * ```
- * const x = checkBool('false')
- * ```
- * would return
- * ```
- * {
- *     value : false,
- *     valid : true
- * }
- * ```
- * @param inputVal input value
- * @returns {@link ValidationResult | Validation result}
- */
 const checkBool = (inputVal) => {
     const valid = typeof inputVal === 'boolean' || inputVal === 'true' || inputVal === 'false';
     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 value = 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();
@@ -141,13 +91,6 @@ const matchMediaType = (mediaType, accepts) => {
             (trimmedAccept === mediaType));
     });
 };
-/**
- * Validates an array of values using a validator function.
- * @param inputVal
- * @param validatorFn
- * @return an array containing two arrays, the first one with all the valid values and the second one with one invalid
- * value (if there is).
- */
 const partitionArray = (inputVal, validatorFn) => {
     const value = toArray(inputVal);
     if (value == null) {
@@ -162,23 +105,14 @@ const partitionArray = (inputVal, validatorFn) => {
         return acc;
     }, [[], []]);
 };
-exports.ValidConstraints = {
+export const ValidConstraints = {
     date: ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum', 'format'],
     string: ['minLength', 'maxLength', 'pattern'],
     number: ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'],
     array: ['minItems', 'maxItems', 'uniqueItems'],
     file: ['accept', 'maxFileSize']
 };
-/**
- * Implementation of all constraints defined by `adaptive form specification`
- */
-exports.Constraints = {
-    /**
-     * Implementation of type constraint
-     * @param constraint    `type` property of the form object
-     * @param inputVal      value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
+export const Constraints = {
     type: (constraint, inputVal) => {
         let value = inputVal;
         if (inputVal == undefined) {
@@ -217,7 +151,6 @@ exports.Constraints = {
                 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;
@@ -243,12 +176,6 @@ exports.Constraints = {
             value
         };
     },
-    /**
-     * Implementation of format constraint
-     * @param constraint    `format` property of the form object
-     * @param input         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     format: (constraint, input) => {
         let valid = true;
         const value = input;
@@ -260,7 +187,6 @@ exports.Constraints = {
             case 'date':
                 res = dateRegex.exec((input || '').trim());
                 if (res != null) {
-                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     const [match, year, month, date] = res;
                     const [nMonth, nDate] = [+month, +date];
                     const leapYear = isLeapYear(+year);
@@ -272,101 +198,38 @@ exports.Constraints = {
                 }
                 break;
             case 'data-url':
-                // todo: input is of type file, do we need this format ? since value is always of type file object
-                //res = dataUrlRegex.exec(input.trim());
-                //valid = res != null;
                 valid = true;
                 break;
         }
         return { valid, value };
     },
-    //todo : add support for date
-    /**
-     * Implementation of minimum constraint
-     * @param constraint    `minimum` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     minimum: (constraint, value) => {
         return { valid: value >= constraint, value };
     },
-    //todo : add support for date
-    /**
-     * Implementation of maximum constraint
-     * @param constraint    `maximum` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     maximum: (constraint, value) => {
         return { valid: value <= constraint, value };
     },
-    /**
-     * Implementation of exclusiveMinimum constraint
-     * @param constraint    `minimum` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     exclusiveMinimum: (constraint, value) => {
         return { valid: value > constraint, value };
     },
-    //todo : add support for date
-    /**
-     * Implementation of exclusiveMaximum constraint
-     * @param constraint    `maximum` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     exclusiveMaximum: (constraint, value) => {
         return { valid: value < constraint, value };
     },
-    /**
-     * Implementation of the minItems constraint
-     * @param constraint `minItems` constraint from object
-     * @param value value of the form object
-     */
     minItems: (constraint, value) => {
         return { valid: (value instanceof Array) && value.length >= constraint, value };
     },
-    /**
-     * Implementation of the maxItems constraint
-     * @param constraint `maxItems` constraint from object
-     * @param value value of the form object
-     */
     maxItems: (constraint, value) => {
         return { valid: (value instanceof Array) && value.length <= constraint, value };
     },
-    /**
-     * Implementation of the uniqueItems constraint
-     * @param constraint `uniqueItems` constraint from object
-     * @param value value of the form object
-     */
     uniqueItems: (constraint, value) => {
         return { valid: !constraint || ((value instanceof Array) && value.length === new Set(value).size), value };
     },
-    /**
-     * Implementation of minLength constraint
-     * @param constraint    `minLength` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     minLength: (constraint, value) => {
-        return Object.assign(Object.assign({}, exports.Constraints.minimum(constraint, typeof value === 'string' ? value.length : 0)), { value });
+        return { ...Constraints.minimum(constraint, typeof value === 'string' ? value.length : 0), value };
     },
-    /**
-     * Implementation of maxLength constraint
-     * @param constraint    `maxLength` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     maxLength: (constraint, value) => {
-        return Object.assign(Object.assign({}, exports.Constraints.maximum(constraint, typeof value === 'string' ? value.length : 0)), { value });
+        return { ...Constraints.maximum(constraint, typeof value === 'string' ? value.length : 0), value };
     },
-    /**
-     * Implementation of pattern constraint
-     * @param constraint    `pattern` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     pattern: (constraint, value) => {
         let regex;
         if (typeof constraint === 'string') {
@@ -377,33 +240,16 @@ exports.Constraints = {
         }
         return { valid: regex.test(value), value };
     },
-    /**
-     * Implementation of required constraint
-     * @param constraint    `required` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     required: (constraint, value) => {
         const valid = constraint ? value != null && value !== '' : true;
         return { valid, value };
     },
-    /**
-     * Implementation of enum constraint
-     * @param constraint    `enum` property of the form object
-     * @param value         value of the form object
-     * @return {@link ValidationResult | validation result}
-     */
     enum: (constraint, value) => {
         return {
             valid: constraint.indexOf(value) > -1,
             value
         };
     },
-    /**
-     *
-     * @param constraint
-     * @param value
-     */
     accept: (constraint, value) => {
         if (!constraint || constraint.length === 0 || value === null || value === undefined) {
             return {
@@ -418,14 +264,10 @@ exports.Constraints = {
             value
         };
     },
-    /**
-     * @param constraint
-     * @param value
-     */
     maxFileSize: (constraint, value) => {
-        const sizeLimit = typeof constraint === 'string' ? (0, FormUtils_1.getFileSizeInBytes)(constraint) : constraint;
+        const sizeLimit = typeof constraint === 'string' ? getFileSizeInBytes(constraint) : constraint;
         return {
-            valid: !(value instanceof FileObject_1.FileObject) || value.size <= sizeLimit,
+            valid: !(value instanceof FileObject) || value.size <= sizeLimit,
             value
         };
     }

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.18",
+  "version": "0.22.20",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
-  "main": "lib/index.js",
+  "type": "module",
+  "module": "lib/esm/index.js",
+  "types": "lib/esm/index.d.ts",
+  "main": "lib/cjs/index.cjs",
+  "exports": {
+    ".": "./lib/esm/index.js"
+  },
   "directories": {
     "lib": "lib",
     "source": "src",
@@ -24,21 +30,21 @@
     "access": "public"
   },
   "scripts": {
-    "test": "jest --silent",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --silent",
     "eslint": "npx eslint src/**",
     "eslint:fix": "npx eslint --fix src/**",
-    "test:ci": "jest --silent --coverage",
-    "build": "npm run eslint && npx tsc",
+    "test:ci": "NODE_OPTIONS=--experimental-vm-modules jest --silent --coverage",
+    "build": "npm run clean && npm run eslint && npx tsc && rollup -c rollup.config.js",
     "clean": "rm -rf lib target",
     "prepublishOnly": "npm run build && npm run test",
     "docs": "npx typedoc --options .typedoc.cjs"
   },
   "dependencies": {
-    "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.18"
+    "@adobe/json-formula": "0.1.50",
+    "@aemforms/af-formatters": "^0.22.20"
   },
   "devDependencies": {
-    "@types/jest": "^27.5.1",
+    "@types/jest": "29.2.4",
     "@types/lodash": "^4.14.171",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
     "@typescript-eslint/parser": "^4.28.2",
@@ -50,11 +56,12 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "form-data": "^4.0.0",
-    "jest": "^27.5.1",
+    "jest": "29.3",
+    "jest-environment-jsdom": "^29.3.1",
     "jest-junit": "^12.2.0",
     "nock": "^13.1.3",
     "node-fetch": "^2.6.1",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "29.0",
     "typedoc": "0.22.11",
     "typedoc-plugin-markdown": "3.11.13",
     "typescript": "^4.3.5"

package/lib/Checkbox.d.ts

@@ -1,88 +0,0 @@
-import Field from './Field';
-/**
- * Implementation of check box runtime model which extends from {@link Field | field} model
- */
-declare class Checkbox extends Field {
-    private offValue;
-    /**
-     * @private
-     */
-    _getConstraintObject(): {
-        type: (constraint: string, inputVal: any) => {
-            valid: boolean;
-            value: any;
-        };
-        format: (constraint: string, input: string | null) => {
-            value: string | null;
-            valid: boolean;
-        };
-        minimum: (constraint: number, value: number) => {
-            valid: boolean;
-            value: number;
-        };
-        maximum: (constraint: number, value: number) => {
-            valid: boolean;
-            value: number;
-        };
-        exclusiveMinimum: (constraint: number, value: number) => {
-            valid: boolean;
-            value: number;
-        };
-        exclusiveMaximum: (constraint: number, value: number) => {
-            valid: boolean;
-            value: number;
-        };
-        minItems: <T>(constraint: number, value: T[]) => {
-            valid: boolean;
-            value: T[];
-        };
-        maxItems: <T_1>(constraint: number, value: T_1[]) => {
-            valid: boolean;
-            value: T_1[];
-        };
-        uniqueItems: <T_2>(constraint: boolean, value: T_2[]) => {
-            valid: boolean;
-            value: T_2[];
-        };
-        minLength: (constraint: number, value: string) => {
-            value: string;
-            valid: boolean;
-        };
-        maxLength: (constraint: number, value: string) => {
-            value: string;
-            valid: boolean;
-        };
-        pattern: (constraint: string | RegExp, value: string) => {
-            valid: boolean;
-            value: string;
-        };
-        required: (constraint: boolean, value: any) => {
-            valid: boolean;
-            value: any;
-        };
-        enum: (constraint: any[], value: any) => {
-            valid: boolean;
-            value: any;
-        };
-        accept: (constraint: string[], value: any) => {
-            valid: boolean;
-            value: any;
-        };
-        maxFileSize: (constraint: string | number, value: any) => {
-            valid: boolean;
-            value: any;
-        };
-    };
-    protected _getDefaults(): {
-        enforceEnum: boolean;
-        readOnly: boolean;
-        enabled: boolean;
-        visible: boolean;
-        type: string | undefined;
-    };
-    /**
-     * Returns the `enum` constraints from the json
-     */
-    get enum(): any[];
-}
-export default Checkbox;

package/lib/Checkbox.js

@@ -1,49 +0,0 @@
-"use strict";
-/*
- * Copyright 2022 Adobe, Inc.
- *
- * Your access and use of this software is governed by the Adobe Customer Feedback Program Terms and Conditions or other Beta License Agreement signed by your employer and Adobe, Inc.. This software is NOT open source and may not be used without one of the foregoing licenses. Even with a foregoing license, your access and use of this file is limited to the earlier of (a) 180 days, (b) general availability of the product(s) which utilize this software (i.e. AEM Forms), (c) January 1, 2023, (d) Adobe providing notice to you that you may no longer use the software or that your beta trial has otherwise ended.
- *
- * 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.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Field_1 = __importDefault(require("./Field"));
-const ValidationUtils_1 = require("./utils/ValidationUtils");
-/**
- * @param offValue
- * @private
- */
-const requiredConstraint = (offValue) => (constraint, value) => {
-    const valid = ValidationUtils_1.Constraints.required(constraint, value).valid && (!constraint || value != offValue);
-    return { valid, value };
-};
-/**
- * Implementation of check box runtime model which extends from {@link Field | field} model
- */
-class Checkbox extends Field_1.default {
-    offValue() {
-        const opts = this.enum;
-        return opts.length > 1 ? opts[1] : null;
-    }
-    /**
-     * @private
-     */
-    _getConstraintObject() {
-        const baseConstraints = Object.assign({}, super._getConstraintObject());
-        baseConstraints.required = requiredConstraint(this.offValue());
-        return baseConstraints;
-    }
-    _getDefaults() {
-        return Object.assign(Object.assign({}, super._getDefaults()), { enforceEnum: true });
-    }
-    /**
-     * Returns the `enum` constraints from the json
-     */
-    get enum() {
-        return this._jsonModel.enum || [];
-    }
-}
-exports.default = Checkbox;

package/lib/CheckboxGroup.js

@@ -1,43 +0,0 @@
-"use strict";
-/*
- * Copyright 2022 Adobe, Inc.
- *
- * Your access and use of this software is governed by the Adobe Customer Feedback Program Terms and Conditions or other Beta License Agreement signed by your employer and Adobe, Inc.. This software is NOT open source and may not be used without one of the foregoing licenses. Even with a foregoing license, your access and use of this file is limited to the earlier of (a) 180 days, (b) general availability of the product(s) which utilize this software (i.e. AEM Forms), (c) January 1, 2023, (d) Adobe providing notice to you that you may no longer use the software or that your beta trial has otherwise ended.
- *
- * 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.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Field_1 = __importDefault(require("./Field"));
-/**
- * Implementation of CheckBoxGroup runtime model which extends from {@link Field | field}
- */
-class CheckboxGroup extends Field_1.default {
-    /**
-     * @param params
-     * @param _options
-     * @private
-     */
-    constructor(params, _options) {
-        super(params, _options);
-    }
-    /**
-     * converts the fallback type, if required, to an array. Since checkbox-group has an array type
-     * @protected
-     */
-    _getFallbackType() {
-        const fallbackType = super._getFallbackType();
-        if (typeof fallbackType === 'string') {
-            return `${fallbackType}[]`;
-        }
-        else {
-            return 'string[]';
-        }
-    }
-    _getDefaults() {
-        return Object.assign(Object.assign({}, super._getDefaults()), { enforceEnum: true, enum: [] });
-    }
-}
-exports.default = CheckboxGroup;