@aemforms/af-core 0.22.41 → 0.22.43

package/lib/BaseNode.js

@@ -198,7 +198,13 @@ class BaseNode {
         return this._jsonModel.dataRef;
     }
     get visible() {
-        return this._jsonModel.visible;
+        var _a, _b;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.visible) !== undefined) {
+            return ((_b = this.parent) === null || _b === void 0 ? void 0 : _b.visible) ? this._jsonModel.visible : false;
+        }
+        else {
+            return this._jsonModel.visible;
+        }
     }
     set visible(v) {
         if (v !== this._jsonModel.visible) {

package/lib/Container.d.ts

@@ -11,6 +11,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
     });
+    protected _getDefaults(): any;
     ruleNodeReference(): any;
     get items(): (FieldModel | FieldsetModel)[];
     get maxItems(): number;
@@ -24,6 +25,8 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     private getItemsState;
     getState(isRepeatableChild?: boolean): T & {
         items: any[];
+        enabled: boolean | undefined;
+        readOnly: any;
         properties: {
             [key: string]: any;
         };
@@ -54,5 +57,10 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     syncDataAndFormModel(contextualDataModel?: DataGroup): void;
     get activeChild(): BaseModel | null;
     set activeChild(c: BaseModel | null);
+    get enabled(): boolean | undefined;
+    set enabled(e: boolean | undefined);
+    get readOnly(): any;
+    set readOnly(e: any);
+    notifyChildren(action: Action): void;
 }
 export default Container;

package/lib/Container.js

@@ -14,6 +14,9 @@ const Scriptable_1 = __importDefault(require("./Scriptable"));
 const Events_1 = require("./controller/Events");
 const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const BaseNode_1 = require("./BaseNode");
+const notifyChildrenAttributes = [
+    'readOnly', 'enabled'
+];
 class Container extends Scriptable_1.default {
     constructor(json, _options) {
         super(json, { form: _options.form, parent: _options.parent });
@@ -22,6 +25,9 @@ class Container extends Scriptable_1.default {
         this._activeChild = null;
         this.fieldFactory = _options.fieldFactory;
     }
+    _getDefaults() {
+        return Object.assign(Object.assign({}, super._getDefaults()), { enabled: true, readOnly: false });
+    }
     ruleNodeReference() {
         return this._childrenReference;
     }
@@ -81,7 +87,7 @@ class Container extends Scriptable_1.default {
         }
     }
     getState(isRepeatableChild = false) {
-        return Object.assign(Object.assign({}, super.getState(isRepeatableChild)), { items: this.getItemsState(isRepeatableChild) });
+        return Object.assign(Object.assign({}, super.getState(isRepeatableChild)), { items: this.getItemsState(isRepeatableChild), enabled: this.enabled, readOnly: this.readOnly });
     }
     _createChild(child, options) {
         const { parent = this } = options;
@@ -340,6 +346,44 @@ class Container extends Scriptable_1.default {
             this.notifyDependents(change);
         }
     }
+    get enabled() {
+        var _a, _b;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.enabled) !== undefined) {
+            return !((_b = this.parent) === null || _b === void 0 ? void 0 : _b.enabled) ? false : this._jsonModel.enabled;
+        }
+        else {
+            return this._jsonModel.enabled;
+        }
+    }
+    set enabled(e) {
+        this._setProperty('enabled', e, true, this.notifyChildren);
+    }
+    get readOnly() {
+        var _a;
+        if (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.readOnly) !== undefined) {
+            return this.parent.readOnly ? true : this._jsonModel.readOnly;
+        }
+        else {
+            return this._jsonModel.readOnly;
+        }
+    }
+    set readOnly(e) {
+        this._setProperty('readOnly', e, true, this.notifyChildren);
+    }
+    notifyChildren(action) {
+        if (action.payload !== undefined && action.payload.changes !== undefined) {
+            for (const change of action.payload.changes) {
+                if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
+                    this.items.forEach((child) => {
+                        this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
+                        if (child.fieldType === 'panel') {
+                            this.notifyChildren.call(child, action);
+                        }
+                    });
+                }
+            }
+        }
+    }
 }
 __decorate([
     (0, BaseNode_1.dependencyTracked)()

package/lib/Field.d.ts

@@ -36,8 +36,8 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get emptyValue(): "" | null | undefined;
     get enum(): any[] | undefined;
     set enum(e: any[] | undefined);
-    get enumNames(): string[] | undefined;
-    set enumNames(e: string[] | undefined);
+    get enumNames(): string[] | import("./types").EnumName[] | undefined;
+    set enumNames(e: string[] | import("./types").EnumName[] | undefined);
     get required(): boolean;
     set required(r: boolean);
     get maximum(): number | undefined;
@@ -158,7 +158,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         description?: string | undefined;
         rules: import("./types").Items<string> & {};
         events: import("./types").Items<string | string[] | undefined> & {};
-        enumNames?: string[] | undefined;
+        enumNames?: string[] | import("./types").EnumName[] | undefined;
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
@@ -207,5 +207,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         qualifiedName: any;
         id: string;
     };
+    markAsInvalid(message: string): void;
 }
 export default Field;

