@aemforms/af-core 0.22.115 → 0.22.117

package/esm/afb-runtime.js

@@ -2050,6 +2050,7 @@ class Container extends Scriptable {
         return {
             ...super.getState(forRestore),
             ...(forRestore ? {
+                initialItems: this.items.length,
                 ':items': undefined,
                 ':itemsOrder': undefined
             } : {}),
@@ -2655,6 +2656,22 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         method: httpVerb
     };
     let inputPayload;
+    let encryptOutput = {};
+    try {
+        if (payload instanceof Promise) {
+            payload = await payload;
+        }
+    }
+    catch (error) {
+        console.error('Error resolving payload Promise:', error);
+        throw error;
+    }
+    if (payload.body && payload.headers) {
+        encryptOutput = { ...payload };
+        headers = { ...payload.headers };
+        payload = payload.body;
+        inputPayload = payload;
+    }
     if (payload && payload instanceof FileObject && payload.data instanceof File) {
         const formData = new FormData();
         formData.append(payload.name, payload.data);
@@ -2663,7 +2680,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
     else if (payload instanceof FormData) {
         inputPayload = payload;
     }
-    else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
+    else if (payload && (typeof payload === 'string' || (typeof payload === 'object' && Object.keys(payload).length > 0))) {
         const headerNames = Object.keys(headers);
         if (headerNames.length > 0) {
             requestOptions.headers = {
@@ -2675,35 +2692,45 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
             requestOptions.headers = { 'Content-Type': 'application/json' };
         }
         const contentType = requestOptions?.headers?.['Content-Type'] || 'application/json';
-        if (contentType === 'application/json') {
-            inputPayload = JSON.stringify(payload);
-        }
-        else if (contentType.indexOf('multipart/form-data') > -1) {
-            inputPayload = multipartFormData(payload);
+        if (typeof payload === 'object') {
+            if (contentType === 'application/json') {
+                inputPayload = JSON.stringify(payload);
+            }
+            else if (contentType.indexOf('multipart/form-data') > -1) {
+                inputPayload = multipartFormData(payload);
+            }
+            else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
+                inputPayload = urlEncoded(payload);
+            }
         }
-        else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
-            inputPayload = urlEncoded(payload);
+        if (contentType === 'text/plain') {
+            inputPayload = String(payload);
         }
     }
-    const result = await request$1(endpoint, inputPayload, requestOptions);
-    if (result?.status >= 200 && result?.status <= 299) {
+    const response = await request$1(endpoint, inputPayload, requestOptions);
+    response.originalRequest = {
+        url: endpoint,
+        method: httpVerb,
+        ...encryptOutput
+    };
+    if (response?.status >= 200 && response?.status <= 299) {
         const eName = getCustomEventName(success);
         if (success === 'submitSuccess') {
-            context.form.dispatch(new SubmitSuccess(result, true));
+            context.form.dispatch(new SubmitSuccess(response, true));
         }
         else {
-            context.form.dispatch(new CustomEvent(eName, result, true));
+            context.form.dispatch(new CustomEvent(eName, response, true));
         }
     }
     else {
         context.form.logger.error('Error invoking a rest API');
         const eName = getCustomEventName(error);
         if (error === 'submitError') {
-            context.form.dispatch(new SubmitError(result, true));
-            context.form.dispatch(new SubmitFailure(result, true));
+            context.form.dispatch(new SubmitError(response, true));
+            context.form.dispatch(new SubmitFailure(response, true));
         }
         else {
-            context.form.dispatch(new CustomEvent(eName, result, true));
+            context.form.dispatch(new CustomEvent(eName, response, true));
         }
     }
 };
@@ -3060,17 +3087,29 @@ class FunctionRuntimeImpl {
                 _func: (args, data, interpreter) => {
                     const uri = toString(args[0]);
                     const httpVerb = toString(args[1]);
-                    const payload = valueOf(args[2]);
-                    let success, error, headers = {};
-                    if (typeof (args[3]) === 'string') {
-                        interpreter.globals.form.logger.warn('This usage of request is deprecated. Please see the documentation and update');
+                    let payload;
+                    let success;
+                    let error;
+                    let headers = {};
+                    if (args[2] && typeof args[2] === 'object' && !args[2].then && ('data' in args[2] || 'headers' in args[2])) {
+                        const payloadObj = valueOf(args[2]);
+                        payload = payloadObj.data;
+                        headers = payloadObj.headers || {};
                         success = valueOf(args[3]);
                         error = valueOf(args[4]);
                     }
                     else {
-                        headers = valueOf(args[3]);
-                        success = valueOf(args[4]);
-                        error = valueOf(args[5]);
+                        payload = valueOf(args[2]);
+                        if (typeof (args[3]) === 'string') {
+                            interpreter.globals.form.logger.warn('This usage of request is deprecated. Please see the documentation and update');
+                            success = valueOf(args[3]);
+                            error = valueOf(args[4]);
+                        }
+                        else {
+                            headers = valueOf(args[3]);
+                            success = valueOf(args[4]);
+                            error = valueOf(args[5]);
+                        }
                     }
                     return request(interpreter.globals, uri, httpVerb, payload, success, error, headers);
                 },
@@ -3167,6 +3206,20 @@ class FunctionRuntimeImpl {
                     return {};
                 },
                 _signature: []
+            },
+            encrypt: {
+                _func: async (args, data, interpreter) => {
+                    const payload = valueOf(args[0]);
+                    return payload;
+                },
+                _signature: []
+            },
+            decrypt: {
+                _func: async (args, data, interpreter) => {
+                    const encData = valueOf(args[0]);
+                    return encData;
+                },
+                _signature: []
             }
         };
         return { ...defaultFunctions, ...FunctionRuntimeImpl.getInstance().customFunctions };

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

@@ -32,6 +32,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
+        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

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

@@ -100,6 +100,7 @@ declare class Form extends Container<FormJson> implements FormModel {
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
+        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

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

@@ -64,6 +64,14 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];
         };
+        encrypt: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        decrypt: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
     };
 }
 export declare const FunctionRuntime: FunctionRuntimeImpl;

