@aemforms/af-core 0.22.15 → 0.22.16

package/lib/Scriptable.js

@@ -148,7 +148,7 @@ class Scriptable extends BaseNode_1.BaseNode {
         if (node) {
             updates = this.ruleEngine.execute(node, this.getExpressionScope(), context);
         }
-        if (typeof updates !== 'undefined') {
+        if (typeof updates !== 'undefined' && updates != null) {
             this.applyUpdates(updates);
         }
     }

package/lib/index.d.ts

@@ -24,4 +24,5 @@ import FormMetaData from './FormMetaData';
 import Node from './Node';
 import Scriptable from './Scriptable';
 import Form from './Form';
-export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo };
+import { FunctionRuntime, request } from './rules/FunctionRuntime';
+export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, FunctionRuntime, request };

package/lib/index.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
+exports.request = exports.FunctionRuntime = exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
 __exportStar(require("./FormInstance"), exports);
 __exportStar(require("./types/index"), exports);
 __exportStar(require("./controller/index"), exports);
@@ -58,3 +58,6 @@ const Scriptable_1 = __importDefault(require("./Scriptable"));
 exports.Scriptable = Scriptable_1.default;
 const Form_1 = __importDefault(require("./Form"));
 exports.Form = Form_1.default;
+const FunctionRuntime_1 = require("./rules/FunctionRuntime");
+Object.defineProperty(exports, "FunctionRuntime", { enumerable: true, get: function () { return FunctionRuntime_1.FunctionRuntime; } });
+Object.defineProperty(exports, "request", { enumerable: true, get: function () { return FunctionRuntime_1.request; } });

package/lib/rules/FunctionRuntime.d.ts

@@ -7,10 +7,10 @@ declare type HTTP_VERB = 'GET' | 'POST';
  * @param payload                   request payload
  * @param success                   success handler
  * @param error                     error handler
- * @param payloadContentType        content type of the request
+ * @param headers                   headers
  * @private
  */
-export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, payloadContentType: string) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<void>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data', input_data?: any) => Promise<void>;
 declare type CustomFunction = Function;
 declare type FunctionDefinition = {
@@ -65,5 +65,5 @@ declare class FunctionRuntimeImpl {
         };
     };
 }
-declare const FunctionRuntime: FunctionRuntimeImpl;
-export default FunctionRuntime;
+export declare const FunctionRuntime: FunctionRuntimeImpl;
+export {};

package/lib/rules/FunctionRuntime.js

@@ -16,7 +16,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.submit = exports.request = void 0;
+exports.FunctionRuntime = exports.submit = exports.request = void 0;
 /**
  * Implementation of function runtime in rule engine
  */
@@ -26,6 +26,13 @@ const Fetch_1 = require("../utils/Fetch");
 const FileObject_1 = require("../FileObject");
 const FormUtils_1 = require("../utils/FormUtils");
 const JsonUtils_1 = require("../utils/JsonUtils");
+const getCustomEventName = (name) => {
+    const eName = name;
+    if (eName.length > 0 && eName.startsWith('custom:')) {
+        return eName.substring('custom:'.length);
+    }
+    return eName;
+};
 /**
  * Implementation of generic request API. This API can be used to make external web request
  * @param context                   expression execution context(consists of current form, current field, current event)
@@ -34,10 +41,11 @@ const JsonUtils_1 = require("../utils/JsonUtils");
  * @param payload                   request payload
  * @param success                   success handler
  * @param error                     error handler
- * @param payloadContentType        content type of the request
+ * @param headers                   headers
  * @private
  */
-const request = (context, uri, httpVerb, payload, success, error, payloadContentType) => __awaiter(void 0, void 0, void 0, function* () {
+const request = (context, uri, httpVerb, payload, success, error, headers) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const endpoint = uri;
     const requestOptions = {
         method: httpVerb
@@ -55,24 +63,50 @@ const request = (context, uri, httpVerb, payload, success, error, payloadContent
             inputPayload = payload;
         }
         else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
-            if (payloadContentType.length > 0) {
-                requestOptions.headers = {
-                    'Content-Type': payloadContentType // this should match content type of the payload
-                };
+            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' } : {}) // this should match content type of the payload
+                );
+            }
+            else {
+                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);
+            }
+            else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
+                inputPayload = urlEncoded(payload);
             }
-            inputPayload = JSON.stringify(payload);
         }
         result = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
     }
     catch (e) {
         //todo: define error payload
         context.form.logger.error('Error invoking a rest API');
-        context.form.dispatch(new Controller_1.CustomEvent(error, {}, true));
+        const eName = getCustomEventName(error);
+        context.form.dispatch(new Controller_1.CustomEvent(eName, {}, true));
         return;
     }
