@aemforms/af-core 0.22.121 → 0.22.123

package/esm/afb-events.js

@@ -182,5 +182,15 @@ class RemoveInstance extends ActionImpl {
         super(payload, 'removeInstance');
     }
 }
+class RequestSuccess extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'requestSuccess', { dispatch });
+    }
+}
+class RequestFailure extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'requestFailure', { dispatch });
+    }
+}
 
-export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, Reset, Save, Submit, SubmitError, SubmitFailure, SubmitSuccess, UIChange, Valid, ValidationComplete, propertyChange };
+export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, RequestFailure, RequestSuccess, Reset, Save, Submit, SubmitError, SubmitFailure, SubmitSuccess, UIChange, Valid, ValidationComplete, propertyChange };

package/esm/afb-runtime.js

@@ -1,4 +1,4 @@
-import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, SubmitError, SubmitFailure, Submit, Save, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
+import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, RequestSuccess, SubmitError, SubmitFailure, RequestFailure, Submit, Save, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
 import Formula from '@adobe/json-formula';
 import { parseDefaultDate, datetimeToNumber, format, parseDateSkeleton, numberToDatetime, formatDate, parseDate } from '@aemforms/af-formatters';
 
@@ -156,6 +156,10 @@ const isEmailInput = function (item) {
     const fieldType = item?.fieldType || defaultFieldTypes(item);
     return (fieldType === 'text-input' && item?.format === 'email') || fieldType === 'email';
 };
+const isDateTimeField = function (item) {
+    const fieldType = item?.fieldType || defaultFieldTypes(item);
+    return (fieldType === 'text-input' && item?.format === 'date-time') || fieldType === 'datetime-input';
+};
 const isDateField = function (item) {
     const fieldType = item?.fieldType || defaultFieldTypes(item);
     return (fieldType === 'text-input' && item?.format === 'date') || fieldType === 'date-input';
@@ -1030,7 +1034,8 @@ const ValidConstraints = {
     number: ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'],
     array: ['minItems', 'maxItems', 'uniqueItems'],
     file: ['accept', 'maxFileSize'],
-    email: ['minLength', 'maxLength', 'format', 'pattern']
+    email: ['minLength', 'maxLength', 'format', 'pattern'],
+    datetime: ['minimum', 'maximum']
 };
 const validationConstraintsList = ['type', 'format', 'minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum', 'minItems',
     'maxItems', 'uniqueItems', 'minLength', 'maxLength', 'pattern', 'required', 'enum', 'accept', 'maxFileSize'];
@@ -1914,6 +1919,7 @@ class Scriptable extends BaseNode {
                 target: this.getRuleNode()
             }
         };
+        this.ruleEngine.setDependencyTracking(['change', 'executeRule'].includes(action.type));
         const eventName = action.isCustomEvent ? `custom:${action.type}` : action.type;
         const funcName = action.isCustomEvent ? `custom_${action.type}` : action.type;
         const node = this.getCompiledEvent(eventName);
@@ -2407,7 +2413,7 @@ class Container extends Scriptable {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                        if (change.currentValue !== child._jsonModel[change.propertyName]) {
                             child._jsonModel[change.propertyName] = change.currentValue;
                             this.notifyDependents.call(child, propertyChange(change.propertyName, child.getState()[change.propertyName], null));
                         }
@@ -2716,6 +2722,14 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         method: httpVerb,
         ...encryptOutput
     };
