@aemforms/af-core 0.22.161 → 0.22.163

package/esm/afb-runtime.js

@@ -2539,25 +2539,26 @@ class Container extends Scriptable {
         super.dispatch(action);
     }
     importData(dataModel) {
-        if (typeof this._data !== 'undefined' && this.type === 'array' && Array.isArray(dataModel)) {
-            const dataGroup = new DataGroup(this._data.$name, dataModel, this._data.$type, this._data.parent);
-            try {
-                this._data.parent?.$addDataNode(dataGroup.$name, dataGroup, true);
-            }
-            catch (e) {
-                this.form.logger.error(`unable to setItems for ${this.qualifiedName} : ${e}`);
-                return;
-            }
-            this._data = dataGroup;
-            this.syncDataAndFormModel(dataGroup);
-            const newLength = this.items.length;
-            for (let i = 0; i < newLength; i += 1) {
-                this._children[i].dispatch(new ExecuteRule());
-            }
-        }
-        else if (typeof this._data === 'undefined') {
+        if (typeof this._data === 'undefined') {
             console.warn(`Data node is null, hence importData did not work for panel "${this.name}". Check if parent has a dataRef set to null.`);
+            return;
+        }
+        const isArrayPanel = this.type === 'array' && Array.isArray(dataModel);
+        const isObjectPanel = this.type === 'object' && typeof dataModel === 'object' && dataModel !== null && !Array.isArray(dataModel);
+        if (!isArrayPanel && !isObjectPanel) {
+            return;
+        }
+        const dataGroup = new DataGroup(this._data.$name, dataModel, this._data.$type, this._data.parent);
+        try {
+            this._data.parent?.$addDataNode(dataGroup.$name, dataGroup, true);
         }
+        catch (e) {
+            this.form.logger.error(`unable to importData for ${this.qualifiedName} : ${e}`);
+            return;
+        }
+        this._data = dataGroup;
+        this.syncDataAndFormModel(dataGroup);
+        this._children.forEach((child) => child.dispatch(new ExecuteRule()));
     }
     syncDataAndFormModel(contextualDataModel) {
         const result = {
@@ -2935,6 +2936,9 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
     if (payload.body && payload.headers) {
         encryptOutput = { ...payload };
         headers = { ...payload.headers };
+        if (payload.options && typeof payload.options === 'object') {
+            Object.assign(requestOptions, payload.options);
+        }
         payload = payload.body;
         cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
@@ -3227,6 +3231,47 @@ class FunctionRuntimeImpl {
                                         filesMap[qualifiedName] = field.serialize();
                                     }
                                     return filesMap;
+                                },
+                                setVariable: (variableName, variableValue, target) => {
+                                    const args = [variableName, variableValue, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().setVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                getVariable: (variableName, target) => {
+                                    const args = [variableName, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().getVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                request: async (options) => {
+                                    const { url, method = 'GET', body: requestBody = {}, headers = { 'Content-Type': 'application/json' }, options: fetchOptions } = options;
+                                    const funcs = FunctionRuntimeImpl.getInstance().getFunctions();
+                                    const externalizedUrl = funcs.externalize._func.call(undefined, [url], data, interpreter);
+                                    const random = Math.floor(Math.random() * 1000000);
+                                    const now = Date.now();
+                                    const internalSuccess = `custom:__internalSuccess_${random}_${now}`;
+                                    const internalError = `custom:__internalError_${random}_${now}`;
+                                    const encryptPayload = { body: requestBody, headers };
+                                    if (fetchOptions) {
+                                        encryptPayload.options = fetchOptions;
+                                    }
+                                    const payload = await funcs.encrypt._func.call(undefined, [encryptPayload], data, interpreter);
+                                    const requestArgs = [externalizedUrl, method, payload, internalSuccess, internalError];
+                                    const requestFn = funcs.requestWithRetry._func.call(undefined, requestArgs, data, interpreter);
+                                    const response = await funcs.retryHandler._func.call(undefined, [requestFn], data, interpreter);
+                                    const isSuccess = response?.status >= 200 && response?.status <= 299;
+                                    if (isSuccess && response?.body) {
+                                        const decryptedBody = await funcs.decrypt._func.call(undefined, [response.body, response.originalRequest], data, interpreter);
+                                        return {
+                                            ok: true,
+                                            status: response.status,
+                                            body: decryptedBody,
+                                            headers: response.headers
+                                        };
+                                    }
+                                    return {
+                                        ok: isSuccess,
+                                        status: response?.status,
+                                        body: response?.body,
+                                        headers: response?.headers
+                                    };
                                 }
                             }
                         };
@@ -3550,6 +3595,13 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            externalize: {
+                _func: (args, data, interpreter) => {
+                    const url = toString(args[0]);
+                    return url;
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: async (args, data, interpreter) => {
                     const success = args[1];

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

@@ -67,6 +67,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        externalize: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => string;
+            _signature: never[];
+        };
         awaitFn: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];

package/lib/Container.js

@@ -357,25 +357,26 @@ class Container extends Scriptable_1.default {
     }
     importData(dataModel) {
         var _a;
-        if (typeof this._data !== 'undefined' && this.type === 'array' && Array.isArray(dataModel)) {
-            const dataGroup = new DataGroup_1.default(this._data.$name, dataModel, this._data.$type, this._data.parent);
-            try {
-                (_a = this._data.parent) === null || _a === void 0 ? void 0 : _a.$addDataNode(dataGroup.$name, dataGroup, true);
-            }
-            catch (e) {
-                this.form.logger.error(`unable to setItems for ${this.qualifiedName} : ${e}`);
-                return;
-            }
-            this._data = dataGroup;
-            this.syncDataAndFormModel(dataGroup);
-            const newLength = this.items.length;
-            for (let i = 0; i < newLength; i += 1) {
-                this._children[i].dispatch(new Events_1.ExecuteRule());
-            }
-        }
-        else if (typeof this._data === 'undefined') {
+        if (typeof this._data === 'undefined') {
             console.warn(`Data node is null, hence importData did not work for panel "${this.name}". Check if parent has a dataRef set to null.`);
+            return;
+        }
+        const isArrayPanel = this.type === 'array' && Array.isArray(dataModel);
+        const isObjectPanel = this.type === 'object' && typeof dataModel === 'object' && dataModel !== null && !Array.isArray(dataModel);
+        if (!isArrayPanel && !isObjectPanel) {
+            return;
+        }
+        const dataGroup = new DataGroup_1.default(this._data.$name, dataModel, this._data.$type, this._data.parent);
+        try {
+            (_a = this._data.parent) === null || _a === void 0 ? void 0 : _a.$addDataNode(dataGroup.$name, dataGroup, true);
+        }
+        catch (e) {
+            this.form.logger.error(`unable to importData for ${this.qualifiedName} : ${e}`);
+            return;
         }
+        this._data = dataGroup;
+        this.syncDataAndFormModel(dataGroup);
+        this._children.forEach((child) => child.dispatch(new Events_1.ExecuteRule()));
     }
     syncDataAndFormModel(contextualDataModel) {
         const result = {

package/lib/rules/FunctionRuntime.d.ts

@@ -67,6 +67,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        externalize: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => string;
+            _signature: never[];
+        };
         awaitFn: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];

package/lib/rules/FunctionRuntime.js

@@ -50,6 +50,9 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     if (payload.body && payload.headers) {
         encryptOutput = Object.assign({}, payload);
         headers = Object.assign({}, payload.headers);
+        if (payload.options && typeof payload.options === 'object') {
+            Object.assign(requestOptions, payload.options);
+        }
         payload = payload.body;
         cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
@@ -329,7 +332,48 @@ class FunctionRuntimeImpl {
                                         filesMap[qualifiedName] = field.serialize();
                                     }
                                     return filesMap;
-                                }
+                                },
+                                setVariable: (variableName, variableValue, target) => {
+                                    const args = [variableName, variableValue, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().setVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                getVariable: (variableName, target) => {
+                                    const args = [variableName, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().getVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                request: (options) => __awaiter(this, void 0, void 0, function* () {
+                                    const { url, method = 'GET', body: requestBody = {}, headers = { 'Content-Type': 'application/json' }, options: fetchOptions } = options;
+                                    const funcs = FunctionRuntimeImpl.getInstance().getFunctions();
+                                    const externalizedUrl = funcs.externalize._func.call(undefined, [url], data, interpreter);
+                                    const random = Math.floor(Math.random() * 1000000);
+                                    const now = Date.now();
+                                    const internalSuccess = `custom:__internalSuccess_${random}_${now}`;
+                                    const internalError = `custom:__internalError_${random}_${now}`;
+                                    const encryptPayload = { body: requestBody, headers };
+                                    if (fetchOptions) {
+                                        encryptPayload.options = fetchOptions;
+                                    }
+                                    const payload = yield funcs.encrypt._func.call(undefined, [encryptPayload], data, interpreter);
+                                    const requestArgs = [externalizedUrl, method, payload, internalSuccess, internalError];
+                                    const requestFn = funcs.requestWithRetry._func.call(undefined, requestArgs, data, interpreter);
+                                    const response = yield funcs.retryHandler._func.call(undefined, [requestFn], data, interpreter);
+                                    const isSuccess = (response === null || response === void 0 ? void 0 : response.status) >= 200 && (response === null || response === void 0 ? void 0 : response.status) <= 299;
+                                    if (isSuccess && (response === null || response === void 0 ? void 0 : response.body)) {
+                                        const decryptedBody = yield funcs.decrypt._func.call(undefined, [response.body, response.originalRequest], data, interpreter);
+                                        return {
+                                            ok: true,
+                                            status: response.status,
+                                            body: decryptedBody,
+                                            headers: response.headers
+                                        };
+                                    }
+                                    return {
+                                        ok: isSuccess,
+                                        status: response === null || response === void 0 ? void 0 : response.status,
+                                        body: response === null || response === void 0 ? void 0 : response.body,
+                                        headers: response === null || response === void 0 ? void 0 : response.headers
+                                    };
+                                })
                             }
                         };
                         return funcDef(...args, globals);
@@ -647,6 +691,13 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            externalize: {
+                _func: (args, data, interpreter) => {
+                    const url = toString(args[0]);
+                    return url;
+                },
+                _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.161",
+  "version": "0.22.163",
   "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.161"
+    "@aemforms/af-formatters": "^0.22.163"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",