@aemforms/af-core 0.22.146 → 0.22.148

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';
 
@@ -2797,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 = {
@@ -2899,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) {
@@ -2927,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 (networkError) {
+        context.form.logger.error('Network error while invoking a rest API:', networkError);
+        const networkErrorResponse = {
+            body: null,
+            headers: {},
+            error: networkError instanceof Error ? networkError.message : String(networkError)
+        };
+        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();
@@ -4715,6 +4740,13 @@ class Field extends Scriptable {
         this._setProperty('errorMessage', e);
         this._setProperty('validationMessage', e);
     }
+    set constraintMessage(constraint) {
+        const updatedConstraintMessages = {
+            ...this._jsonModel.constraintMessages,
+            [constraint.type]: constraint.message
+        };
+        this._setProperty('constraintMessages', updatedConstraintMessages);
+    }
     _getConstraintObject() {
         return Constraints;
     }
@@ -5567,6 +5599,8 @@ const fetchForm = (url, headers = {}) => {
                 }
                 resolve(jsonString(formObj));
             }
+        }).catch((error) => {
+            reject(`Network error: ${error.message || error}`);
         });
     });
 };

package/esm/types/src/Field.d.ts

@@ -66,6 +66,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
+    set constraintMessage(constraint: {
+        type: keyof ConstraintsMessages;
+        message: string;
+    });
     _getConstraintObject(): {
         enum: (constraint: any, inputVal: any) => {
             valid: boolean;

package/lib/Field.d.ts

@@ -66,6 +66,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
+    set constraintMessage(constraint: {
+        type: keyof ConstraintsMessages;
+        message: string;
+    });
     _getConstraintObject(): {
         enum: (constraint: any, inputVal: any) => {
             valid: boolean;

package/lib/Field.js

@@ -481,6 +481,10 @@ class Field extends Scriptable_1.default {
         this._setProperty('errorMessage', e);
         this._setProperty('validationMessage', e);
     }
+    set constraintMessage(constraint) {
+        const updatedConstraintMessages = Object.assign(Object.assign({}, this._jsonModel.constraintMessages), { [constraint.type]: constraint.message });
+        this._setProperty('constraintMessages', updatedConstraintMessages);
+    }
     _getConstraintObject() {
         return ValidationUtils_1.Constraints;
     }

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 (networkError) {
+        context.form.logger.error('Network error while invoking a rest API:', networkError);
+        const networkErrorResponse = {
+            body: null,
+            headers: {},
+            error: networkError instanceof Error ? networkError.message : String(networkError)
+        };
+        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) => {

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.146",
+  "version": "0.22.148",
   "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.146"
+    "@aemforms/af-formatters": "^0.22.148"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",