@aemforms/af-core 0.22.145 → 0.22.147

package/esm/afb-runtime.js

@@ -1,4 +1,4 @@
-import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, RequestSuccess, SubmitError, SubmitFailure, RequestFailure, Submit, Save, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
+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 Formula from '@adobe/json-formula';
 import { parseDefaultDate, datetimeToNumber, format, parseDateSkeleton, numberToDatetime, formatDate, parseDate } from '@aemforms/af-formatters';
 
@@ -1606,7 +1606,14 @@ class BaseNode {
         };
     }
     _addDependent(dependent, propertyName) {
-        if (this._dependents.find(({ node }) => node === dependent) === undefined) {
+        const existingDependency = this._dependents.find(({ node, propertyName: existingProp }) => {
+            let isExistingDependent = node === dependent;
+            if (isExistingDependent && propertyName && propertyName.startsWith('properties.')) {
+                isExistingDependent = existingProp === propertyName;
+            }
+            return isExistingDependent;
+        });
+        if (existingDependency === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
                 const propsToLook = [...dynamicProps, 'items'];
@@ -2533,7 +2540,7 @@ class Container extends Scriptable {
                 activeChild.activeChild = null;
                 activeChild = temp;
             }
-            const change = propertyChange('activeChild', c, this._activeChild);
+            const change = propertyChange('activeChild', c?.getState(), this._activeChild?.getState());
             this._activeChild = c;
             if (this.parent && c !== null) {
                 this.parent.activeChild = this;
@@ -2790,6 +2797,9 @@ const request$1 = (url, data = null, options = {}) => {
             body,
             headers
         };
+    }).catch((error) => {
+        console.error(`Network error while fetching from ${url}:`, error);
+        throw error;
     });
 };
 const defaultRequestOptions = {
@@ -2892,25 +2902,11 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
             inputPayload = String(payload);
         }
     }
-    const response = await request$1(endpoint, inputPayload, requestOptions);
-    response.originalRequest = {
-        url: endpoint,
-        method: httpVerb,
-        ...encryptOutput
-    };
-    const targetField = context.$field || null;
-    const targetEvent = context.$event || null;
-    response.submitter = targetField;
-    const enhancedPayload = {
-        request: response.originalRequest,
-        response,
-        targetField,
-        targetEvent
-    };
-    if (response?.status >= 200 && response?.status <= 299) {
-        const eName = getCustomEventName(success);
-        if (success === 'submitSuccess') {
-            context.form.dispatch(new SubmitSuccess(response, true));
+    const dispatchErrorEvents = (response, errorType, enhancedPayload) => {
+        const eName = getCustomEventName(errorType);
+        if (errorType === 'submitError') {
+            context.form.dispatch(new SubmitError(response, true));
+            context.form.dispatch(new SubmitFailure(response, true));
         }
         else {
             if (context.field) {
@@ -2920,26 +2916,62 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
                 context.form.dispatch(new CustomEvent(eName, response, true));
             }
         }
-        context.form.dispatch(new RequestSuccess(enhancedPayload, false));
-    }
-    else {
-        context.form.logger.error('Error invoking a rest API');
-        const eName = getCustomEventName(error);
-        if (error === 'submitError') {
-            context.form.dispatch(new SubmitError(response, true));
-            context.form.dispatch(new SubmitFailure(response, true));
-        }
-        else {
-            if (context.field) {
-                context.field.dispatch(new CustomEvent(eName, response, true));
+        context.form.dispatch(new RequestFailure(enhancedPayload, false));
+    };
+    const targetField = context.$field || null;
+    const baseEnhancedPayload = {
+        request: { url: endpoint, method: httpVerb, ...encryptOutput },
+        targetField: targetField,
+        targetEvent: context.$event || null
+    };
+    try {
+        const response = await request$1(endpoint, inputPayload, requestOptions);
+        response.originalRequest = {
+            url: endpoint,
+            method: httpVerb,
+            ...encryptOutput
+        };
+        response.submitter = targetField;
+        const enhancedPayload = {
+            ...baseEnhancedPayload,
+            response,
+            request: response.originalRequest
+        };
+        if (response?.status >= 200 && response?.status <= 299) {
+            const eName = getCustomEventName(success);
+            if (success === 'submitSuccess') {
+                context.form.dispatch(new SubmitSuccess(response, true));
             }
             else {
-                context.form.dispatch(new CustomEvent(eName, response, true));
+                if (context.field) {
+                    context.field.dispatch(new CustomEvent(eName, response, true));
+                }
+                else {
+                    context.form.dispatch(new CustomEvent(eName, response, true));
+                }
             }
+            context.form.dispatch(new RequestSuccess(enhancedPayload, false));
+        }
+        else {
+            context.form.logger.error('Error invoking a rest API');
+            dispatchErrorEvents(response, error, enhancedPayload);
         }
+        return response;
+    }
+    catch (error) {
+        context.form.logger.error('Network error while invoking a rest API:', error);
+        const networkErrorResponse = {
+            body: null,
+            headers: {},
+            error: error instanceof Error ? error.message : String(error)
+        };
+        const enhancedPayload = {
+            ...baseEnhancedPayload,
+            response: networkErrorResponse
+        };
+        dispatchErrorEvents(networkErrorResponse, error, enhancedPayload);
         context.form.dispatch(new RequestFailure(enhancedPayload, false));
     }
-    return response;
 };
 const urlEncoded = (data) => {
     const formData = new URLSearchParams();
@@ -3554,7 +3586,7 @@ class FunctionRuntimeImpl {
                         return '';
                     }
                     if (interpreter.globals.form?.properties?.queryParams?.[param]) {
-                        return interpreter.globals.form.properties.queryParams[param];
+                        return interpreter.globals.form.properties.queryParams[param.toLowerCase()];
                     }
                     try {
                         const urlParams = new URLSearchParams(window?.location?.search || '');
@@ -5560,6 +5592,8 @@ const fetchForm = (url, headers = {}) => {
                 }
                 resolve(jsonString(formObj));
             }
+        }).catch((error) => {
+            reject(`Network error: ${error.message || error}`);
         });
     });
 };

