@aemforms/af-core 0.22.116 → 0.22.118

package/esm/afb-runtime.js

@@ -2656,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);
@@ -2664,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 = {
@@ -2676,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));
         }
     }
 };
@@ -3061,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);
                 },
@@ -3168,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 };
@@ -4712,14 +4764,21 @@ class DateField extends Field {
             this._jsonModel.placeholder = parseDateSkeleton(this._jsonModel.editFormat, this.locale);
         }
     }
+    #convertNumberToDate(value) {
+        const coercedValue = numberToDatetime(value);
+        if (!isNaN(coercedValue)) {
+            return formatDate(coercedValue, this.locale, this._dataFormat);
+        }
+        return null;
+    }
     get value() {
         return super.value;
     }
     set value(value) {
         if (typeof value === 'number') {
-            const coercedValue = numberToDatetime(value);
-            if (!isNaN(coercedValue)) {
-                super.value = formatDate(coercedValue, this.locale, this._dataFormat);
+            const coercedValue = this.#convertNumberToDate(value);
+            if (coercedValue) {
+                super.value = coercedValue;
             }
         }
         else {
@@ -4737,6 +4796,34 @@ class DateField extends Field {
             }
         }
     }
+    get minimum() {
+        return super.minimum;
+    }
+    set minimum(value) {
+        if (typeof value === 'number') {
+            const coercedValue = this.#convertNumberToDate(value);
+            if (coercedValue) {
+                super.minimum = coercedValue;
+            }
+        }
+        else if (typeof value === 'string') {
+            super.minimum = value;
+        }
+    }
+    get maximum() {
+        return super.maximum;
+    }
+    set maximum(value) {
+        if (typeof value === 'number') {
+            const coercedValue = this.#convertNumberToDate(value);
+            if (coercedValue) {
+                super.maximum = coercedValue;
+            }
+        }
+        else if (typeof value === 'string') {
+            super.maximum = value;
+        }
+    }
 }
 
 class EmailInput extends Field {

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

@@ -99,17 +99,17 @@ declare class Checkbox extends Field {
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | undefined;

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

@@ -1,9 +1,14 @@
 import Field from './Field';
 declare class DateField extends Field {
+    #private;
     private locale?;
     private _dataFormat;
     protected _applyDefaults(): void;
     get value(): any;
     set value(value: any);
+    get minimum(): string | number | undefined;
+    set minimum(value: string | number | undefined);
+    get maximum(): string | number | undefined;
+    set maximum(value: string | number | undefined);
 }
 export default DateField;

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

@@ -44,10 +44,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     set enumNames(e: string[] | undefined);
     get required(): boolean;
     set required(r: boolean);
-    get maximum(): number | undefined;
-    set maximum(m: number | undefined);
-    get minimum(): number | undefined;
-    set minimum(m: number | undefined);
+    get maximum(): string | number | undefined;
+    set maximum(m: string | number | undefined);
+    get minimum(): string | number | undefined;
+    set minimum(m: string | number | undefined);
     private withCategory;
     get editValue(): any;
     get displayValue(): any;
@@ -142,10 +142,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get minLength(): number | undefined;
     get pattern(): string | undefined;
     get step(): number | undefined;
-    get exclusiveMinimum(): number | undefined;
-    set exclusiveMinimum(eM: number | undefined);
-    get exclusiveMaximum(): number | undefined;
-    set exclusiveMaximum(eM: number | undefined);
+    get exclusiveMinimum(): string | number | undefined;
+    set exclusiveMinimum(eM: string | number | undefined);
+    get exclusiveMaximum(): string | number | undefined;
+    set exclusiveMaximum(eM: string | number | undefined);
     get default(): any;
     private isNotEmpty;
     protected evaluateConstraints(): any;
@@ -167,17 +167,17 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | undefined;

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

@@ -46,17 +46,17 @@ declare class Form extends Container<FormJson> implements FormModel {
     } & {
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | 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/esm/types/src/types/Json.d.ts

@@ -15,17 +15,17 @@ type TranslationConstraintsJson = {
 export type ConstraintsJson = TranslationConstraintsJson & {
     accept?: string[];
     enforceEnum?: boolean;
-    exclusiveMinimum?: number;
-    exclusiveMaximum?: number;
+    exclusiveMinimum?: number | string;
+    exclusiveMaximum?: number | string;
     format?: string;
     maxFileSize?: number | string;
     maxLength?: number;
-    maximum?: number;
+    maximum?: number | string;
     maxItems?: number;
     minOccur?: number;
     maxOccur?: number;
     minLength?: number;
-    minimum?: number;
+    minimum?: number | string;
     minItems?: number;
     pattern?: string;
     required?: boolean;

package/lib/Checkbox.d.ts

@@ -99,17 +99,17 @@ declare class Checkbox extends Field {
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | undefined;

package/lib/DateField.d.ts

@@ -1,9 +1,14 @@
 import Field from './Field';
 declare class DateField extends Field {
+    #private;
     private locale?;
     private _dataFormat;
     protected _applyDefaults(): void;
     get value(): any;
     set value(value: any);
+    get minimum(): string | number | undefined;
+    set minimum(value: string | number | undefined);
+    get maximum(): string | number | undefined;
+    set maximum(value: string | number | undefined);
 }
 export default DateField;

package/lib/DateField.js

@@ -1,13 +1,20 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _DateField_instances, _DateField_convertNumberToDate;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("./Field"));
 const af_formatters_1 = require("@aemforms/af-formatters");
 class DateField extends Field_1.default {
     constructor() {
         super(...arguments);
+        _DateField_instances.add(this);
         this._dataFormat = 'yyyy-MM-dd';
     }
     _applyDefaults() {
@@ -28,9 +35,9 @@ class DateField extends Field_1.default {
     }
     set value(value) {
         if (typeof value === 'number') {
-            const coercedValue = (0, af_formatters_1.numberToDatetime)(value);
-            if (!isNaN(coercedValue)) {
-                super.value = (0, af_formatters_1.formatDate)(coercedValue, this.locale, this._dataFormat);
+            const coercedValue = __classPrivateFieldGet(this, _DateField_instances, "m", _DateField_convertNumberToDate).call(this, value);
+            if (coercedValue) {
+                super.value = coercedValue;
             }
         }
         else {
@@ -48,5 +55,40 @@ class DateField extends Field_1.default {
             }
         }
     }
+    get minimum() {
+        return super.minimum;
+    }
+    set minimum(value) {
+        if (typeof value === 'number') {
+            const coercedValue = __classPrivateFieldGet(this, _DateField_instances, "m", _DateField_convertNumberToDate).call(this, value);
+            if (coercedValue) {
+                super.minimum = coercedValue;
+            }
+        }
+        else if (typeof value === 'string') {
+            super.minimum = value;
+        }
+    }
+    get maximum() {
+        return super.maximum;
+    }
+    set maximum(value) {
+        if (typeof value === 'number') {
+            const coercedValue = __classPrivateFieldGet(this, _DateField_instances, "m", _DateField_convertNumberToDate).call(this, value);
+            if (coercedValue) {
+                super.maximum = coercedValue;
+            }
+        }
+        else if (typeof value === 'string') {
+            super.maximum = value;
+        }
+    }
 }
+_DateField_instances = new WeakSet(), _DateField_convertNumberToDate = function _DateField_convertNumberToDate(value) {
+    const coercedValue = (0, af_formatters_1.numberToDatetime)(value);
+    if (!isNaN(coercedValue)) {
+        return (0, af_formatters_1.formatDate)(coercedValue, this.locale, this._dataFormat);
+    }
+    return null;
+};
 exports.default = DateField;

package/lib/Field.d.ts

@@ -44,10 +44,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     set enumNames(e: string[] | undefined);
     get required(): boolean;
     set required(r: boolean);
-    get maximum(): number | undefined;
-    set maximum(m: number | undefined);
-    get minimum(): number | undefined;
-    set minimum(m: number | undefined);
+    get maximum(): string | number | undefined;
+    set maximum(m: string | number | undefined);
+    get minimum(): string | number | undefined;
+    set minimum(m: string | number | undefined);
     private withCategory;
     get editValue(): any;
     get displayValue(): any;
@@ -142,10 +142,10 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get minLength(): number | undefined;
     get pattern(): string | undefined;
     get step(): number | undefined;
-    get exclusiveMinimum(): number | undefined;
-    set exclusiveMinimum(eM: number | undefined);
-    get exclusiveMaximum(): number | undefined;
-    set exclusiveMaximum(eM: number | undefined);
+    get exclusiveMinimum(): string | number | undefined;
+    set exclusiveMinimum(eM: string | number | undefined);
+    get exclusiveMaximum(): string | number | undefined;
+    set exclusiveMaximum(eM: string | number | undefined);
     get default(): any;
     private isNotEmpty;
     protected evaluateConstraints(): any;
@@ -167,17 +167,17 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | undefined;

package/lib/Form.d.ts

@@ -46,17 +46,17 @@ declare class Form extends Container<FormJson> implements FormModel {
     } & {
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;
-        exclusiveMinimum?: number | undefined;
-        exclusiveMaximum?: number | undefined;
+        exclusiveMinimum?: string | number | undefined;
+        exclusiveMaximum?: string | number | undefined;
         format?: string | undefined;
         maxFileSize?: string | number | undefined;
         maxLength?: number | undefined;
-        maximum?: number | undefined;
+        maximum?: string | number | undefined;
         maxItems?: number | undefined;
         minOccur?: number | undefined;
         maxOccur?: number | undefined;
         minLength?: number | undefined;
-        minimum?: number | undefined;
+        minimum?: string | number | undefined;
         minItems?: number | undefined;
         pattern?: string | undefined;
         required?: boolean | 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/lib/types/Json.d.ts

@@ -15,17 +15,17 @@ declare type TranslationConstraintsJson = {
 export declare type ConstraintsJson = TranslationConstraintsJson & {
     accept?: string[];
     enforceEnum?: boolean;
-    exclusiveMinimum?: number;
-    exclusiveMaximum?: number;
+    exclusiveMinimum?: number | string;
+    exclusiveMaximum?: number | string;
     format?: string;
     maxFileSize?: number | string;
     maxLength?: number;
-    maximum?: number;
+    maximum?: number | string;
     maxItems?: number;
     minOccur?: number;
     maxOccur?: number;
     minLength?: number;
-    minimum?: number;
+    minimum?: number | string;
     minItems?: number;
     pattern?: string;
     required?: boolean;

package/package.json

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