@aemforms/af-core 0.22.12 → 0.22.13

package/lib/BaseNode.d.ts

@@ -1,7 +1,16 @@
 import { Action, BaseJson, BaseModel, callbackFn, ContainerModel, FormModel, Primitives, ValidationError } from './types';
 import DataGroup from './data/DataGroup';
 import DataValue from './data/DataValue';
+/**
+ * Defines the properties that are editable. These properties can be modified during rule execution.
+ */
+export declare const editableProperties: string[];
+/**
+ * Defines props that are dynamic and can be changed at runtime.
+ */
+export declare const dynamicProps: string[];
 export declare const target: unique symbol;
+export declare function dependencyTracked(): (target: BaseNode<any>, propertyKey: string, descriptor: PropertyDescriptor) => void;
 /**
  * Defines a generic base class which all objects of form runtime model should extend from.
  * @typeparam T type of the form object which extends from {@link BaseJson | base type}

package/lib/BaseNode.js

@@ -6,14 +6,54 @@
  *
  * 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 __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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseNode = exports.target = void 0;
+exports.BaseNode = exports.dependencyTracked = exports.target = exports.dynamicProps = exports.editableProperties = void 0;
 const controller_1 = require("./controller");
 const DataRefParser_1 = require("./utils/DataRefParser");
 const EmptyDataValue_1 = __importDefault(require("./data/EmptyDataValue"));
+/**
+ * Defines the properties that are editable. These properties can be modified during rule execution.
+ */
+exports.editableProperties = [
+    'value',
+    'label',
+    'description',
+    'visible',
+    'enabled',
+    'readOnly',
+    'enum',
+    'enumNames',
+    'required',
+    'properties',
+    // 'enforceEnum', // not exposed for now
+    'exclusiveMinimum',
+    'exclusiveMaximum',
+    'maxLength',
+    'maximum',
+    'maxItems',
+    'minLength',
+    'minimum',
+    'minItems',
+    'step'
+    // 'placeholder' // not exposed for now.
+];
+/**
+ * Defines props that are dynamic and can be changed at runtime.
+ */
+exports.dynamicProps = [
+    ...exports.editableProperties,
+    'valid',
+    'index'
+];
 /**
  * Implementation of action with target
  * @private
@@ -52,6 +92,19 @@ class ActionImplWithTarget {
     }
 }
 exports.target = Symbol('target');
+function dependencyTracked() {
+    return function (target, propertyKey, descriptor) {
+        const get = descriptor.get;
+        if (get != undefined) {
+            descriptor.get = function () {
+                // @ts-ignore
+                this.ruleEngine.trackDependency(this);
+                return get.call(this);
+            };
+        }
+    };
+}
+exports.dependencyTracked = dependencyTracked;
 /**
  * Defines a generic base class which all objects of form runtime model should extend from.
  * @typeparam T type of the form object which extends from {@link BaseJson | base type}
@@ -235,7 +288,7 @@ class BaseNode {
         if (this._dependents.find(({ node }) => node === dependent) === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
-                const propsToLook = ['value', 'items'];
+                const propsToLook = [...exports.dynamicProps, 'items'];
                 // @ts-ignore
                 const isPropChanged = changes.findIndex(x => {
                     return propsToLook.indexOf(x.propertyName) > -1;
@@ -402,4 +455,19 @@ class BaseNode {
         }
     }
 }
+__decorate([
+    dependencyTracked()
+], BaseNode.prototype, "index", null);
+__decorate([
+    dependencyTracked()
+], BaseNode.prototype, "description", null);
+__decorate([
+    dependencyTracked()
+], BaseNode.prototype, "visible", null);
+__decorate([
+    dependencyTracked()
+], BaseNode.prototype, "label", null);
+__decorate([
+    dependencyTracked()
+], BaseNode.prototype, "properties", null);
 exports.BaseNode = BaseNode;

package/lib/Container.d.ts

@@ -22,7 +22,9 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
      */
     ruleNodeReference(): any;
     get items(): (FieldModel | FieldsetModel)[];
+    get maxItems(): number;
     set maxItems(m: number);