package/lib/BaseNode.js

@@ -304,7 +304,14 @@ class BaseNode {
         };
     }
     _addDependent(dependent, propertyName) {
-        if (this._dependents.find(({ node }) => node === dependent) === undefined) {
+        const existingDependency = this._dependents.find(({ node, propertyName: existingProp }) => {
+            let isExistingDependent = node === dependent;
+            if (isExistingDependent && propertyName && propertyName.startsWith('properties.')) {
+                isExistingDependent = existingProp === propertyName;
+            }
+            return isExistingDependent;
+        });
+        if (existingDependency === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
                 const propsToLook = [...exports.dynamicProps, 'items'];

package/lib/Container.js

@@ -422,6 +422,7 @@ class Container extends Scriptable_1.default {
         return this._activeChild;
     }
     set activeChild(c) {
+        var _a;
         if (c !== this._activeChild) {
             let activeChild = this._activeChild;
             while (activeChild instanceof Container) {
@@ -429,7 +430,7 @@ class Container extends Scriptable_1.default {
                 activeChild.activeChild = null;
                 activeChild = temp;
             }
-            const change = (0, Events_1.propertyChange)('activeChild', c, this._activeChild);
+            const change = (0, Events_1.propertyChange)('activeChild', c === null || c === void 0 ? void 0 : c.getState(), (_a = this._activeChild) === null || _a === void 0 ? void 0 : _a.getState());
             this._activeChild = c;
             if (this.parent && c !== null) {
                 this.parent.activeChild = this;

package/lib/FormInstance.js

@@ -157,6 +157,8 @@ const fetchForm = (url, headers = {}) => {
                 }
                 resolve((0, JsonUtils_1.jsonString)(formObj));
             }
+        }).catch((error) => {
+            reject(`Network error: ${error.message || error}`);
         });
     });
 };

package/lib/rules/FunctionRuntime.js

@@ -85,21 +85,11 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
             inputPayload = String(payload);
         }
     }