package/lib/Container.d.ts

@@ -32,6 +32,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
+        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

package/lib/Container.js

@@ -114,6 +114,7 @@ class Container extends Scriptable_1.default {
     }
     getState(isRepeatableChild = false, forRestore = false) {
         return Object.assign(Object.assign(Object.assign({}, super.getState(forRestore)), (forRestore ? {
+            initialItems: this.items.length,
             ':items': undefined,
             ':itemsOrder': undefined
         } : {})), { items: this.getItemsState(isRepeatableChild, forRestore), enabled: this.enabled, readOnly: this.readOnly });

package/lib/Form.d.ts

@@ -100,6 +100,7 @@ declare class Form extends Container<FormJson> implements FormModel {
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
+        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

package/lib/rules/FunctionRuntime.d.ts

@@ -64,6 +64,14 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];
         };
+        encrypt: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        decrypt: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
     };
 }
 export declare const FunctionRuntime: FunctionRuntimeImpl;

package/lib/rules/FunctionRuntime.js

@@ -30,6 +30,22 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         method: httpVerb
     };
     let inputPayload;
+    let encryptOutput = {};
+    try {
+        if (payload instanceof Promise) {
+            payload = yield payload;
+        }
+    }
+    catch (error) {
+        console.error('Error resolving payload Promise:', error);
+        throw error;
+    }
+    if (payload.body && payload.headers) {
+        encryptOutput = Object.assign({}, payload);
+        headers = Object.assign({}, payload.headers);
+        payload = payload.body;
+        inputPayload = payload;
+    }
     if (payload && payload instanceof FileObject_1.FileObject && payload.data instanceof File) {
         const formData = new FormData();
         formData.append(payload.name, payload.data);
@@ -38,7 +54,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     else if (payload instanceof FormData) {
         inputPayload = payload;
     }
-    else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
+    else if (payload && (typeof payload === 'string' || (typeof payload === 'object' && Object.keys(payload).length > 0))) {
         const headerNames = Object.keys(headers);
         if (headerNames.length > 0) {
             requestOptions.headers = Object.assign(Object.assign({}, headers), (headerNames.indexOf('Content-Type') === -1 ? { 'Content-Type': 'application/json' } : {}));
@@ -47,35 +63,41 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
             requestOptions.headers = { 'Content-Type': 'application/json' };
         }
         const contentType = ((_a = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) || 'application/json';
-        if (contentType === 'application/json') {
-            inputPayload = JSON.stringify(payload);
-        }
-        else if (contentType.indexOf('multipart/form-data') > -1) {
-            inputPayload = multipartFormData(payload);
+        if (typeof payload === 'object') {
+            if (contentType === 'application/json') {
+                inputPayload = JSON.stringify(payload);
+            }
+            else if (contentType.indexOf('multipart/form-data') > -1) {
+                inputPayload = multipartFormData(payload);
+            }
+            else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
+                inputPayload = urlEncoded(payload);
+            }
         }
-        else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
-            inputPayload = urlEncoded(payload);
+        if (contentType === 'text/plain') {
+            inputPayload = String(payload);
         }
     }
-    const result = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
-    if ((result === null || result === void 0 ? void 0 : result.status) >= 200 && (result === null || result === void 0 ? void 0 : result.status) <= 299) {
+    const response = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
+    response.originalRequest = Object.assign({ url: endpoint, method: httpVerb }, encryptOutput);
+    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(result, true));
+            context.form.dispatch(new Events_1.SubmitSuccess(response, true));
         }
         else {
-            context.form.dispatch(new Events_1.CustomEvent(eName, result, true));
+            context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
     }
     else {
         context.form.logger.error('Error invoking a rest API');
         const eName = getCustomEventName(error);
         if (error === 'submitError') {
-            context.form.dispatch(new Events_1.SubmitError(result, true));
-            context.form.dispatch(new Events_1.SubmitFailure(result, true));
+            context.form.dispatch(new Events_1.SubmitError(response, true));
+            context.form.dispatch(new Events_1.SubmitFailure(response, true));
         }
         else {
-            context.form.dispatch(new Events_1.CustomEvent(eName, result, true));
+            context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
     }
 });
