@aemforms/af-core 0.15.0 → 0.16.0

package/lib/Checkbox.d.ts

@@ -12,9 +12,9 @@ declare class Checkbox extends Field {
             valid: boolean;
             value: any;
         };
-        format: (constraint: string, input: string) => {
+        format: (constraint: string, input: string | null) => {
+            value: string | null;
             valid: boolean;
-            value: string;
         };
         minimum: (constraint: number, value: number) => {
             valid: boolean;

package/lib/Field.d.ts

@@ -71,14 +71,20 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
             valid: boolean;
             value: any;
         };
-        format: (constraint: string, input: string) => {
+        format: (constraint: string, input: string | null) => {
+            value: string | null;
             valid: boolean;
-            value: string;
         };
         minimum: (constraint: number, value: number) => {
             valid: boolean;
             value: number;
         };
+        /**
+         *
+         * @param value
+         * @param constraints
+         * @private
+         */
         maximum: (constraint: number, value: number) => {
             valid: boolean;
             value: number;

package/lib/rules/FunctionRuntime.d.ts

@@ -10,8 +10,8 @@ declare type HTTP_VERB = 'GET' | 'POST';
  * @param payloadContentType        content type of the request
  * @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 submit: (context: any, success: string, error: string, submitAs?: 'json' | 'multipart', input_data?: any) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, payloadContentType: string) => Promise<void>;
+export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data', input_data?: any) => Promise<void>;
 /**
  * Implementation of function runtime
  * @private

package/lib/rules/FunctionRuntime.js

@@ -20,11 +20,12 @@ exports.submit = exports.request = void 0;
 /**
  * Implementation of function runtime in rule engine
  */
-const JsonUtils_1 = require("../utils/JsonUtils");
+//import {jsonString} from '../utils/JsonUtils';
 const Controller_1 = require("../controller/Controller");
 const Fetch_1 = require("../utils/Fetch");
 const FileObject_1 = require("../FileObject");
 const FormUtils_1 = require("../utils/FormUtils");
+const JsonUtils_1 = require("../utils/JsonUtils");
 /**
  * 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)
@@ -36,7 +37,7 @@ const FormUtils_1 = require("../utils/FormUtils");
  * @param payloadContentType        content type of the request
  * @private
  */
-const request = (context, uri, httpVerb, payload, success, error, payloadContentType = 'application/json') => __awaiter(void 0, void 0, void 0, function* () {
+const request = (context, uri, httpVerb, payload, success, error, payloadContentType) => __awaiter(void 0, void 0, void 0, function* () {
     const endpoint = uri;
     const requestOptions = {
         method: httpVerb
@@ -50,6 +51,9 @@ const request = (context, uri, httpVerb, payload, success, error, payloadContent
             formData.append(payload.name, payload.data);
             inputPayload = formData;
         }
+        else if (payload instanceof FormData) {
+            inputPayload = payload;
+        }
         else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
             if (payloadContentType.length > 0) {
                 requestOptions.headers = {
@@ -78,41 +82,46 @@ exports.request = request;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const multipartFormData = (data, attachments) => {
     const formData = new FormData();
-    formData.append(':data', data);
-    formData.append(':contentType', 'application/json');
-    const transformAttachment = (objValue, formData) => {
-        const newValue = {
-            ':name': objValue.name,
-            ':contentType': objValue.mediaType,
-            ':data': objValue.data,
-            ':bindRef': objValue.dataRef
-        };
-        if ((objValue === null || objValue === void 0 ? void 0 : objValue.data) instanceof File) {
-            let attIdentifier = `${objValue === null || objValue === void 0 ? void 0 : objValue.dataRef}/${objValue === null || objValue === void 0 ? void 0 : objValue.name}`;
-            if (!attIdentifier.startsWith('/')) {
-                attIdentifier = `/${attIdentifier}`;
-            }
-            formData.append(attIdentifier, objValue.data);
-            newValue[':data'] = `#${attIdentifier}`;
+    Object.entries(data).forEach(([key, value]) => {
+        if (value != null && typeof value === 'object') {
+            formData.append(key, (0, JsonUtils_1.jsonString)(value));
         }
-        return newValue;
-    };
+        else {
+            formData.append(key, value);
+        }
+    });
+    // const transformAttachment = (objValue: any, formData: any) : any => {
+    //     const newValue = {
+    //         ':name' : objValue.name,
+    //         ':contentType' : objValue.mediaType,
+    //         ':data' : objValue.data,
+    //         ':bindRef' : objValue.dataRef
+    //     };
+    //     if (objValue?.data instanceof File) {
+    //         let attIdentifier = `${objValue?.dataRef}/${objValue?.name}`;
+    //         if (!attIdentifier.startsWith('/')) {
+    //             attIdentifier = `/${attIdentifier}`;
+    //         }
+    //         formData.append(attIdentifier, objValue.data);
+    //         newValue[':data'] = `#${attIdentifier}`;
+    //     }
+    //     return newValue;
+    // };
     // @ts-ignore
-    const submitAttachments = Object.keys(attachments).reduce((acc, curr) => {
+    /*const submitAttachments = Object.keys(attachments).reduce((acc, curr) => {
         const objValue = attachments[curr];
-        if (objValue && objValue instanceof Array) {
-            return [...acc, ...objValue.map((x) => transformAttachment(x, formData))];
-        }
-        else {
+        if(objValue && objValue instanceof Array) {
+            return [...acc, ...objValue.map((x)=>transformAttachment(x, formData))];
+        } else {
             return [...acc, transformAttachment(objValue, formData)];
         }
     }, []);
-    if ((submitAttachments === null || submitAttachments === void 0 ? void 0 : submitAttachments.length) > 0) {
-        formData.append(':attachments', (0, JsonUtils_1.jsonString)(submitAttachments));
-    }
+    if (submitAttachments?.length > 0) {
+        formData.append(':attachments', jsonString(submitAttachments));
+    }*/
     return formData;
 };
-const submit = (context, success, error, submitAs = 'json', input_data = null) => __awaiter(void 0, void 0, void 0, function* () {
+const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null) => __awaiter(void 0, void 0, void 0, function* () {
     const endpoint = context.form.action;
     let data = input_data;
     if (typeof data != 'object' || data == null) {
@@ -122,14 +131,15 @@ const submit = (context, success, error, submitAs = 'json', input_data = null) =
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const attachments = (0, FormUtils_1.getAttachments)(context.$form);
     let submitContentType = submitAs;
-    //let formData: any;
-    //if (Object.keys(attachments).length > 0) {
-    //    multipartFormData(jsonString(data), attachments);
-    //    submitContentType = 'multipart/form-data';
-    //} else {
-    const formData = { 'data': data };
-    submitContentType = 'application/json';
-    //}
+    let formData;
+    if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
+        formData = multipartFormData({ 'data': data }, attachments);
+        submitContentType = 'multipart/form-data';
+    }
+    else {
+        formData = { 'data': data };
+    }
+    // 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);
 });
@@ -209,7 +219,7 @@ class FunctionRuntimeImpl {
                     // success: string, error: string, submit_as: 'json' | 'multipart' = 'json', data: any = null
                     const success = toString(args[0]);
                     const error = toString(args[1]);
-                    const submit_as = args.length > 2 ? toString(args[2]) : 'json';
+                    const submit_as = args.length > 2 ? toString(args[2]) : 'multipart/form-data';
                     const submit_data = args.length > 3 ? valueOf(args[3]) : null;
                     interpreter.globals.form.dispatch(new Controller_1.Submit({
                         success,

package/lib/utils/ValidationUtils.d.ts

@@ -28,9 +28,9 @@ export declare const Constraints: {
      * @param input         value of the form object
      * @return {@link ValidationResult | validation result}
      */
-    format: (constraint: string, input: string) => {
+    format: (constraint: string, input: string | null) => {
+        value: string | null;
         valid: boolean;
-        value: string;
     };
     /**
      * Implementation of minimum constraint

package/lib/utils/ValidationUtils.js

@@ -192,10 +192,13 @@ exports.Constraints = {
     format: (constraint, input) => {
         let valid = true;
         const value = input;
+        if (input === null) {
+            return { value, valid };
+        }
         let res;
         switch (constraint) {
             case 'date':
-                res = dateRegex.exec(input.trim());
+                res = dateRegex.exec((input || '').trim());
                 if (res != null) {
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     const [match, year, month, date] = res;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
+  "homepage": "",
   "license": "LicenseRef-LICENSE",
   "main": "lib/index.js",
   "directories": {