@aemforms/af-core 0.22.157 → 0.22.158

package/esm/afb-events.js

@@ -192,5 +192,10 @@ class RequestFailure extends ActionImpl {
         super(payload, 'requestFailure', { dispatch });
     }
 }
+class ScriptError extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'scriptError', { dispatch });
+    }
+}
 
-export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, RequestFailure, RequestSuccess, Reset, Save, Submit, SubmitError, SubmitFailure, SubmitSuccess, UIChange, Valid, ValidationComplete, propertyChange };
+export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, RequestFailure, RequestSuccess, Reset, Save, ScriptError, Submit, SubmitError, SubmitFailure, SubmitSuccess, UIChange, Valid, ValidationComplete, propertyChange };

package/esm/afb-runtime.js

@@ -1,4 +1,4 @@
-import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, RequestSuccess, RequestFailure, SubmitError, Submit, Save, SubmitFailure, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
+import { propertyChange, ExecuteRule, ScriptError, Initialize, RemoveItem, SubmitSuccess, CustomEvent, RequestSuccess, RequestFailure, SubmitError, Submit, Save, SubmitFailure, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
 import Formula from '@adobe/json-formula';
 import { parseDefaultDate, datetimeToNumber, format, parseDateSkeleton, numberToDatetime, formatDate, parseDate } from '@aemforms/af-formatters';
 
@@ -1961,8 +1961,8 @@ class Scriptable extends BaseNode {
         if (!(eName in this._rules)) {
             const eString = rule || this.getRules()[eName];
             if (typeof eString === 'string' && eString.length > 0) {
+                let updatedRule = eString;
                 try {
-                    let updatedRule = eString;
                     if (this.fragment !== '$form') {
                         const sanitizedFragment = sanitizeName(this.fragment);
                         updatedRule = eString.replaceAll('$form', sanitizedFragment);
@@ -1970,7 +1970,16 @@ class Scriptable extends BaseNode {
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
                 catch (e) {
-                    this.form.logger.error(`Unable to compile rule \`"${eName}" : "${eString}"\` Exception : ${e}`);
+                    const errorMsg = `Unable to compile rule \`"${eName}" : "${updatedRule}"\` Exception : ${e}`;
+                    this.form.logger.error(errorMsg);
+                    const errorPayload = {
+                        name: this.name,
+                        error: errorMsg,
+                        event: eName,
+                        rule: updatedRule,
+                        stack: e instanceof Error ? e.stack : undefined
+                    };
+                    this.form.dispatch(new ScriptError(errorPayload, false));
                 }
             }
             else {
@@ -1987,8 +1996,8 @@ class Scriptable extends BaseNode {
             }
             if (typeof eString !== 'undefined' && eString.length > 0) {
                 this._events[eName] = eString.map(x => {
+                    let updatedExpr = x;
                     try {
-                        let updatedExpr = x;
                         if (this.fragment !== '$form') {
                             const sanitizedFragment = sanitizeName(this.fragment);
                             updatedExpr = x.replaceAll('$form', sanitizedFragment);
@@ -1996,7 +2005,16 @@ class Scriptable extends BaseNode {
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }
                     catch (e) {
-                        this.form.logger.error(`Unable to compile expression \`"${eName}" : "${eString}"\` Exception : ${e}`);
+                        const errorMsg = `Unable to compile expression \`"${eName}" : "${updatedExpr}"\` Exception : ${e}`;
+                        this.form.logger.error(errorMsg);
+                        const errorPayload = {
+                            name: this.name,
+                            error: errorMsg,
+                            event: eName,
+                            rule: updatedExpr,
+                            stack: e instanceof Error ? e.stack : undefined
+                        };
+                        this.form.dispatch(new ScriptError(errorPayload, false));
                     }
                     return null;
                 }).filter(x => x !== null);
@@ -4313,6 +4331,22 @@ class RuleEngine {
         }
         catch (err) {
             this._context?.form?.logger?.error(err);
+            if (this._context?.form) {
+                const field = this._context?.field;
+                const fieldName = field?.name;
+                const errorMsg = err instanceof Error ? err.message : String(err);
+                const fullError = fieldName
+                    ? `Script execution error in field "${fieldName}": ${errorMsg}. Expression: ${eString}`
+                    : `Script execution error: ${errorMsg}. Expression: ${eString}`;
+                const errorPayload = {
+                    name: fieldName,
+                    error: fullError,
+                    event: this._context?.$event?.type,
+                    rule: eString,
+                    stack: err instanceof Error ? err.stack : undefined
+                };
+                this._context.form.dispatch(new ScriptError(errorPayload, false));
+            }
         }
         if (this.debugInfo.length) {
             this._context?.form?.logger?.warn(`Form rule expression string: ${eString}`);

package/esm/types/src/controller/Events.d.ts

@@ -114,4 +114,14 @@ export declare class RequestSuccess extends ActionImpl {
 export declare class RequestFailure extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }
+export type ScriptErrorPayload = {
+    name?: string;
+    error: string;
+    event?: string;
+    rule?: string;
+    stack?: string;
+};
+export declare class ScriptError extends ActionImpl {
+    constructor(payload: ScriptErrorPayload, dispatch?: boolean);
+}
 export {};

package/esm/types/src/controller/Logger.d.ts

@@ -1,11 +1,11 @@
 export type LogFunction = 'info' | 'warn' | 'error' | 'debug';
 export type LogLevel = 'off' | LogFunction;
 export declare class Logger {
-    debug(msg: string): void;
-    info(msg: string): void;
-    warn(msg: string): void;
-    error(msg: string): void;
-    log(msg: string, level: LogFunction): void;
+    debug(msg: any): void;
+    info(msg: any): void;
+    warn(msg: any): void;
+    error(msg: any): void;
+    log(msg: any, level: LogFunction): void;
     isLevelEnabled(level: LogFunction): boolean;
     private logLevel;
     constructor(logLevel?: LogLevel);

package/lib/Scriptable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseNode_1 = require("./BaseNode");
 const FormUtils_1 = require("./utils/FormUtils");
+const Events_1 = require("./controller/Events");
 class Scriptable extends BaseNode_1.BaseNode {
     constructor() {
         super(...arguments);
@@ -15,8 +16,8 @@ class Scriptable extends BaseNode_1.BaseNode {
         if (!(eName in this._rules)) {
             const eString = rule || this.getRules()[eName];
             if (typeof eString === 'string' && eString.length > 0) {
+                let updatedRule = eString;
                 try {
-                    let updatedRule = eString;
                     if (this.fragment !== '$form') {
                         const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
                         updatedRule = eString.replaceAll('$form', sanitizedFragment);
@@ -24,7 +25,16 @@ class Scriptable extends BaseNode_1.BaseNode {
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
                 catch (e) {
-                    this.form.logger.error(`Unable to compile rule \`"${eName}" : "${eString}"\` Exception : ${e}`);
+                    const errorMsg = `Unable to compile rule \`"${eName}" : "${updatedRule}"\` Exception : ${e}`;
+                    this.form.logger.error(errorMsg);
+                    const errorPayload = {
+                        name: this.name,
+                        error: errorMsg,
+                        event: eName,
+                        rule: updatedRule,
+                        stack: e instanceof Error ? e.stack : undefined
+                    };
+                    this.form.dispatch(new Events_1.ScriptError(errorPayload, false));
                 }
             }
             else {
@@ -42,8 +52,8 @@ class Scriptable extends BaseNode_1.BaseNode {
             }
             if (typeof eString !== 'undefined' && eString.length > 0) {
                 this._events[eName] = eString.map(x => {
+                    let updatedExpr = x;
                     try {
-                        let updatedExpr = x;
                         if (this.fragment !== '$form') {
                             const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
                             updatedExpr = x.replaceAll('$form', sanitizedFragment);
@@ -51,7 +61,16 @@ class Scriptable extends BaseNode_1.BaseNode {
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }
                     catch (e) {
-                        this.form.logger.error(`Unable to compile expression \`"${eName}" : "${eString}"\` Exception : ${e}`);
+                        const errorMsg = `Unable to compile expression \`"${eName}" : "${updatedExpr}"\` Exception : ${e}`;
+                        this.form.logger.error(errorMsg);
+                        const errorPayload = {
+                            name: this.name,
+                            error: errorMsg,
+                            event: eName,
+                            rule: updatedExpr,
+                            stack: e instanceof Error ? e.stack : undefined
+                        };
+                        this.form.dispatch(new Events_1.ScriptError(errorPayload, false));
                     }
                     return null;
                 }).filter(x => x !== null);

package/lib/controller/Events.d.ts

@@ -114,4 +114,14 @@ export declare class RequestSuccess extends ActionImpl {
 export declare class RequestFailure extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }
+export declare type ScriptErrorPayload = {
+    name?: string;
+    error: string;
+    event?: string;
+    rule?: string;
+    stack?: string;
+};
+export declare class ScriptError extends ActionImpl {
+    constructor(payload: ScriptErrorPayload, dispatch?: boolean);
+}
 export {};

package/lib/controller/Events.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestFailure = exports.RequestSuccess = exports.RemoveInstance = exports.AddInstance = exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Reset = exports.SubmitError = exports.SubmitFailure = exports.SubmitSuccess = exports.Save = exports.Submit = exports.Focus = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.UIChange = exports.Change = void 0;
+exports.ScriptError = exports.RequestFailure = exports.RequestSuccess = exports.RemoveInstance = exports.AddInstance = exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Reset = exports.SubmitError = exports.SubmitFailure = exports.SubmitSuccess = exports.Save = exports.Submit = exports.Focus = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.UIChange = exports.Change = void 0;
 var EventSource;
 (function (EventSource) {
     EventSource["CODE"] = "code";
@@ -216,3 +216,9 @@ class RequestFailure extends ActionImpl {
     }
 }
 exports.RequestFailure = RequestFailure;
+class ScriptError extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'scriptError', { dispatch });
+    }
+}
+exports.ScriptError = ScriptError;

package/lib/controller/Logger.d.ts

@@ -1,11 +1,11 @@
 export declare type LogFunction = 'info' | 'warn' | 'error' | 'debug';
 export declare type LogLevel = 'off' | LogFunction;
 export declare class Logger {
-    debug(msg: string): void;
-    info(msg: string): void;
-    warn(msg: string): void;
-    error(msg: string): void;
-    log(msg: string, level: LogFunction): void;
+    debug(msg: any): void;
+    info(msg: any): void;
+    warn(msg: any): void;
+    error(msg: any): void;
+    log(msg: any, level: LogFunction): void;
     isLevelEnabled(level: LogFunction): boolean;
     private logLevel;
     constructor(logLevel?: LogLevel);

package/lib/rules/RuleEngine.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const json_formula_1 = __importDefault(require("@adobe/json-formula"));
 const FunctionRuntime_1 = require("./FunctionRuntime");
 const CoercionUtils_1 = require("../utils/CoercionUtils");
+const Events_1 = require("../controller/Events");
 function getStringToNumberFn(locale) {
     if (locale == null) {
         const localeOptions = new Intl.DateTimeFormat().resolvedOptions();
@@ -29,7 +30,7 @@ class RuleEngine {
         return { formula, ast: formula.compile(rule, this._globalNames) };
     }
     execute(node, data, globals, useValueOf = false, eString) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const { formula, ast } = node;
         const oldContext = this._context;
         this._context = globals;
@@ -39,11 +40,27 @@ class RuleEngine {
         }
         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);
+            if ((_d = this._context) === null || _d === void 0 ? void 0 : _d.form) {
+                const field = (_e = this._context) === null || _e === void 0 ? void 0 : _e.field;
+                const fieldName = field === null || field === void 0 ? void 0 : field.name;
+                const errorMsg = err instanceof Error ? err.message : String(err);
+                const fullError = fieldName
+                    ? `Script execution error in field "${fieldName}": ${errorMsg}. Expression: ${eString}`
+                    : `Script execution error: ${errorMsg}. Expression: ${eString}`;
+                const errorPayload = {
+                    name: fieldName,
+                    error: fullError,
+                    event: (_g = (_f = this._context) === null || _f === void 0 ? void 0 : _f.$event) === null || _g === void 0 ? void 0 : _g.type,
+                    rule: eString,
+                    stack: err instanceof Error ? err.stack : undefined
+                };
+                this._context.form.dispatch(new Events_1.ScriptError(errorPayload, false));
+            }
         }
         if (this.debugInfo.length) {
-            (_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.warn(`Form rule expression string: ${eString}`);
+            (_k = (_j = (_h = this._context) === null || _h === void 0 ? void 0 : _h.form) === null || _j === void 0 ? void 0 : _j.logger) === null || _k === void 0 ? void 0 : _k.warn(`Form rule expression string: ${eString}`);
             while (this.debugInfo.length > 0) {
-                (_j = (_h = (_g = this._context) === null || _g === void 0 ? void 0 : _g.form) === null || _h === void 0 ? void 0 : _h.logger) === null || _j === void 0 ? void 0 : _j.warn(this.debugInfo.pop());
+                (_o = (_m = (_l = this._context) === null || _l === void 0 ? void 0 : _l.form) === null || _m === void 0 ? void 0 : _m.logger) === null || _o === void 0 ? void 0 : _o.warn(this.debugInfo.pop());
             }
         }
         let finalRes = res;

package/package.json

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