@aemforms/af-core 0.22.122 → 0.22.123

package/esm/afb-runtime.js

@@ -2413,7 +2413,7 @@ class Container extends Scriptable {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                        if (change.currentValue !== child._jsonModel[change.propertyName]) {
                             child._jsonModel[change.propertyName] = change.currentValue;
                             this.notifyDependents.call(child, propertyChange(change.propertyName, child.getState()[change.propertyName], null));
                         }
@@ -2722,6 +2722,14 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         method: httpVerb,
         ...encryptOutput
     };
+    const targetField = context.$field || null;
+    const targetEvent = context.$event || null;
+    const enhancedPayload = {
+        request: response.originalRequest,
+        response,
+        targetField,
+        targetEvent
+    };
     if (response?.status >= 200 && response?.status <= 299) {
         const eName = getCustomEventName(success);
         if (success === 'submitSuccess') {
@@ -2730,7 +2738,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         else {
             context.form.dispatch(new CustomEvent(eName, response, true));
         }
-        context.form.dispatch(new RequestSuccess(response, true));
+        context.form.dispatch(new RequestSuccess(enhancedPayload, false));
     }
     else {
         context.form.logger.error('Error invoking a rest API');
@@ -2742,8 +2750,9 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         else {
             context.form.dispatch(new CustomEvent(eName, response, true));
         }
-        context.form.dispatch(new RequestFailure(response, true));
+        context.form.dispatch(new RequestFailure(enhancedPayload, false));
     }
+    return response;
 };
 const urlEncoded = (data) => {
     const formData = new URLSearchParams();
@@ -3128,6 +3137,65 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            requestWithRetry: {
+                _func: (args, data, interpreter) => {
+                    const uri = toString(args[0]);
+                    const httpVerb = toString(args[1]);
+                    let success;
+                    let errorFn;
+                    let payload = valueOf(args[2]);
+                    if (typeof (args[3]) === 'string') {
+                        success = valueOf(args[3]);
+                        errorFn = valueOf(args[4]);
+                    }
+                    return async (retryOptions) => {
+                        try {
+                            if (payload instanceof Promise) {
+                                payload = await payload;
+                            }
+                        }
+                        catch (error) {
+                            console.error('Error resolving payload Promise:', error);
+                            throw error;
+                        }
+                        let finalHeaders = payload.headers || {};
+                        let finalBody = payload.body || {};
+                        if (retryOptions) {
+                            if (retryOptions.body) {
+                                finalBody = {
+                                    ...finalBody,
+                                    ...retryOptions.body
+                                };
+                            }
+                            if (retryOptions.headers) {
+                                finalHeaders = {
+                                    ...finalHeaders,
+                                    ...retryOptions.headers
+                                };
+                            }
+                        }
+                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        try {
+                            const response = await request(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
+                            return response;
+                        }
+                        catch (error) {
+                            if (error && typeof error === 'object' && 'status' in error && error.status >= 400) {
+                                throw error;
+                            }
+                            throw new Error('Request failed');
+                        }
+                    };
+                },
+                _signature: []
+            },
+            retryHandler: {
+                _func: (args, data, interpreter) => {
+                    const requestFn = valueOf(args[0]);
+                    return requestFn();
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: async (args, data, interpreter) => {
                     const success = args[1];

package/esm/types/src/rules/FunctionRuntime.d.ts

@@ -1,5 +1,5 @@
 type HTTP_VERB = 'GET' | 'POST';
-export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<any>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any, action?: string, metadata?: any) => Promise<void>;
 export type CustomFunction = Function;
 export type FunctionDefinition = {
@@ -45,7 +45,18 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         request: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<void>;
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        requestWithRetry: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => (retryOptions?: {
+                headers?: Record<string, string>;
+                body?: any;
+            }) => Promise<any>;
+            _signature: never[];
+        };
+        retryHandler: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
         awaitFn: {

package/lib/Container.js

@@ -463,7 +463,7 @@ class Container extends Scriptable_1.default {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                        if (change.currentValue !== child._jsonModel[change.propertyName]) {
                             child._jsonModel[change.propertyName] = change.currentValue;
                             this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
                         }

package/lib/rules/FunctionRuntime.d.ts

@@ -1,5 +1,5 @@
 declare type HTTP_VERB = 'GET' | 'POST';
-export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<any>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any, action?: string, metadata?: any) => Promise<void>;
 export declare type CustomFunction = Function;
 export declare type FunctionDefinition = {
@@ -45,7 +45,18 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         request: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<void>;
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        requestWithRetry: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => (retryOptions?: {
+                headers?: Record<string, string>;
+                body?: any;
+            }) => Promise<any>;
+            _signature: never[];
+        };
+        retryHandler: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
         awaitFn: {

package/lib/rules/FunctionRuntime.js

@@ -80,6 +80,14 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     }
     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;
+    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') {
@@ -88,7 +96,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         else {
             context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
-        context.form.dispatch(new Events_1.RequestSuccess(response, true));
+        context.form.dispatch(new Events_1.RequestSuccess(enhancedPayload, false));
     }
     else {
         context.form.logger.error('Error invoking a rest API');
@@ -100,8 +108,9 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         else {
             context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
-        context.form.dispatch(new Events_1.RequestFailure(response, true));
+        context.form.dispatch(new Events_1.RequestFailure(enhancedPayload, false));
     }
+    return response;
 });
 exports.request = request;
 const urlEncoded = (data) => {
@@ -489,6 +498,59 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            requestWithRetry: {
+                _func: (args, data, interpreter) => {
+                    const uri = toString(args[0]);
+                    const httpVerb = toString(args[1]);
+                    let success;
+                    let errorFn;
+                    let payload = valueOf(args[2]);
+                    if (typeof (args[3]) === 'string') {
+                        success = valueOf(args[3]);
+                        errorFn = valueOf(args[4]);
+                    }
+                    return (retryOptions) => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            if (payload instanceof Promise) {
+                                payload = yield payload;
+                            }
+                        }
+                        catch (error) {
+                            console.error('Error resolving payload Promise:', error);
+                            throw error;
+                        }
+                        let finalHeaders = payload.headers || {};
+                        let finalBody = payload.body || {};
+                        if (retryOptions) {
+                            if (retryOptions.body) {
+                                finalBody = Object.assign(Object.assign({}, finalBody), retryOptions.body);
+                            }
+                            if (retryOptions.headers) {
+                                finalHeaders = Object.assign(Object.assign({}, finalHeaders), retryOptions.headers);
+                            }
+                        }
+                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        try {
+                            const response = yield (0, exports.request)(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
+                            return response;
+                        }
+                        catch (error) {
+                            if (error && typeof error === 'object' && 'status' in error && error.status >= 400) {
+                                throw error;
+                            }
+                            throw new Error('Request failed');
+                        }
+                    });
+                },
+                _signature: []
+            },
+            retryHandler: {
+                _func: (args, data, interpreter) => {
+                    const requestFn = valueOf(args[0]);
+                    return requestFn();
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
                     const success = args[1];

package/package.json

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