+    const targetField = context.$field || null;
+    const targetEvent = context.$event || null;
+    const enhancedPayload = {
+        request: response.originalRequest,
+        response,
+        targetField,
+        targetEvent
+    };
     if (response?.status >= 200 && response?.status <= 299) {
         const eName = getCustomEventName(success);
         if (success === 'submitSuccess') {
@@ -2724,6 +2738,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         else {
             context.form.dispatch(new CustomEvent(eName, response, true));
         }
+        context.form.dispatch(new RequestSuccess(enhancedPayload, false));
     }
     else {
         context.form.logger.error('Error invoking a rest API');
@@ -2735,7 +2750,9 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         else {
             context.form.dispatch(new CustomEvent(eName, response, true));
         }
+        context.form.dispatch(new RequestFailure(enhancedPayload, false));
     }
+    return response;
 };
 const urlEncoded = (data) => {
     const formData = new URLSearchParams();
@@ -3120,6 +3137,65 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            requestWithRetry: {
+                _func: (args, data, interpreter) => {
+                    const uri = toString(args[0]);
+                    const httpVerb = toString(args[1]);
+                    let success;
+                    let errorFn;
+                    let payload = valueOf(args[2]);
+                    if (typeof (args[3]) === 'string') {
+                        success = valueOf(args[3]);
+                        errorFn = valueOf(args[4]);
+                    }
+                    return async (retryOptions) => {
+                        try {
+                            if (payload instanceof Promise) {
+                                payload = await payload;
+                            }
+                        }
+                        catch (error) {
+                            console.error('Error resolving payload Promise:', error);
+                            throw error;
+                        }
+                        let finalHeaders = payload.headers || {};
+                        let finalBody = payload.body || {};
+                        if (retryOptions) {
+                            if (retryOptions.body) {
+                                finalBody = {
+                                    ...finalBody,
+                                    ...retryOptions.body
+                                };
+                            }
+                            if (retryOptions.headers) {
+                                finalHeaders = {
+                                    ...finalHeaders,
+                                    ...retryOptions.headers
+                                };
+                            }
+                        }
+                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        try {
+                            const response = await request(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
+                            return response;
+                        }
+                        catch (error) {
+                            if (error && typeof error === 'object' && 'status' in error && error.status >= 400) {
+                                throw error;
+                            }
+                            throw new Error('Request failed');
+                        }
+                    };
+                },
+                _signature: []
+            },
+            retryHandler: {
+                _func: (args, data, interpreter) => {
+                    const requestFn = valueOf(args[0]);
+                    return requestFn();
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: async (args, data, interpreter) => {
                     const success = args[1];
@@ -3870,6 +3946,7 @@ class Field extends Scriptable {
                     'multiline-input': 'string',
                     'number-input': 'number',
                     'date-input': 'string',
+                    'date-time': 'string',
                     'email': 'string',
                     'plain-text': 'string',
                     'image': 'string',
@@ -3944,7 +4021,7 @@ class Field extends Scriptable {
         }
         this.coerceParam('minLength', 'number');
         this.coerceParam('maxLength', 'number');
-        if (this._jsonModel.type !== 'number' && this._jsonModel.format !== 'date' && this._jsonModel.type !== 'integer') {
+        if (this._jsonModel.type !== 'number' && this._jsonModel.format !== 'date' && this._jsonModel.format !== 'date-time' && this._jsonModel.type !== 'integer') {
             this.unset('step', ...props);
         }
         props.forEach(c => {
@@ -4047,22 +4124,22 @@ class Field extends Scriptable {
         this._setProperty('required', r);
     }
     get maximum() {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             return this._jsonModel.maximum;
         }
     }
     set maximum(m) {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             this._setProperty('maximum', m);
         }
     }
     get minimum() {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             return this._jsonModel.minimum;
         }
     }
     set minimum(m) {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             this._setProperty('minimum', m);
         }
     }
@@ -4307,6 +4384,8 @@ class Field extends Scriptable {
                 switch (this.format) {
                     case 'date':
                         return ValidConstraints.date;
+                    case 'date-time':
+                        return ValidConstraints.datetime;
                     case 'email':
                         return ValidConstraints.email;
                     case 'binary':
@@ -4337,6 +4416,9 @@ class Field extends Scriptable {
                     case 'file-input':
                         this._jsonModel.format = 'data-url';
                         break;
+                    case 'date-time':
+                        this._jsonModel.format = 'date-time';
+                        break;
                 }
             }
         }
@@ -4557,7 +4639,7 @@ __decorate([
     dependencyTracked()
 ], Field.prototype, "errorMessage", null);
 __decorate([
-    include('text-input', 'date-input', 'file-input', 'email')
+    include('text-input', 'date-input', 'file-input', 'email', 'datetime-input')
 ], Field.prototype, "format", null);
 __decorate([
     include('text-input')
@@ -4848,6 +4930,19 @@ class DateField extends Field {
     }
 }
 
+class DateTimeField extends DateField {
+    _dataFormat = 'yyyy-MM-ddTHH:mm';
+    _applyDefaults() {
+        super._applyDefaults();
+    }
+    get value() {
+        return super.value;
+    }
+    set value(value) {
+        super.value = value;
+    }
+}
+
 class EmailInput extends Field {
     _getDefaults() {
         return {
@@ -4962,6 +5057,9 @@ class FormFieldFactoryImpl {
             else if (isDateField(child)) {
                 retVal = new DateField(child, options);
             }
+            else if (isDateTimeField(child)) {
+                retVal = new DateTimeField(child, options);
+            }
             else if (isCaptcha(child)) {
                 retVal = new Captcha(child, options);
             }

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

@@ -2,7 +2,7 @@ import Field from './Field';
 declare class DateField extends Field {
     #private;
     private locale?;
-    private _dataFormat;
+    protected _dataFormat: string;
     protected _applyDefaults(): void;
     get value(): any;
     set value(value: any);

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

@@ -0,0 +1,8 @@
+import DateField from './DateField';
+declare class DateTimeField extends DateField {
+    protected _dataFormat: string;
+    protected _applyDefaults(): void;
+    get value(): any;
+    set value(value: any);
+}
+export default DateTimeField;

package/esm/types/src/controller/Events.d.ts

@@ -108,4 +108,10 @@ export declare class AddInstance extends ActionImpl {
 export declare class RemoveInstance extends ActionImpl {
     constructor(payload?: number);
 }
+export declare class RequestSuccess extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
+export declare class RequestFailure extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
 export {};

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

@@ -1,5 +1,5 @@
 type HTTP_VERB = 'GET' | 'POST';
-export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<any>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any, action?: string, metadata?: any) => Promise<void>;
 export type CustomFunction = Function;
 export type FunctionDefinition = {
@@ -45,7 +45,18 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         request: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<void>;
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        requestWithRetry: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => (retryOptions?: {
+                headers?: Record<string, string>;
+                body?: any;
+            }) => Promise<any>;
+            _signature: never[];
+        };
+        retryHandler: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
         awaitFn: {

package/esm/types/src/utils/JsonUtils.d.ts

@@ -5,6 +5,7 @@ export declare const checkIfConstraintsArePresent: (item: FieldsetJson | FieldJs
 export declare const isCheckbox: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCheckboxGroup: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isEmailInput: (item: FieldsetJson | FieldJson) => boolean;
+export declare const isDateTimeField: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isDateField: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCaptcha: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isButton: (item: FieldsetJson | FieldJson) => boolean;

package/esm/types/src/utils/ValidationUtils.d.ts

@@ -10,6 +10,7 @@ type ValidConstraintsType = {
     array: ValidationConstraints[];
     file: ValidationConstraints[];
     email: ValidationConstraints[];
+    datetime: ValidationConstraints[];
 };
 export declare const ValidConstraints: ValidConstraintsType;
 export declare const validationConstraintsList: readonly ["type", "format", "minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "minItems", "maxItems", "uniqueItems", "minLength", "maxLength", "pattern", "required", "enum", "accept", "maxFileSize"];

package/lib/Container.js

@@ -463,7 +463,7 @@ class Container extends Scriptable_1.default {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                        if (change.currentValue !== child._jsonModel[change.propertyName]) {
                             child._jsonModel[change.propertyName] = change.currentValue;
                             this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
                         }

package/lib/DateField.d.ts

@@ -2,7 +2,7 @@ import Field from './Field';
 declare class DateField extends Field {
     #private;
     private locale?;
-    private _dataFormat;
+    protected _dataFormat: string;
     protected _applyDefaults(): void;
     get value(): any;
     set value(value: any);

package/lib/DateTimeField.d.ts

@@ -0,0 +1,8 @@
+import DateField from './DateField';
+declare class DateTimeField extends DateField {
+    protected _dataFormat: string;
+    protected _applyDefaults(): void;
+    get value(): any;
+    set value(value: any);
+}
+export default DateTimeField;

package/lib/DateTimeField.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const DateField_1 = __importDefault(require("./DateField"));
+class DateTimeField extends DateField_1.default {
+    constructor() {
+        super(...arguments);
+        this._dataFormat = 'yyyy-MM-ddTHH:mm';
+    }
+    _applyDefaults() {
+        super._applyDefaults();
+    }
+    get value() {
+        return super.value;
+    }
+    set value(value) {
+        super.value = value;
+    }
+}
+exports.default = DateTimeField;

package/lib/Field.js

@@ -89,6 +89,7 @@ class Field extends Scriptable_1.default {
                     'multiline-input': 'string',
                     'number-input': 'number',
                     'date-input': 'string',
+                    'date-time': 'string',
                     'email': 'string',
                     'plain-text': 'string',
                     'image': 'string',
@@ -164,7 +165,7 @@ class Field extends Scriptable_1.default {
         }
         this.coerceParam('minLength', 'number');
         this.coerceParam('maxLength', 'number');
-        if (this._jsonModel.type !== 'number' && this._jsonModel.format !== 'date' && this._jsonModel.type !== 'integer') {
+        if (this._jsonModel.type !== 'number' && this._jsonModel.format !== 'date' && this._jsonModel.format !== 'date-time' && this._jsonModel.type !== 'integer') {
             this.unset('step', ...props);
         }
         props.forEach(c => {
@@ -266,22 +267,22 @@ class Field extends Scriptable_1.default {
         this._setProperty('required', r);
     }
     get maximum() {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             return this._jsonModel.maximum;
         }
     }
     set maximum(m) {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             this._setProperty('maximum', m);
         }
     }
     get minimum() {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             return this._jsonModel.minimum;
         }
     }
     set minimum(m) {
-        if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
+        if (this.type === 'number' || this.format === 'date' || this.format === 'date-time' || this.type === 'integer') {
             this._setProperty('minimum', m);
         }
     }
@@ -527,6 +528,8 @@ class Field extends Scriptable_1.default {
                 switch (this.format) {
                     case 'date':
                         return ValidationUtils_1.ValidConstraints.date;
+                    case 'date-time':
+                        return ValidationUtils_1.ValidConstraints.datetime;
                     case 'email':
                         return ValidationUtils_1.ValidConstraints.email;
                     case 'binary':
@@ -557,6 +560,9 @@ class Field extends Scriptable_1.default {
                     case 'file-input':
                         this._jsonModel.format = 'data-url';
                         break;
+                    case 'date-time':
+                        this._jsonModel.format = 'date-time';
+                        break;
                 }
             }
         }
@@ -760,7 +766,7 @@ __decorate([
     (0, BaseNode_1.dependencyTracked)()
 ], Field.prototype, "errorMessage", null);
 __decorate([
-    (0, BaseNode_1.include)('text-input', 'date-input', 'file-input', 'email')
+    (0, BaseNode_1.include)('text-input', 'date-input', 'file-input', 'email', 'datetime-input')
 ], Field.prototype, "format", null);
 __decorate([
     (0, BaseNode_1.include)('text-input')

package/lib/Scriptable.js

@@ -182,6 +182,7 @@ class Scriptable extends BaseNode_1.BaseNode {
                 target: this.getRuleNode()
             }
         };
+        this.ruleEngine.setDependencyTracking(['change', 'executeRule'].includes(action.type));
         const eventName = action.isCustomEvent ? `custom:${action.type}` : action.type;
         const funcName = action.isCustomEvent ? `custom_${action.type}` : action.type;
         const node = this.getCompiledEvent(eventName);

package/lib/controller/Events.d.ts

@@ -108,4 +108,10 @@ export declare class AddInstance extends ActionImpl {
 export declare class RemoveInstance extends ActionImpl {
     constructor(payload?: number);
 }
+export declare class RequestSuccess extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
+export declare class RequestFailure extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
 export {};

package/lib/controller/Events.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoveInstance = exports.AddInstance = exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Reset = exports.SubmitError = exports.SubmitFailure = exports.SubmitSuccess = exports.Save = exports.Submit = exports.Focus = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.UIChange = exports.Change = void 0;
+exports.RequestFailure = exports.RequestSuccess = exports.RemoveInstance = exports.AddInstance = exports.RemoveItem = exports.AddItem = exports.CustomEvent = exports.FieldChanged = exports.Reset = exports.SubmitError = exports.SubmitFailure = exports.SubmitSuccess = exports.Save = exports.Submit = exports.Focus = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.UIChange = exports.Change = void 0;
 var EventSource;
 (function (EventSource) {
     EventSource["CODE"] = "code";
@@ -204,3 +204,15 @@ class RemoveInstance extends ActionImpl {
     }
 }
 exports.RemoveInstance = RemoveInstance;
+class RequestSuccess extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'requestSuccess', { dispatch });
+    }
+}
+exports.RequestSuccess = RequestSuccess;
+class RequestFailure extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'requestFailure', { dispatch });
+    }
+}
+exports.RequestFailure = RequestFailure;

package/lib/rules/FunctionRuntime.d.ts

@@ -1,5 +1,5 @@
 declare type HTTP_VERB = 'GET' | 'POST';
-export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<void>;
+export declare const request: (context: any, uri: string, httpVerb: HTTP_VERB, payload: any, success: string, error: string, headers: any) => Promise<any>;
 export declare const submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any, action?: string, metadata?: any) => Promise<void>;
 export declare type CustomFunction = Function;
 export declare type FunctionDefinition = {
@@ -45,7 +45,18 @@ declare class FunctionRuntimeImpl {
             _signature: never[];
         };
         request: {
-            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<void>;
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<any>;
+            _signature: never[];
+        };
+        requestWithRetry: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => (retryOptions?: {
+                headers?: Record<string, string>;
+                body?: any;
+            }) => Promise<any>;
+            _signature: never[];
+        };
+        retryHandler: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
         awaitFn: {

package/lib/rules/FunctionRuntime.js

@@ -80,6 +80,14 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     }
     const response = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
     response.originalRequest = Object.assign({ url: endpoint, method: httpVerb }, encryptOutput);
+    const targetField = context.$field || null;
+    const targetEvent = context.$event || null;
+    const enhancedPayload = {
+        request: response.originalRequest,
+        response,
+        targetField,
+        targetEvent
+    };
     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') {
@@ -88,6 +96,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         else {
             context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
+        context.form.dispatch(new Events_1.RequestSuccess(enhancedPayload, false));
     }
     else {
         context.form.logger.error('Error invoking a rest API');
@@ -99,7 +108,9 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         else {
             context.form.dispatch(new Events_1.CustomEvent(eName, response, true));
         }
+        context.form.dispatch(new Events_1.RequestFailure(enhancedPayload, false));
     }
+    return response;
 });
 exports.request = request;
 const urlEncoded = (data) => {
@@ -487,6 +498,59 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            requestWithRetry: {
+                _func: (args, data, interpreter) => {
+                    const uri = toString(args[0]);
+                    const httpVerb = toString(args[1]);
+                    let success;
+                    let errorFn;
+                    let payload = valueOf(args[2]);
+                    if (typeof (args[3]) === 'string') {
+                        success = valueOf(args[3]);
+                        errorFn = valueOf(args[4]);
+                    }
+                    return (retryOptions) => __awaiter(this, void 0, void 0, function* () {
+                        try {
+                            if (payload instanceof Promise) {
+                                payload = yield payload;
+                            }
+                        }
+                        catch (error) {
+                            console.error('Error resolving payload Promise:', error);
+                            throw error;
+                        }
+                        let finalHeaders = payload.headers || {};
+                        let finalBody = payload.body || {};
+                        if (retryOptions) {
+                            if (retryOptions.body) {
+                                finalBody = Object.assign(Object.assign({}, finalBody), retryOptions.body);
+                            }
+                            if (retryOptions.headers) {
+                                finalHeaders = Object.assign(Object.assign({}, finalHeaders), retryOptions.headers);
+                            }
+                        }
+                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        try {
+                            const response = yield (0, exports.request)(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
+                            return response;
+                        }
+                        catch (error) {
+                            if (error && typeof error === 'object' && 'status' in error && error.status >= 400) {
+                                throw error;
+                            }
+                            throw new Error('Request failed');
+                        }
+                    });
+                },
+                _signature: []
+            },
+            retryHandler: {
+                _func: (args, data, interpreter) => {
+                    const requestFn = valueOf(args[0]);
+                    return requestFn();
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
                     const success = args[1];

package/lib/utils/FormCreationUtils.js

@@ -11,6 +11,7 @@ const FileUpload_1 = __importDefault(require("../FileUpload"));
 const Checkbox_1 = __importDefault(require("../Checkbox"));
 const CheckboxGroup_1 = __importDefault(require("../CheckboxGroup"));
 const DateField_1 = __importDefault(require("../DateField"));
+const DateTimeField_1 = __importDefault(require("../DateTimeField"));
 const Field_1 = __importDefault(require("../Field"));
 const EmailInput_1 = __importDefault(require("../EmailInput"));
 const Captcha_1 = __importDefault(require("../Captcha"));
@@ -66,6 +67,9 @@ class FormFieldFactoryImpl {
             else if ((0, JsonUtils_1.isDateField)(child)) {
                 retVal = new DateField_1.default(child, options);
             }
+            else if ((0, JsonUtils_1.isDateTimeField)(child)) {
+                retVal = new DateTimeField_1.default(child, options);
+            }
             else if ((0, JsonUtils_1.isCaptcha)(child)) {
                 retVal = new Captcha_1.default(child, options);
             }

package/lib/utils/JsonUtils.d.ts

@@ -5,6 +5,7 @@ export declare const checkIfConstraintsArePresent: (item: FieldsetJson | FieldJs
 export declare const isCheckbox: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCheckboxGroup: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isEmailInput: (item: FieldsetJson | FieldJson) => boolean;
+export declare const isDateTimeField: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isDateField: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCaptcha: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isButton: (item: FieldsetJson | FieldJson) => boolean;

package/lib/utils/JsonUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isButton = exports.isCaptcha = exports.isDateField = exports.isEmailInput = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
+exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isButton = exports.isCaptcha = exports.isDateField = exports.isDateTimeField = exports.isEmailInput = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
 const index_1 = require("../types/index");
 const SchemaUtils_1 = require("./SchemaUtils");
 const getProperty = (data, key, def) => {
@@ -42,6 +42,11 @@ const isEmailInput = function (item) {
     return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'email') || fieldType === 'email';
 };
 exports.isEmailInput = isEmailInput;
+const isDateTimeField = function (item) {
+    const fieldType = (item === null || item === void 0 ? void 0 : item.fieldType) || (0, SchemaUtils_1.defaultFieldTypes)(item);
+    return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'date-time') || fieldType === 'datetime-input';
+};
+exports.isDateTimeField = isDateTimeField;
 const isDateField = function (item) {
     const fieldType = (item === null || item === void 0 ? void 0 : item.fieldType) || (0, SchemaUtils_1.defaultFieldTypes)(item);
     return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'date') || fieldType === 'date-input';

package/lib/utils/ValidationUtils.d.ts

@@ -10,6 +10,7 @@ declare type ValidConstraintsType = {
     array: ValidationConstraints[];
     file: ValidationConstraints[];
     email: ValidationConstraints[];
+    datetime: ValidationConstraints[];
 };
 export declare const ValidConstraints: ValidConstraintsType;
 export declare const validationConstraintsList: readonly ["type", "format", "minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "minItems", "maxItems", "uniqueItems", "minLength", "maxLength", "pattern", "required", "enum", "accept", "maxFileSize"];

package/lib/utils/ValidationUtils.js

@@ -116,7 +116,8 @@ exports.ValidConstraints = {
     number: ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'],
     array: ['minItems', 'maxItems', 'uniqueItems'],
     file: ['accept', 'maxFileSize'],
-    email: ['minLength', 'maxLength', 'format', 'pattern']
+    email: ['minLength', 'maxLength', 'format', 'pattern'],
+    datetime: ['minimum', 'maximum']
 };
 exports.validationConstraintsList = ['type', 'format', 'minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum', 'minItems',
     'maxItems', 'uniqueItems', 'minLength', 'maxLength', 'pattern', 'required', 'enum', 'accept', 'maxFileSize'];

package/package.json

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