package/lib/Field.js

@@ -18,7 +18,7 @@ const DataValue_1 = __importDefault(require("./data/DataValue"));
 const BaseNode_1 = require("./BaseNode");
 const EmptyDataValue_1 = __importDefault(require("./data/EmptyDataValue"));
 const af_formatters_1 = require("@aemforms/af-formatters");
-const validTypes = ['string', 'number', 'boolean', 'file', 'string[]', 'number[]', 'boolean[]', 'file[]', 'array', 'object'];
+const validTypes = ['string', 'number', 'integer', 'boolean', 'file', 'string[]', 'number[]', 'integer[]', 'boolean[]', 'file[]', 'array', 'object'];
 class Field extends Scriptable_1.default {
     constructor(params, _options) {
         super(params, _options);
@@ -258,7 +258,7 @@ class Field extends Scriptable_1.default {
                 if (this.format === 'date') {
                     df = `date|${df}`;
                 }
-                else if (this.type === 'number') {
+                else if (this.type === 'number' || this.type === 'integer') {
                     df = `num|${df}`;
                 }
                 return df;
@@ -612,6 +612,9 @@ class Field extends Scriptable_1.default {
         }
     }
     validate() {
+        if (this.visible === false) {
+            return [];
+        }
         const changes = this.evaluateConstraints();
         if (changes.valid) {
             this.triggerValidationEvent(changes);
@@ -635,6 +638,16 @@ class Field extends Scriptable_1.default {
     getState() {
         return Object.assign(Object.assign({}, super.getState()), { editFormat: this.editFormat, displayFormat: this.displayFormat, editValue: this.editValue, displayValue: this.displayValue, enabled: this.enabled, readOnly: this.readOnly });
     }
+    markAsInvalid(message) {
+        const changes = {
+            'valid': false,
+            'errorMessage': message
+        };
+        const updates = this._applyUpdates(['valid', 'errorMessage'], changes);
+        this.triggerValidationEvent(updates);
+        const changeAction = new Events_1.Change({ changes: [].concat(Object.values(updates)) });
+        this.dispatch(changeAction);
+    }
 }
 __decorate([
     (0, BaseNode_1.dependencyTracked)(),

package/lib/Fieldset.d.ts

@@ -1,82 +1,15 @@
 import Container from './Container';
-import { Action, ContainerModel, FieldModel, FieldsetJson, FieldsetModel, FormModel, IFormFieldFactory } from './types/index';
+import { ContainerModel, FieldsetJson, FieldsetModel, FormModel, IFormFieldFactory } from './types/index';
 export declare class Fieldset extends Container<FieldsetJson> implements FieldsetModel {
     constructor(params: FieldsetJson, _options: {
         form: FormModel;
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
     });
-    protected _getDefaults(): {
-        visible: boolean;
-        enabled: boolean;
-        readOnly: boolean;
-        required: boolean;
-        label: {
-            visible: boolean;
-            richText: boolean;
-        };
-    };
+    protected _getDefaults(): any;
     private _applyDefaults;
     get type(): "array" | "object" | undefined;
-    get items(): (FieldModel | FieldsetModel)[];
+    get items(): (import("./types/Model").FieldModel | FieldsetModel)[];
     get value(): null;
     get fieldType(): string;
-    get enabled(): boolean | undefined;
-    set enabled(e: boolean | undefined);
-    get readOnly(): boolean | undefined;
-    set readOnly(e: boolean | undefined);
-    notifyChildren(action: Action): void;
-    getState(): {
-        enabled: boolean | undefined;
-        readOnly: boolean | undefined;
-        description?: string | undefined;
-        rules: import("./types/Json").Items<string> & {};
-        events: import("./types/Json").Items<string | string[] | undefined> & {};
-        enumNames?: string[] | undefined;
-        enum?: any[] | undefined;
-        accept?: string[] | undefined;
-        enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
-        format?: string | undefined;
-        maxFileSize?: string | number | undefined;
-        maxLength?: number | undefined;
-        maximum?: number | undefined;
-        maxItems?: number | undefined;
-        minOccur?: number | undefined;
-        maxOccur?: number | undefined;
-        minLength?: number | undefined;
-        minimum?: number | undefined;
-        minItems?: number | undefined;
-        pattern?: string | undefined;
-        required?: boolean | undefined;
-        step?: number | undefined;
-        type?: "object" | "array" | undefined;
-        validationExpression?: string | undefined;
-        uniqueItems?: boolean | undefined;
-        dataRef?: string | null | undefined;
-        lang?: string | undefined;
-        ':type': string;
-        label?: import("./types/Json").Label | undefined;
-        visible?: boolean | undefined;
-        name?: string | undefined;
-        constraintMessages?: import("./types/Json").ConstraintsMessages | undefined;
-        fieldType?: string | undefined;
-        errorMessage?: string | undefined;
-        properties: {
-            [key: string]: any;
-        };
-        repeatable: boolean | undefined;
-        screenReaderText?: string | undefined;
-        tooltip?: string | undefined;
-        altText?: string | undefined;
-        viewType?: string | undefined;
-        items: (import("./types/Json").FieldJson | import("./types/Json").ContainerJson)[] & any[];
-        initialItems?: number | undefined;
-        activeChild?: string | undefined;
-        index: number;
-        parent: undefined;
-        qualifiedName: any;
-        id: string;
-    };
 }

package/lib/Fieldset.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fieldset = void 0;
 const Container_1 = __importDefault(require("./Container"));
 const Events_1 = require("./controller/Events");
-const notifyChildrenAttributes = [
-    'readOnly', 'enabled'
-];
 class Fieldset extends Container_1.default {
     constructor(params, _options) {
         super(params, _options);
@@ -17,16 +14,10 @@ class Fieldset extends Container_1.default {
         this.queueEvent(new Events_1.ExecuteRule());
     }
     _getDefaults() {
-        return {
-            visible: true,
-            enabled: true,
-            readOnly: false,
-            required: false,
-            label: {
+        return Object.assign(Object.assign({}, super._getDefaults()), { visible: true, required: false, label: {
                 visible: true,
                 richText: false
-            }
-        };
+            } });
     }
     _applyDefaults() {
         super._applyDefaultsInModel();
@@ -50,44 +41,5 @@ class Fieldset extends Container_1.default {
     get fieldType() {
         return 'panel';
     }
-    get enabled() {
-        if (this.parent.enabled !== undefined) {
-            return this.parent.enabled === false ? false : this._jsonModel.enabled;
-        }
-        else {
-            return this._jsonModel.enabled;
-        }
-    }
-    set enabled(e) {
-        this._setProperty('enabled', e, true, this.notifyChildren);
-    }
-    get readOnly() {
-        if (this.parent.readOnly !== undefined) {
-            return this.parent.readOnly === true ? true : this._jsonModel.readOnly;
-        }
-        else {
-            return this._jsonModel.readOnly;
-        }
-    }
-    set readOnly(e) {
-        this._setProperty('readOnly', e, true, this.notifyChildren);
-    }
-    notifyChildren(action) {
-        if (action.payload !== undefined && action.payload.changes !== undefined) {
-            for (const change of action.payload.changes) {
-                if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
-                    this.items.forEach((child) => {
-                        this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
-                        if (child.fieldType === 'panel') {
-                            this.notifyChildren.call(child, action);
-                        }
-                    });
-                }
-            }
-        }
-    }
-    getState() {
-        return Object.assign(Object.assign({}, super.getState()), { enabled: this.enabled, readOnly: this.readOnly });
-    }
 }
 exports.Fieldset = Fieldset;

package/lib/Form.d.ts

@@ -22,7 +22,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     getState(): {
         description?: string | undefined;
     } & import("./types/Json").RulesJson & {
-        enumNames?: string[] | undefined;
+        enumNames?: string[] | import("./types/Json").EnumName[] | undefined;
         enum?: any[] | undefined;
     } & {
         accept?: string[] | undefined;
@@ -77,6 +77,8 @@ declare class Form extends Container<FormJson> implements FormModel {
         lang?: string | undefined;
     } & {
         items: any[];
+        enabled: boolean | undefined;
+        readOnly: any;
         properties: {
             [key: string]: any;
         };

package/lib/rules/FunctionRuntime.d.ts

@@ -41,6 +41,14 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];
         };
+        addInstance: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => void;
+            _signature: never[];
+        };
+        removeInstance: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => void;
+            _signature: never[];
+        };
         dispatchEvent: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];

package/lib/rules/FunctionRuntime.js

@@ -162,8 +162,14 @@ class FunctionRuntimeImpl {
             let finalFunction = funcDef;
             if (typeof funcDef === 'function') {
                 finalFunction = {
-                    _func: (args) => {
-                        return funcDef(...args);
+                    _func: (args, data, interpreter) => {
+                        const globals = {
+                            form: interpreter.globals.form,
+                            invoke: (funcName, ...args) => {
+                                return this.customFunctions[funcName]._func.call(undefined, args, data, interpreter);
+                            }
+                        };
+                        return funcDef(...args, globals);
                     },
                     _signature: []
                 };
@@ -295,6 +301,36 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            addInstance: {
+                _func: (args, data, interpreter) => {
+                    const element = args[0];
+                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    try {
+                        const formElement = interpreter.globals.form.getElement(element.$id);
+                        const action = createAction('addInstance', payload);
+                        formElement.addItem(action);
+                    }
+                    catch (e) {
+                        interpreter.globals.form.logger.error('Invalid argument passed in addInstance. An element is expected');
+                    }
+                },
+                _signature: []
+            },
+            removeInstance: {
+                _func: (args, data, interpreter) => {
+                    const element = args[0];
+                    const payload = args.length > 2 ? valueOf(args[2]) : undefined;
+                    try {
+                        const formElement = interpreter.globals.form.getElement(element.$id);
+                        const action = createAction('removeInstance', payload);
+                        formElement.removeItem(action);
+                    }
+                    catch (e) {
+                        interpreter.globals.form.logger.error('Invalid argument passed in removeInstance. An element is expected');
+                    }
+                },
+                _signature: []
+            },
             dispatchEvent: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];

package/lib/types/Json.d.ts

@@ -7,8 +7,12 @@ export declare type Label = {
     richText?: boolean;
     visible?: boolean;
 };
+export declare type EnumName = {
+    value: string;
+    richText?: boolean;
+};
 declare type TranslationConstraintsJson = {
-    enumNames?: string[];
+    enumNames?: string[] | EnumName[];
     enum?: any[];
 };
 export declare type ConstraintsJson = TranslationConstraintsJson & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.41",
+  "version": "0.22.43",
   "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.41"
+    "@aemforms/af-formatters": "^0.22.43"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",