+    get minItems(): number;
     /**
      * returns whether the items in the Panel can repeat or not
      */

package/lib/Container.js

@@ -6,6 +6,12 @@
  *
  * 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 __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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,6 +20,7 @@ const JsonUtils_1 = require("./utils/JsonUtils");
 const Scriptable_1 = __importDefault(require("./Scriptable"));
 const controller_1 = require("./controller");
 const DataGroup_1 = __importDefault(require("./data/DataGroup"));
+const BaseNode_1 = require("./BaseNode");
 /**
  * Defines a generic container class which any form container should extend from.
  * @typeparam T type of the node which extends {@link ContainerJson} and {@link RulesJson}
@@ -34,6 +41,9 @@ class Container extends Scriptable_1.default {
     get items() {
         return this._children;
     }
+    get maxItems() {
+        return this._jsonModel.maxItems;
+    }
     set maxItems(m) {
         this._jsonModel.maxItems = m;
         const minItems = this._jsonModel.minItems || 1;
@@ -48,6 +58,9 @@ class Container extends Scriptable_1.default {
             this.notifyDependents((0, controller_1.propertyChange)('items', elems, null));
         }
     }
+    get minItems() {
+        return this._jsonModel.minItems;
+    }
     /**
      * returns whether the items in the Panel can repeat or not
      */
@@ -192,6 +205,9 @@ class Container extends Scriptable_1.default {
                 this.notifyDependents((0, controller_1.propertyChange)('items', retVal.getState, null));
                 retVal.dispatch(new controller_1.Initialize());
                 retVal.dispatch(new controller_1.ExecuteRule());
+                for (let i = index + 1; i < this._children.length; i++) {
+                    this._children[i].dispatch(new controller_1.ExecuteRule());
+                }
             }
         }
     }
@@ -286,4 +302,10 @@ class Container extends Scriptable_1.default {
         });
     }
 }
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Container.prototype, "maxItems", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Container.prototype, "minItems", null);
 exports.default = Container;

package/lib/Field.d.ts

@@ -15,10 +15,12 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         form: FormModel;
         parent: ContainerModel;
     });
+    private _ruleNodeReference;
     /**
      * @private
      */
     _initialize(): any;