-    const response = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
-    response.originalRequest = Object.assign({ url: endpoint, method: httpVerb }, encryptOutput);
-    const targetField = context.$field || null;
-    const targetEvent = context.$event || null;
-    response.submitter = targetField;
-    const enhancedPayload = {
-        request: response.originalRequest,
-        response,
-        targetField,
-        targetEvent
-    };
-    if ((response === null || response === void 0 ? void 0 : response.status) >= 200 && (response === null || response === void 0 ? void 0 : response.status) <= 299) {
-        const eName = getCustomEventName(success);
-        if (success === 'submitSuccess') {
-            context.form.dispatch(new Events_1.SubmitSuccess(response, true));
+    const dispatchErrorEvents = (response, errorType, enhancedPayload) => {
+        const eName = getCustomEventName(errorType);
+        if (errorType === 'submitError') {
+            context.form.dispatch(new Events_1.SubmitError(response, true));
+            context.form.dispatch(new Events_1.SubmitFailure(response, true));
         }
         else {
             if (context.field) {
@@ -109,26 +99,51 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
                 context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
             }
         }
-        context.form.dispatch(new Events_1.RequestSuccess(enhancedPayload, false));
-    }
-    else {
-        context.form.logger.error('Error invoking a rest API');
-        const eName = getCustomEventName(error);
-        if (error === 'submitError') {
-            context.form.dispatch(new Events_1.SubmitError(response, true));
-            context.form.dispatch(new Events_1.SubmitFailure(response, true));
-        }
-        else {
-            if (context.field) {
-                context.field.dispatch(new Events_1.CustomEvent(eName, response, true));
+        context.form.dispatch(new Events_1.RequestFailure(enhancedPayload, false));
+    };
+    const targetField = context.$field || null;
+    const baseEnhancedPayload = {
+        request: Object.assign({ url: endpoint, method: httpVerb }, encryptOutput),
+        targetField: targetField,
+        targetEvent: context.$event || null
+    };
+    try {
+        const response = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
+        response.originalRequest = Object.assign({ url: endpoint, method: httpVerb }, encryptOutput);
+        response.submitter = targetField;
+        const enhancedPayload = Object.assign(Object.assign({}, baseEnhancedPayload), { response, request: response.originalRequest });
+        if ((response === null || response === void 0 ? void 0 : response.status) >= 200 && (response === null || response === void 0 ? void 0 : response.status) <= 299) {
+            const eName = getCustomEventName(success);
+            if (success === 'submitSuccess') {
+                context.form.dispatch(new Events_1.SubmitSuccess(response, true));
             }
             else {
-                context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
+                if (context.field) {
+                    context.field.dispatch(new Events_1.CustomEvent(eName, response, true));
+                }
+                else {
+                    context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
+                }
             }
+            context.form.dispatch(new Events_1.RequestSuccess(enhancedPayload, false));
         }
+        else {
+            context.form.logger.error('Error invoking a rest API');
+            dispatchErrorEvents(response, error, enhancedPayload);
+        }
+        return response;
+    }
+    catch (error) {
+        context.form.logger.error('Network error while invoking a rest API:', error);
+        const networkErrorResponse = {
+            body: null,
+            headers: {},
+            error: error instanceof Error ? error.message : String(error)
+        };
+        const enhancedPayload = Object.assign(Object.assign({}, baseEnhancedPayload), { response: networkErrorResponse });
+        dispatchErrorEvents(networkErrorResponse, error, enhancedPayload);
         context.form.dispatch(new Events_1.RequestFailure(enhancedPayload, false));
     }
-    return response;
 });
 exports.request = request;
 const urlEncoded = (data) => {
@@ -741,7 +756,7 @@ class FunctionRuntimeImpl {
                         return '';
                     }
                     if ((_c = (_b = (_a = interpreter.globals.form) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.queryParams) === null || _c === void 0 ? void 0 : _c[param]) {
-                        return interpreter.globals.form.properties.queryParams[param];
+                        return interpreter.globals.form.properties.queryParams[param.toLowerCase()];
                     }
                     try {
                         const urlParams = new URLSearchParams(((_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.search) || '');

package/lib/utils/Fetch.js

@@ -37,7 +37,10 @@ const request = (url, data = null, options = {}) => {
             body,
             headers
         };
-    }));
+    })).catch((error) => {
+        console.error(`Network error while fetching from ${url}:`, error);
+        throw error;
+    });
 };
 exports.request = request;
 const defaultRequestOptions = {

package/package.json

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