-    context.form.dispatch(new Controller_1.CustomEvent(success, result, true));
+    const eName = getCustomEventName(success);
+    context.form.dispatch(new Controller_1.CustomEvent(eName, result, true));
 });
 exports.request = request;
+const urlEncoded = (data) => {
+    const formData = new URLSearchParams();
+    Object.entries(data).forEach(([key, value]) => {
+        if (value != null && typeof value === 'object') {
+            formData.append(key, (0, JsonUtils_1.jsonString)(value));
+        }
+        else {
+            formData.append(key, value);
+        }
+    });
+    return formData;
+};
 /**
  * Create multi part form data using form data and form attachments
  * @param data              form data
@@ -99,16 +133,18 @@ const multipartFormData = (data, attachments) => {
             formData.append(attIdentifier, objValue.data);
         }
     };
-    // @ts-ignore
-    Object.keys(attachments).reduce((acc, curr) => {
-        const objValue = attachments[curr];
-        if (objValue && objValue instanceof Array) {
-            return [...acc, ...objValue.map((x) => addAttachmentToFormData(x, formData))];
-        }
-        else {
-            return [...acc, addAttachmentToFormData(objValue, formData)];
-        }
-    }, []);
+    if (attachments) {
+        // @ts-ignore
+        Object.keys(attachments).reduce((acc, curr) => {
+            const objValue = attachments[curr];
+            if (objValue && objValue instanceof Array) {
+                return [...acc, ...objValue.map((x) => addAttachmentToFormData(x, formData))];
+            }
+            else {
+                return [...acc, addAttachmentToFormData(objValue, formData)];
+            }
+        }, []);
+    }
     return formData;
 };
 const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null) => __awaiter(void 0, void 0, void 0, function* () {
@@ -131,7 +167,9 @@ const submit = (context, success, error, submitAs = 'multipart/form-data', input
     }
     // submitContentType = submitAs;
     // note: don't send multipart/form-data let browser decide on the content type
-    yield (0, exports.request)(context, endpoint, 'POST', formData, success, error, submitContentType);
+    yield (0, exports.request)(context, endpoint, 'POST', formData, success, error, {
+        'Content-Type': submitContentType
+    });
 });
 exports.submit = submit;
 /**
@@ -279,9 +317,18 @@ class FunctionRuntimeImpl {
                     const uri = toString(args[0]);
                     const httpVerb = toString(args[1]);
                     const payload = valueOf(args[2]);
-                    const success = valueOf(args[3]);
-                    const error = valueOf(args[4]);
-                    (0, exports.request)(interpreter.globals, uri, httpVerb, payload, success, error, 'application/json');
+                    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');
+                        success = valueOf(args[3]);
+                        error = valueOf(args[4]);
+                    }
+                    else {
+                        headers = valueOf(args[3]);
+                        success = valueOf(args[4]);
+                        error = valueOf(args[5]);
+                    }
+                    (0, exports.request)(interpreter.globals, uri, httpVerb, payload, success, error, headers);
                     return {};
                 },
                 _signature: []
@@ -327,5 +374,4 @@ class FunctionRuntimeImpl {
         return Object.assign(Object.assign({}, defaultFunctions), this.customFunctions);
     }
 }
-const FunctionRuntime = new FunctionRuntimeImpl();
-exports.default = FunctionRuntime;
+exports.FunctionRuntime = new FunctionRuntimeImpl();

package/lib/rules/RuleEngine.js

@@ -6,12 +6,9 @@
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ADOBE NOR ITS THIRD PARTY PROVIDERS AND PARTNERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const json_formula_1 = require("@adobe/json-formula");
-const FunctionRuntime_1 = __importDefault(require("./FunctionRuntime"));
+const FunctionRuntime_1 = require("./FunctionRuntime");
 /**
  * Implementation of rule engine
  * @private
@@ -25,7 +22,7 @@ class RuleEngine {
         ];
     }
     compileRule(rule) {
-        const customFunctions = FunctionRuntime_1.default.getFunctions();
+        const customFunctions = FunctionRuntime_1.FunctionRuntime.getFunctions();
         return new json_formula_1.Formula(rule, customFunctions, undefined, this._globalNames);
     }
     execute(node, data, globals, useValueOf = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.15",
+  "version": "0.22.16",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.15"
+    "@aemforms/af-formatters": "^0.22.16"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",