@aemforms/af-core 0.22.36 → 0.22.38

package/lib/EmailInput.d.ts

@@ -0,0 +1,16 @@
+import Field from './Field';
+declare class EmailInput extends Field {
+    protected _getDefaults(): {
+        format: string;
+        readOnly: boolean;
+        enabled: boolean;
+        visible: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+        required: boolean;
+        type: string | undefined;
+    };
+}
+export default EmailInput;

package/lib/EmailInput.js

@@ -0,0 +1,12 @@
+"use strict";
+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"));
+class EmailInput extends Field_1.default {
+    _getDefaults() {
+        return Object.assign(Object.assign({}, super._getDefaults()), { format: 'email' });
+    }
+}
+exports.default = EmailInput;

package/lib/Field.js

@@ -74,6 +74,7 @@ class Field extends Scriptable_1.default {
                     'multiline-input': 'string',
                     'number-input': 'number',
                     'date-input': 'string',
+                    'email': 'string',
                     'plain-text': 'string',
                     'image': 'string',
                     'checkbox': 'boolean'
@@ -457,6 +458,8 @@ class Field extends Scriptable_1.default {
                 switch (this.format) {
                     case 'date':
                         return ValidationUtils_1.ValidConstraints.date;
+                    case 'email':
+                        return ValidationUtils_1.ValidConstraints.email;
                     case 'binary':
                         return ValidationUtils_1.ValidConstraints.file;
                     case 'data-url':
@@ -660,7 +663,7 @@ __decorate([
     (0, BaseNode_1.dependencyTracked)()
 ], Field.prototype, "value", null);
 __decorate([
-    (0, BaseNode_1.include)('text-input', 'date-input', 'file-input')
+    (0, BaseNode_1.include)('text-input', 'date-input', 'file-input', 'email')
 ], Field.prototype, "format", null);
 __decorate([
     (0, BaseNode_1.include)('text-input')

package/lib/utils/FormCreationUtils.js

@@ -12,10 +12,11 @@ const Checkbox_1 = __importDefault(require("../Checkbox"));
 const CheckboxGroup_1 = __importDefault(require("../CheckboxGroup"));
 const DateField_1 = __importDefault(require("../DateField"));
 const Field_1 = __importDefault(require("../Field"));
+const EmailInput_1 = __importDefault(require("../EmailInput"));
 const alternateFieldTypeMapping = {
     'text': 'text-input',
     'number': 'number-input',
-    'email': 'text-input',
+    'email': 'email',
     'file': 'file-input',
     'range': 'range',
     'textarea': 'multiline-input'
@@ -54,6 +55,9 @@ class FormFieldFactoryImpl {
             else if ((0, JsonUtils_1.isCheckboxGroup)(child)) {
                 retVal = new CheckboxGroup_1.default(child, options);
             }
+            else if ((0, JsonUtils_1.isEmailInput)(child)) {
+                retVal = new EmailInput_1.default(child, options);
+            }
             else if ((0, JsonUtils_1.isDateField)(child)) {
                 retVal = new DateField_1.default(child, options);
             }

package/lib/utils/FormUtils.js

@@ -202,24 +202,19 @@ const dataURItoBlob = (dataURI) => {
     }
 };
 exports.dataURItoBlob = dataURItoBlob;
-const isFormContainer = (model) => {
-    return (':items' in model || 'cqItems' in model) && (':itemsOrder' in model || 'cqItemsOrder' in model) && 'fieldType' in model;
+const isFormOrSiteContainer = (model) => {
+    return (':items' in model || 'cqItems' in model) && (':itemsOrder' in model || 'cqItemsOrder' in model);
 };
 const sitesModelToFormModel = (sitesModel) => {
     if (!sitesModel || !Object.keys(sitesModel).length) {
         return sitesModel;
     }
-    if (isFormContainer(sitesModel)) {
+    if (isFormOrSiteContainer(sitesModel)) {
         const itemsArr = [];
         const itemsOrder = sitesModel[':itemsOrder'] || sitesModel.cqItemsOrder;
         const items = sitesModel[':items'] || sitesModel.cqItems;
         itemsOrder.forEach((elemName) => {
-            if (isFormContainer(items[elemName])) {
-                itemsArr.push((0, exports.sitesModelToFormModel)(items[elemName]));
-            }
-            else {
-                itemsArr.push(items[elemName]);
-            }
+            itemsArr.push((0, exports.sitesModelToFormModel)(items[elemName]));
         });
         sitesModel.items = itemsArr;
     }

package/lib/utils/JsonUtils.d.ts

@@ -4,6 +4,7 @@ export declare const isFile: (item: FieldsetJson | FieldJson) => boolean;
 export declare const checkIfConstraintsArePresent: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCheckbox: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCheckboxGroup: (item: FieldsetJson | FieldJson) => boolean;
+export declare const isEmailInput: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isDateField: (item: FieldsetJson | FieldJson) => boolean;
 export declare function deepClone(obj: any, idGenerator?: () => string): any;
 export declare function checkIfKeyAdded(currentObj: any, prevObj: any, objKey: string): boolean;

package/lib/utils/JsonUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isDateField = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
+exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isDateField = exports.isEmailInput = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
 const index_1 = require("../types/index");
 const SchemaUtils_1 = require("./SchemaUtils");
 const getProperty = (data, key, def) => {
@@ -36,6 +36,11 @@ const isCheckboxGroup = function (item) {
     return fieldType === 'checkbox-group';
 };
 exports.isCheckboxGroup = isCheckboxGroup;
+const isEmailInput = function (item) {
+    const fieldType = (item === null || item === void 0 ? void 0 : item.fieldType) || (0, SchemaUtils_1.defaultFieldTypes)(item);
+    return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'email') || fieldType === 'email';
+};
+exports.isEmailInput = isEmailInput;
 const isDateField = function (item) {
     const fieldType = (item === null || item === void 0 ? void 0 : item.fieldType) || (0, SchemaUtils_1.defaultFieldTypes)(item);
     return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'date') || fieldType === 'date-input';

package/lib/utils/ValidationUtils.d.ts

@@ -9,6 +9,7 @@ declare type ValidConstraintsType = {
     number: ValidationConstraints[];
     array: ValidationConstraints[];
     file: ValidationConstraints[];
+    email: ValidationConstraints[];
 };
 export declare const ValidConstraints: ValidConstraintsType;
 export declare type ValidationConstraints = 'type' | 'format' | 'minimum' | 'maximum' | 'exclusiveMinimum' | 'exclusiveMaximum' | 'minItems' | 'maxItems' | 'uniqueItems' | 'minLength' | 'maxLength' | 'pattern' | 'required' | 'enum' | 'accept' | 'maxFileSize';

package/lib/utils/ValidationUtils.js

@@ -4,6 +4,7 @@ exports.Constraints = exports.ValidConstraints = exports.coerceType = void 0;
 const FormUtils_1 = require("./FormUtils");
 const FileObject_1 = require("../FileObject");
 const dateRegex = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
+const emailRegex = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 const days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 const daysInMonth = (leapYear, month) => {
     if (leapYear && month == 2) {
@@ -114,7 +115,8 @@ exports.ValidConstraints = {
     string: ['minLength', 'maxLength', 'pattern'],
     number: ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'],
     array: ['minItems', 'maxItems', 'uniqueItems'],
-    file: ['accept', 'maxFileSize']
+    file: ['accept', 'maxFileSize'],
+    email: ['minLength', 'maxLength', 'format', 'pattern']
 };
 exports.Constraints = {
     type: (constraint, inputVal) => {
@@ -201,6 +203,9 @@ exports.Constraints = {
                     valid = false;
                 }
                 break;
+            case 'email':
+                valid = new RegExp(emailRegex).test((input || '').trim());
+                break;
             case 'data-url':
                 valid = true;
                 break;

package/package.json

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