@aemforms/af-core 0.22.26 → 0.22.30

package/lib/esm/Container.js

@@ -1,14 +1,34 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { deepClone } from './utils/JsonUtils.js';
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
+import { _ as __decorate, d as dependencyTracked } from './BaseNode-d78cc1b0.js';
+import { isRepeatable, deepClone } from './utils/JsonUtils.js';
 import Scriptable from './Scriptable.js';
-import { ExecuteRule, Initialize, propertyChange } from './controller/Events.js';
+import { propertyChange, Initialize, ExecuteRule, RemoveItem } from './controller/Events.js';
 import DataGroup from './data/DataGroup.js';
-import { dependencyTracked } from './BaseNode.js';
+import './utils/DataRefParser.js';
+import './data/DataValue.js';
+import './data/EmptyDataValue.js';
+import './types/Json.js';
+import './utils/SchemaUtils.js';
+
 class Container extends Scriptable {
     _children = [];
     _childrenReference;
@@ -51,12 +71,39 @@ class Container extends Scriptable {
         return true;
     }
     _activeChild = null;
-    getState() {
+    isSiteContainer(item) {
+        return ':items' in item;
+    }
+    isAFormField(item) {
+        return ('fieldType' in item || 'id' in item || 'name' in item || 'dataRef' in item || 'type' in item);
+    }
+    getItemsState(isRepeatableChild = false) {
+        if (this._jsonModel.type === 'array' || isRepeatable(this._jsonModel) || isRepeatableChild) {
+            return this._children.map(x => {
+                return { ...x.getState(true) };
+            });
+        }
+        else {
+            return this._jsonModel.items.map(x => {
+                if (this.isSiteContainer(x)) {
+                    return {
+                        ...x,
+                        ':items': this.walkSiteContainerItems(x)
+                    };
+                }
+                else if (this.isAFormField(x)) {
+                    return { ...this.form.getElement(x?.id).getState(isRepeatableChild) };
+                }
+                else {
+                    return x;
+                }
+            });
+        }
+    }
+    getState(isRepeatableChild = false) {
         return {
-            ...super.getState(),
-            items: this._children.map(x => {
-                return { ...x.getState() };
-            })
+            ...super.getState(isRepeatableChild),
+            items: this.getItemsState(isRepeatableChild)
         };
     }
     _createChild(child, options) {
@@ -66,6 +113,19 @@ class Container extends Scriptable {
             parent
         });
     }
+    walkSiteContainerItems(x) {
+        return Object.fromEntries(Object.entries(x[':items']).map(([key, value]) => {
+            if (this.isAFormField(value)) {
+                return [key, this.form.getElement(value?.id).getState()];
+            }
+            else if (this.isSiteContainer(value)) {
+                return this.walkSiteContainerItems(value);
+            }
+            else {
+                return [key, value];
+            }
+        }));
+    }
     _addChildToRuleNode(child, options) {
         const self = this;
         const { parent = this } = options;
@@ -105,6 +165,7 @@ class Container extends Scriptable {
             ...deepClone(itemJson, cloneIds ? () => { return form.getUniqueId(); } : undefined)
         };
         const retVal = this._createChild(itemTemplate, { parent: this, form: this.form });
+        itemJson.id = retVal.id;
         this.form.fieldAdded(retVal);
         this._addChildToRuleNode(retVal, { parent: nonTransparentParent });
         if (index === this._children.length) {
@@ -131,7 +192,6 @@ class Container extends Scriptable {
     _initialize() {
         super._initialize();
         const items = this._jsonModel.items || [];
-        this._jsonModel.items = [];
         this._childrenReference = this._jsonModel.type == 'array' ? [] : {};
         if (this._jsonModel.type == 'array' && items.length === 1 && this.getDataNode() != null) {
             this._itemTemplate = deepClone(items[0]);
@@ -145,14 +205,23 @@ class Container extends Scriptable {
                 this._jsonModel.initialItems = Math.max(1, this._jsonModel.minItems);
             }
             for (let i = 0; i < this._jsonModel.initialItems; i++) {
-                const child = this._addChild(this._itemTemplate);
+                const child = this._addChild(this._itemTemplate, null, i > 0);
+                items[0].id = child.id;
                 child._initialize();
             }
         }
         else if (items.length > 0) {
             items.forEach((item) => {
-                const child = this._addChild(item);
-                child._initialize();
+                if (this.isSiteContainer(item)) {
+                    this._initializeSiteContainer(item);
+                }
+                else if (this.isAFormField(item)) {
+                    const child = this._addChild(item);
+                    child._initialize();
+                }
+                else {
+                    this.form.logger.warn('A container item was not initialized.');
+                }
             });
             this._jsonModel.minItems = this._children.length;
             this._jsonModel.maxItems = this._children.length;
@@ -163,6 +232,17 @@ class Container extends Scriptable {
         }
         this.setupRuleNode();
     }
+    _initializeSiteContainer(item) {
+        Object.entries(item[':items']).forEach(([key, value]) => {
+            if (this.isAFormField(value)) {
+                const child = this._addChild(value);
+                child._initialize();
+            }
+            else if (this.isSiteContainer(value)) {
+                return this._initializeSiteContainer(value);
+            }
+        });
+    }
     addItem(action) {
         if ((action.type === 'addItem' || action.type == 'addInstance') && this._itemTemplate != null) {
             if ((this._jsonModel.maxItems === -1) || (this._children.length < this._jsonModel.maxItems)) {
@@ -216,6 +296,14 @@ class Container extends Scriptable {
         }
     }
     reset() {
+        if (this.type === 'array' || isRepeatable(this._jsonModel)) {
+            if (this.items.length > this._jsonModel.initialItems) {
+                const itemsToBeRemoved = this.items.length - this._jsonModel.initialItems;
+                for (let i = 0; i < itemsToBeRemoved; i++) {
+                    this.dispatch(new RemoveItem());
+                }
+            }
+        }
         this.items.forEach(x => {
             x.reset();
         });
@@ -287,4 +375,5 @@ __decorate([
 __decorate([
     dependencyTracked()
 ], Container.prototype, "activeChild", null);
-export default Container;
+
+export { Container as default };

package/lib/esm/DateField.js

@@ -1,5 +1,40 @@
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
 import Field from './Field.js';
-import { formatDate, parseDateSkeleton } from '@aemforms/af-formatters';
+import { parseDateSkeleton, formatDate } from '@aemforms/af-formatters';
+import './BaseNode-d78cc1b0.js';
+import './controller/Events.js';
+import './utils/DataRefParser.js';
+import './data/DataGroup.js';
+import './data/DataValue.js';
+import './data/EmptyDataValue.js';
+import './types/Model.js';
+import './utils/ValidationUtils.js';
+import './utils/FormUtils.js';
+import './utils/JsonUtils.js';
+import './types/Json.js';
+import './utils/SchemaUtils.js';
+import './FileObject.js';
+import './Scriptable.js';
+
 class DateField extends Field {
     _applyDefaults() {
         super._applyDefaults();
@@ -18,4 +53,5 @@ class DateField extends Field {
         }
     }
 }
-export default DateField;
+
+export { DateField as default };

package/lib/esm/Field.d.ts

@@ -145,6 +145,8 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     importData(contextualDataModel: DataGroup): void;
     defaultDataModel(name: string | number): DataValue;
     getState(): {
+        editFormat: string | undefined;
+        displayFormat: string | undefined;
         editValue: any;
         displayValue: any;
         description?: string | undefined;
@@ -194,8 +196,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         valid?: boolean | undefined;
         default?: any;
         value?: any;
-        displayFormat?: string | undefined;
-        editFormat?: string | undefined;
         emptyValue?: "" | "undefined" | "null" | undefined;
         index: number;
         parent: undefined;

package/lib/esm/Field.js

@@ -1,18 +1,39 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { ValidationError } from './types/index.js';
-import { coerceType, Constraints, ValidConstraints } from './utils/ValidationUtils.js';
-import { Change, ExecuteRule, Initialize, Invalid, propertyChange, Valid } from './controller/Events.js';
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
+import { _ as __decorate, s as staticFields, t as target, d as dependencyTracked, e as exclude, i as include } from './BaseNode-d78cc1b0.js';
+import { ValidationError } from './types/Model.js';
+import { Constraints, coerceType, ValidConstraints } from './utils/ValidationUtils.js';
+import { Initialize, ExecuteRule, Change, Valid, Invalid, propertyChange } from './controller/Events.js';
 import Scriptable from './Scriptable.js';
 import { defaultFieldTypes } from './utils/SchemaUtils.js';
 import DataValue from './data/DataValue.js';
-import { dependencyTracked, include, exclude, target, staticFields } from './BaseNode.js';
 import NullDataValue from './data/EmptyDataValue.js';
 import { format } from '@aemforms/af-formatters';
+import './utils/DataRefParser.js';
+import './data/DataGroup.js';
+import './utils/FormUtils.js';
+import './utils/JsonUtils.js';
+import './types/Json.js';
+import './FileObject.js';
+
 const validTypes = ['string', 'number', 'boolean', 'file', 'string[]', 'number[]', 'boolean[]', 'file[]', 'array', 'object'];
 class Field extends Scriptable {
     constructor(params, _options) {
@@ -161,10 +182,10 @@ class Field extends Scriptable {
         }
     }
     get editFormat() {
-        return this._jsonModel.editFormat;
+        return this.withCategory(this._jsonModel.editFormat);
     }
     get displayFormat() {
-        return this._jsonModel.displayFormat;
+        return this.withCategory(this._jsonModel.displayFormat);
     }
     get placeholder() {
         return this._jsonModel.placeholder;
@@ -237,31 +258,43 @@ class Field extends Scriptable {
         return this._jsonModel.value === undefined || this._jsonModel.value === null || this._jsonModel.value === '';
     }
     withCategory(df) {
-        const hasCategory = df?.match(/^(?:date|num)\|/);
-        if (hasCategory == null) {
-            if (this.format === 'date') {
-                df = `date|${df}`;
-            }
-            else if (this.type === 'number') {
-                df = `num|${df}`;
+        if (df) {
+            const hasCategory = df?.match(/^(?:date|num)\|/);
+            if (hasCategory === null) {
+                if (this.format === 'date') {
+                    df = `date|${df}`;
+                }
+                else if (this.type === 'number') {
+                    df = `num|${df}`;
+                }
+                return df;
             }
-            return df;
         }
         return df;
     }
     get editValue() {
-        const df = this.withCategory(this.editFormat);
+        const df = this.editFormat;
         if (df && this.isNotEmpty(this.value) && this.valid !== false) {
-            return format(this.value, this.language, df);
+            try {
+                return format(this.value, this.language, df);
+            }
+            catch (e) {
+                return this.value;
+            }
         }
         else {
             return this.value;
         }
     }
     get displayValue() {
-        const df = this.withCategory(this.displayFormat);
+        const df = this.displayFormat;
         if (df && this.isNotEmpty(this.value) && this.valid !== false) {
-            return format(this.value, this.language, df);
+            try {
+                return format(this.value, this.language, df);
+            }
+            catch (e) {
+                return this.value;
+            }
         }
         else {
             return this.value;
@@ -401,7 +434,7 @@ class Field extends Scriptable {
             const iv = this._jsonModel.minimum || this._jsonModel.default || 0;
             const fIVal = iv * factor;
             const qt = (fVal - fIVal) / fStep;
-            const valid = (fVal - fIVal) % fStep < .001;
+            const valid = Math.abs(fVal - fIVal) % fStep < .001;
             let next, prev;
             if (!valid) {
                 next = (Math.ceil(qt) * fStep + fIVal) / factor;
@@ -604,6 +637,8 @@ class Field extends Scriptable {
     getState() {
         return {
             ...super.getState(),
+            editFormat: this.editFormat,
+            displayFormat: this.displayFormat,
             editValue: this.editValue,
             displayValue: this.displayValue
         };
@@ -653,4 +688,5 @@ __decorate([
 __decorate([
     dependencyTracked()
 ], Field.prototype, "exclusiveMaximum", null);
-export default Field;
+
+export { Field as default };

package/lib/esm/Fieldset.js

@@ -1,9 +1,40 @@
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
 import Container from './Container.js';
-import { ExecuteRule, Initialize } from './controller/Events.js';
+import { Initialize, ExecuteRule } from './controller/Events.js';
+import './BaseNode-d78cc1b0.js';
+import './utils/DataRefParser.js';
+import './data/DataGroup.js';
+import './data/DataValue.js';
+import './data/EmptyDataValue.js';
+import './utils/JsonUtils.js';
+import './types/Json.js';
+import './utils/SchemaUtils.js';
+import './Scriptable.js';
+
 const defaults = {
-    visible: true
+    visible: true,
+    enabled: true
 };
-export class Fieldset extends Container {
+class Fieldset extends Container {
     constructor(params, _options) {
         super(params, _options);
         this._applyDefaults();
@@ -43,3 +74,5 @@ export class Fieldset extends Container {
         this._setProperty('enabled', e);
     }
 }
+
+export { Fieldset };

package/lib/esm/FileObject.js

@@ -1,4 +1,24 @@
-export class FileObject {
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
+class FileObject {
     data;
     mediaType = 'application/octet-stream';
     name = 'unknown';
@@ -24,3 +44,5 @@ export class FileObject {
             this.size === obj.size);
     }
 }
+
+export { FileObject };

package/lib/esm/FileUpload.js

@@ -1,8 +1,40 @@
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
 import { propertyChange } from './controller/Events.js';
 import Field from './Field.js';
 import { getFileSizeInBytes } from './utils/FormUtils.js';
 import { FileObject } from './FileObject.js';
 import { Constraints } from './utils/ValidationUtils.js';
+import './BaseNode-d78cc1b0.js';
+import './utils/DataRefParser.js';
+import './data/DataGroup.js';
+import './data/DataValue.js';
+import './data/EmptyDataValue.js';
+import './types/Model.js';
+import './Scriptable.js';
+import './utils/SchemaUtils.js';
+import '@aemforms/af-formatters';
+import './utils/JsonUtils.js';
+import './types/Json.js';
+
 function addNameToDataURL(dataURL, name) {
     return dataURL.replace(';base64', `;name=${encodeURIComponent(name)};base64`);
 }
@@ -105,4 +137,5 @@ class FileUpload extends Field {
         }
     }
 }
-export default FileUpload;
+
+export { FileUpload as default };

package/lib/esm/Form.d.ts

@@ -100,8 +100,8 @@ declare class Form extends Container<FormJson> implements FormModel {
     validate(): import("./types/Model.js").ValidationError[];
     isValid(): boolean;
     dispatch(action: Action): void;
-    executeAction(action: Action): void;
     submit(action: Action, context: any): void;
+    reset(): void;
     getElement(id: string): FieldModel | FieldsetModel | this;
     get qualifiedName(): string;
     getEventQueue(): EventQueue;

package/lib/esm/Form.js

@@ -1,11 +1,43 @@
+/*************************************************************************
+* ADOBE CONFIDENTIAL
+* ___________________
+*
+* Copyright 2022 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+
+* Adobe permits you to use and modify this file solely in accordance with
+* the terms of the Adobe license agreement accompanying it.
+*************************************************************************/
+
 import Container from './Container.js';
 import FormMetaData from './FormMetaData.js';
 import EventQueue from './controller/EventQueue.js';
 import { Logger } from './controller/Logger.js';
-import { getAttachments, IdGenerator } from './utils/FormUtils.js';
+import { IdGenerator, getAttachments } from './utils/FormUtils.js';
 import DataGroup from './data/DataGroup.js';
 import { submit } from './rules/FunctionRuntime.js';
-import { ExecuteRule, FieldChanged, FormLoad, Initialize, ValidationComplete } from './controller/Events.js';
+import { Initialize, ExecuteRule, FormLoad, FieldChanged, ValidationComplete } from './controller/Events.js';
+import './BaseNode-d78cc1b0.js';
+import './utils/DataRefParser.js';
+import './data/DataValue.js';
+import './data/EmptyDataValue.js';
+import './utils/JsonUtils.js';
+import './types/Json.js';
+import './utils/SchemaUtils.js';
+import './Scriptable.js';
+import './Node.js';
+import './FileObject.js';
+import './utils/Fetch.js';
+
 class Form extends Container {
     _ruleEngine;
     _eventQueue;
@@ -137,17 +169,16 @@ class Form extends Container {
             super.dispatch(action);
         }
     }
-    executeAction(action) {
-        if ((action.type !== 'submit') || this._invalidFields.length === 0) {
-            super.executeAction(action);
-        }
-    }
     submit(action, context) {
         if (this.validate().length === 0) {
             const payload = action?.payload || {};
             submit(context, payload?.success, payload?.error, payload?.submit_as, payload?.data);
         }
     }
+    reset() {
+        super.reset();
+        this._invalidFields = [];
+    }
     getElement(id) {
         if (id == this.id) {
             return this;
@@ -173,4 +204,5 @@ class Form extends Container {
         return this._jsonModel.title || '';
     }
 }
-export default Form;
+
+export { Form as default };