+    ruleNodeReference(): any;
     protected _getDefaults(): {
         readOnly: boolean;
         enabled: boolean;
@@ -103,7 +105,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         };
         maxItems: <T_1>(constraint: number, value: T_1[]) => {
             valid: boolean;
-            value: T_1[];
+            value: T_1[]; /**
+             * Returns the error message for a given constraint
+             * @param constraint
+             */
         };
         uniqueItems: <T_2>(constraint: boolean, value: T_2[]) => {
             valid: boolean;
@@ -208,9 +213,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         minimum?: number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
-        required?: boolean | undefined; /**
-         * @private
-         */
+        required?: boolean | undefined;
         step?: number | undefined;
         type?: string | undefined;
         validationExpression?: string | undefined;

package/lib/Field.js

@@ -6,6 +6,12 @@
  *
  * 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 __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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,6 +36,7 @@ class Field extends Scriptable_1.default {
      */
     constructor(params, _options) {
         super(params, _options);
+        this._ruleNodeReference = [];
         this._applyDefaults();
         this.queueEvent(new controller_1.Initialize());
         this.queueEvent(new controller_1.ExecuteRule());
@@ -41,6 +48,16 @@ class Field extends Scriptable_1.default {
         super._initialize();
         this.setupRuleNode();
     }
+    ruleNodeReference() {
+        var _a;
+        if ((_a = this.type) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) {
+            this._ruleNodeReference = [];
+        }
+        else {
+            this._ruleNodeReference = this;
+        }
+        return this._ruleNodeReference;
+    }
     _getDefaults() {
         return {
             readOnly: false,
@@ -195,8 +212,6 @@ class Field extends Scriptable_1.default {
         }
     }
     get value() {
-        //@ts-ignore
-        this.ruleEngine.trackDependency(this);
         if (this._jsonModel.value === undefined) {
             return null;
         }
@@ -205,11 +220,27 @@ class Field extends Scriptable_1.default {
         }
     }
     set value(v) {
+        var _a;
         const Constraints = this._getConstraintObject();
         const typeRes = Constraints.type(this._jsonModel.type || 'string', v);
         const changes = this._setProperty('value', typeRes.value, false);
         let uniqueRes = { valid: true };
         if (changes.length > 0) {
+            if ((_a = this.type) === null || _a === void 0 ? void 0 : _a.endsWith('[]')) {
+                if (typeRes.value != null) {
+                    typeRes.value.forEach((val, index) => {
+                        this._ruleNodeReference[index] = val;
+                    });
+                    while (typeRes.value.length !== this._ruleNodeReference.length) {
+                        this._ruleNodeReference.pop();
+                    }
+                }
+                else {
+                    while (this._ruleNodeReference.length !== 0) {
+                        this._ruleNodeReference.pop();
+                    }
+                }
+            }
             const dataNode = this.getDataNode();
             if (typeof dataNode !== 'undefined') {
                 dataNode.setValue(this.isEmpty() ? this.emptyValue : this._jsonModel.value, this._jsonModel.value);
@@ -474,4 +505,25 @@ class Field extends Scriptable_1.default {
         return Object.assign(Object.assign({}, super.getState()), { editValue: this.editValue, displayValue: this.displayValue });
     }
 }
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "readOnly", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "enabled", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "valid", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "enum", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "enumNames", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "required", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Field.prototype, "value", null);
 exports.default = Field;

package/lib/Form.d.ts

@@ -3,7 +3,7 @@ import { Action, FieldJson, FieldModel, FieldsetJson, FieldsetModel, FormJson, F
 import FormMetaData from './FormMetaData';
 import EventQueue from './controller/EventQueue';
 import RuleEngine from './rules/RuleEngine';
-declare type LogFunction = 'info' | 'warn' | 'error';
+declare type LogFunction = 'info' | 'warn' | 'error' | 'debug';
 /**
  * Logging levels.
  */
@@ -12,6 +12,7 @@ export declare type LogLevel = 'off' | LogFunction;
  * @private
  */
 export declare class Logger {
+    debug(msg: string): void;
     info(msg: string): void;
     warn(msg: string): void;
     error(msg: string): void;
@@ -70,9 +71,6 @@ declare class Form extends Container<FormJson> implements FormModel {
         enum?: any[] | undefined;
     } & {
         accept?: string[] | undefined;
-        /**
-         * @private
-         */
         enforceEnum?: boolean | undefined;
         exclusiveMinimum?: number | undefined;
         exclusiveMaximum?: number | undefined;
@@ -121,9 +119,6 @@ declare class Form extends Container<FormJson> implements FormModel {
             enumNames?: string[] | undefined;
             enum?: any[] | undefined;
             accept?: string[] | undefined;
-            /**
-             * @private
-             */
             enforceEnum?: boolean | undefined;
             exclusiveMinimum?: number | undefined;
             exclusiveMaximum?: number | undefined;
@@ -171,9 +166,6 @@ declare class Form extends Container<FormJson> implements FormModel {
             enumNames?: string[] | undefined;
             enum?: any[] | undefined;
             accept?: string[] | undefined;
-            /**
-             * @private
-             */
             enforceEnum?: boolean | undefined;
             exclusiveMinimum?: number | undefined;
             exclusiveMaximum?: number | undefined;
@@ -210,9 +202,6 @@ declare class Form extends Container<FormJson> implements FormModel {
                 enum?: any[] | undefined;
             } & {
                 accept?: string[] | undefined;
-                /**
-                 * @private
-                 */
                 enforceEnum?: boolean | undefined;
                 exclusiveMinimum?: number | undefined;
                 exclusiveMaximum?: number | undefined;
@@ -265,9 +254,6 @@ declare class Form extends Container<FormJson> implements FormModel {
                 enum?: any[] | undefined;
             } & {
                 accept?: string[] | undefined;
-                /**
-                 * @private
-                 */
                 enforceEnum?: boolean | undefined;
                 exclusiveMinimum?: number | undefined;
                 exclusiveMaximum?: number | undefined;
@@ -310,9 +296,6 @@ declare class Form extends Container<FormJson> implements FormModel {
                     enum?: any[] | undefined;
                 } & {
                     accept?: string[] | undefined;
-                    /**
-                     * @private
-                     */
                     enforceEnum?: boolean | undefined;
                     exclusiveMinimum?: number | undefined;
                     exclusiveMaximum?: number | undefined;
@@ -365,9 +348,6 @@ declare class Form extends Container<FormJson> implements FormModel {
                     enum?: any[] | undefined;
                 } & {
                     accept?: string[] | undefined;
-                    /**
-                     * @private
-                     */
                     enforceEnum?: boolean | undefined;
                     exclusiveMinimum?: number | undefined;
                     exclusiveMaximum?: number | undefined;

package/lib/Form.js

@@ -21,9 +21,10 @@ const FunctionRuntime_1 = require("./rules/FunctionRuntime");
 const controller_1 = require("./controller");
 const levels = {
     off: 0,
-    info: 1,
-    warn: 2,
-    error: 3
+    debug: 1,
+    info: 2,
+    warn: 3,
+    error: 4
 };
 /**
  * @private
@@ -32,6 +33,9 @@ class Logger {
     constructor(logLevel = 'off') {
         this.logLevel = levels[logLevel];
     }
+    debug(msg) {
+        this.log(msg, 'debug');
+    }
     info(msg) {
         this.log(msg, 'info');
     }

package/lib/Scriptable.d.ts

@@ -1,5 +1,9 @@
 import { Action, RulesJson, ScriptableField } from './types';
 import { BaseNode } from './BaseNode';
+/**
+ * Defines scriptable aspects (ie rules, events) of form runtime model. Any form runtime object which requires
+ * execution of rules/events should extend from this class.
+ */
 declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> implements ScriptableField {
     private _events;
     private _rules;

package/lib/Scriptable.js

@@ -12,27 +12,6 @@ const BaseNode_1 = require("./BaseNode");
  * Defines scriptable aspects (ie rules, events) of form runtime model. Any form runtime object which requires
  * execution of rules/events should extend from this class.
  */
-const dynamicProps = ['label',
-    'enum',
-    'enumNames',
-    'enforceEnum',
-    'exclusiveMinimum',
-    'exclusiveMaximum',
-    'maxLength',
-    'maximum',
-    'maxItems',
-    'minLength',
-    'minimum',
-    'minItems',
-    'required',
-    'step',
-    'description',
-    'properties',
-    'readOnly',
-    'value',
-    'visible',
-    'enabled',
-    'placeholder'];
 class Scriptable extends BaseNode_1.BaseNode {
     constructor() {
         super(...arguments);
@@ -85,7 +64,7 @@ class Scriptable extends BaseNode_1.BaseNode {
             // @ts-ignore
             // the first check is to disable accessing this.value & this.items property
             // otherwise that will trigger dependency tracking
-            if (key in dynamicProps || (key in this && typeof this[key] !== 'function')) {
+            if (key in BaseNode_1.editableProperties || (key in this && typeof this[key] !== 'function')) {
                 try {
                     // @ts-ignore
                     this[key] = value;
@@ -100,19 +79,19 @@ class Scriptable extends BaseNode_1.BaseNode {
         const entries = Object.entries(this.rules);
         if (entries.length > 0) {
             const scope = this.getExpressionScope();
-            const values = entries.map(([prop, rule]) => {
+            entries.forEach(([prop, rule]) => {
                 const node = this.getCompiledRule(prop, rule);
-                let newVal;
                 if (node) {
-                    newVal = this.ruleEngine.execute(node, scope, context, true);
-                    if (dynamicProps.indexOf(prop) > -1) {
+                    const newVal = this.ruleEngine.execute(node, scope, context, true);
+                    if (BaseNode_1.editableProperties.indexOf(prop) > -1) {
                         //@ts-ignore
                         this[prop] = newVal;
                     }
+                    else {
+                        this.form.logger.warn(`${prop} is not a valid editable property.`);
+                    }
                 }
-                return [];
-            }).filter(x => x.length == 2);
-            this.applyUpdates(Object.fromEntries(values));
+            });
         }
     }
     getExpressionScope() {

package/lib/controller/EventQueue.js

@@ -65,8 +65,7 @@ class EventQueue {
         events.forEach(e => {
             const evntNode = new EventNode(node, e);
             const counter = this._runningEventCount[evntNode.valueOf()] || 0;
-            const alreadyExists = this.isQueued(node, e);
-            if (!alreadyExists || counter < EventQueue.MAX_EVENT_CYCLE_COUNT) {
+            if (counter < EventQueue.MAX_EVENT_CYCLE_COUNT) {
                 this.logger.info(`Queued event : ${e.type} node: ${node.id} - ${node.name}`);
                 //console.log(`Event Details ${e.toString()}`)
                 if (priority) {

package/lib/rules/FunctionRuntime.d.ts

@@ -12,11 +12,21 @@ declare type HTTP_VERB = 'GET' | 'POST';
  */
 export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, payloadContentType: string) => Promise<void>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data', input_data?: any) => Promise<void>;
+declare type CustomFunction = Function;
+declare type FunctionDefinition = {
+    _func: CustomFunction;
+    _signature: Array<any>;
+};
 /**
  * Implementation of function runtime
  * @private
  */
 declare class FunctionRuntimeImpl {
+    private customFunctions;
+    registerFunctions(functions: {
+        [key: string]: FunctionDefinition | CustomFunction;
+    }): void;
+    unregisterFunctions(...names: string[]): void;
     getFunctions(): {
         validate: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;

package/lib/rules/FunctionRuntime.js

@@ -162,6 +162,35 @@ const createAction = (name, payload = {}) => {
  * @private
  */
 class FunctionRuntimeImpl {
+    constructor() {
+        this.customFunctions = {};
+    }
+    registerFunctions(functions) {
+        Object.entries(functions).forEach(([name, funcDef]) => {
+            let finalFunction = funcDef;
+            if (typeof funcDef === 'function') {
+                finalFunction = {
+                    _func: (args) => {
+                        // eslint-disable-next-line @typescript-eslint/ban-types
+                        return funcDef(...args);
+                    },
+                    _signature: []
+                };
+            }
+            if (!finalFunction.hasOwnProperty('_func')) {
+                console.warn(`Unable to register function with name ${name}.`);
+                return;
+            }
+            this.customFunctions[name] = finalFunction;
+        });
+    }
+    unregisterFunctions(...names) {
+        names.forEach(name => {
+            if (name in this.customFunctions) {
+                delete this.customFunctions[name];
+            }
+        });
+    }
     getFunctions() {
         // todo: remove these once json-formula exposes a way to call them from custom functions
         function isArray(obj) {
@@ -185,7 +214,7 @@ class FunctionRuntimeImpl {
             }
             return a.toString();
         }
-        return {
+        const defaultFunctions = {
             validate: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
@@ -295,6 +324,7 @@ class FunctionRuntimeImpl {
                 _signature: []
             }
         };
+        return Object.assign(Object.assign({}, defaultFunctions), this.customFunctions);
     }
 }
 const FunctionRuntime = new FunctionRuntimeImpl();

package/lib/rules/RuleEngine.js

@@ -29,9 +29,20 @@ class RuleEngine {
         return new json_formula_1.Formula(rule, customFunctions, undefined, this._globalNames);
     }
     execute(node, data, globals, useValueOf = false) {
+        var _a, _b, _c, _d, _e, _f;
         const oldContext = this._context;
         this._context = globals;
-        const res = node.search(data, globals);
+        let res = undefined;
+        try {
+            node.debug = []; // clean previous debug info
+            res = node.search(data, globals);
+        }
+        catch (err) {
+            (_c = (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _b.logger) === null || _c === void 0 ? void 0 : _c.error(err);
+        }
+        for (const debugInfo of node.debug) {
+            (_f = (_e = (_d = this._context) === null || _d === void 0 ? void 0 : _d.form) === null || _e === void 0 ? void 0 : _e.logger) === null || _f === void 0 ? void 0 : _f.debug(debugInfo);
+        }
         let finalRes = res;
         if (useValueOf) {
             if (typeof res === 'object' && res !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.12",
+  "version": "0.22.13",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",