@@ -435,17 +457,29 @@ class FunctionRuntimeImpl {
                 _func: (args, data, interpreter) => {
                     const uri = toString(args[0]);
                     const httpVerb = toString(args[1]);
-                    const payload = valueOf(args[2]);
-                    let success, error, headers = {};
-                    if (typeof (args[3]) === 'string') {
-                        interpreter.globals.form.logger.warn('This usage of request is deprecated. Please see the documentation and update');
+                    let payload;
+                    let success;
+                    let error;
+                    let headers = {};
+                    if (args[2] && typeof args[2] === 'object' && !args[2].then && ('data' in args[2] || 'headers' in args[2])) {
+                        const payloadObj = valueOf(args[2]);
+                        payload = payloadObj.data;
+                        headers = payloadObj.headers || {};
                         success = valueOf(args[3]);
                         error = valueOf(args[4]);
                     }
                     else {
-                        headers = valueOf(args[3]);
-                        success = valueOf(args[4]);
-                        error = valueOf(args[5]);
+                        payload = valueOf(args[2]);
+                        if (typeof (args[3]) === 'string') {
+                            interpreter.globals.form.logger.warn('This usage of request is deprecated. Please see the documentation and update');
+                            success = valueOf(args[3]);
+                            error = valueOf(args[4]);
+                        }
+                        else {
+                            headers = valueOf(args[3]);
+                            success = valueOf(args[4]);
+                            error = valueOf(args[5]);
+                        }
                     }
                     return (0, exports.request)(interpreter.globals, uri, httpVerb, payload, success, error, headers);
                 },
@@ -542,6 +576,20 @@ class FunctionRuntimeImpl {
                     return {};
                 },
                 _signature: []
+            },
+            encrypt: {
+                _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
+                    const payload = valueOf(args[0]);
+                    return payload;
+                }),
+                _signature: []
+            },
+            decrypt: {
+                _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
+                    const encData = valueOf(args[0]);
+                    return encData;
+                }),
+                _signature: []
             }
         };
         return Object.assign(Object.assign({}, defaultFunctions), FunctionRuntimeImpl.getInstance().customFunctions);

package/package.json

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