@aemforms/af-core 0.22.79 → 0.22.81

package/esm/afb-events.js

@@ -110,6 +110,11 @@ class Submit extends ActionImpl {
         super(payload, 'submit', { dispatch });
     }
 }
+class Save extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'save', { dispatch });
+    }
+}
 class SubmitSuccess extends ActionImpl {
     constructor(payload, dispatch = false) {
         super(payload, 'submitSuccess', { dispatch });
@@ -167,4 +172,4 @@ class RemoveInstance extends ActionImpl {
     }
 }
 
-export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, Reset, Submit, SubmitError, SubmitFailure, SubmitSuccess, Valid, ValidationComplete, propertyChange };
+export { AddInstance, AddItem, Blur, Change, Click, CustomEvent, ExecuteRule, FieldChanged, Focus, FormLoad, Initialize, Invalid, RemoveInstance, RemoveItem, Reset, Save, Submit, SubmitError, SubmitFailure, SubmitSuccess, Valid, ValidationComplete, propertyChange };

package/esm/afb-runtime.js

@@ -1,4 +1,4 @@
-import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, SubmitError, SubmitFailure, Submit, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete, Valid, Invalid } from './afb-events.js';
+import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, SubmitError, SubmitFailure, Submit, Save, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete, Valid, Invalid } from './afb-events.js';
 import Formula from '@adobe/json-formula';
 import { parseDefaultDate, datetimeToNumber, format, parseDateSkeleton, formatDate, numberToDatetime } from '@aemforms/af-formatters';
 
@@ -2577,15 +2577,15 @@ const multipartFormData = (data, attachments) => {
     }
     return formData;
 };
-const submit = async (context, success, error, submitAs = 'multipart/form-data', input_data = null) => {
-    const endpoint = context.form.action;
+const submit = async (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => {
+    const endpoint = action || context.form.action;
     let data = input_data;
     if (typeof data != 'object' || data == null) {
         data = context.form.exportData();
     }
     const attachments = getAttachments(context.form, true);
     let submitContentType = submitAs;
-    const submitDataAndMetaData = { 'data': data, 'submitMetadata': context.form.exportSubmitMetaData() };
+    const submitDataAndMetaData = { 'data': data, ...metadata };
     let formData = submitDataAndMetaData;
     if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
         formData = multipartFormData(submitDataAndMetaData, attachments);
@@ -2601,6 +2601,8 @@ const createAction = (name, payload = {}) => {
             return new Change(payload);
         case 'submit':
             return new Submit(payload);
+        case 'save':
+            return new Save(payload);
         case 'click':
             return new Click(payload);
         case 'addItem':
@@ -2806,6 +2808,18 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            saveForm: {
+                _func: (args, data, interpreter) => {
+                    const action = toString(args[0]);
+                    const validate_form = args[2] || false;
+                    interpreter.globals.form.dispatch(new Save({
+                        action,
+                        validate_form
+                    }));
+                    return {};
+                },
+                _signature: []
+            },
             request: {
                 _func: (args, data, interpreter) => {
                     const uri = toString(args[0]);
@@ -3210,7 +3224,35 @@ class Form extends Container {
             const payload = action?.payload || {};
             const successEventName = payload?.success ? payload?.success : 'submitSuccess';
             const failureEventName = payload?.error ? payload?.error : 'submitError';
-            submit(context, successEventName, failureEventName, payload?.submit_as, payload?.data);
+            const formAction = payload.action || this.action;
+            const metadata = payload.metadata || {
+                'submitMetadata': this.exportSubmitMetaData()
+            };
+            const contentType = payload?.save_as || payload?.submit_as;
+            submit(context, successEventName, failureEventName, contentType, payload?.data, formAction, metadata);
+        }
+    }
+    save(action, context) {
+        const payload = action?.payload || {};
+        payload.save_as = 'multipart/form-data';
+        payload.metadata = {
+            'draftMetadata': {
+                'lang': this.lang,
+                'draftId': this.properties?.draftId || ''
+            }
+        };
+        payload.success = 'custom:saveSuccess';
+        payload.error = 'custom:saveError';
+        this.submit(action, context);
+        this.subscribe((action) => {
+            this._saveSuccess(action);
+        }, 'saveSuccess');
+    }
+    _saveSuccess(action) {
+        const draftId = action?.payload?.body?.draftId || '';
+        const properties = this.properties;
+        if (draftId && properties) {
+            properties.draftId = draftId;
         }
     }
     reset() {
@@ -3347,7 +3389,7 @@ class Fieldset extends Container {
         return undefined;
     }
     get items() {
-        return super.items;
+        return super.items ? super.items : [];
     }
     get value() {
         return null;
@@ -3744,6 +3786,9 @@ class Field extends Scriptable {
     }
     reset() {
         const changes = this.updateDataNodeAndTypedValue(this.default);
+        if (!changes) {
+            return;
+        }
         const validationStateChanges = {
             'valid': undefined,
             'errorMessage': '',
@@ -4418,7 +4463,7 @@ class FormFieldFactoryImpl {
             };
             retVal = new InstanceManager(newJson, options);
         }
-        else if ('items' in child) {
+        else if ('items' in child || child.fieldType === 'panel') {
             retVal = new Fieldset(child, options);
         }
         else {

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

@@ -120,6 +120,8 @@ declare class Form extends Container<FormJson> implements FormModel {
     isValid(): boolean;
     dispatch(action: Action): void;
     submit(action: Action, context: any): void;
+    save(action: Action, context: any): void;
+    _saveSuccess(action: Action): void;
     reset(): void;
     getElement(id: string): FieldModel | FieldsetModel | this;
     get qualifiedName(): string;

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

@@ -62,6 +62,9 @@ export declare class Focus extends ActionImpl {
 export declare class Submit extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }
+export declare class Save extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
 export declare class SubmitSuccess extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }

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

@@ -1,6 +1,6 @@
 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 submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any) => Promise<void>;
+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 = {
     _func: CustomFunction;
@@ -40,6 +40,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];
         };
+        saveForm: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
+            _signature: never[];
+        };
         request: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];

package/lib/Field.js

@@ -387,6 +387,9 @@ class Field extends Scriptable_1.default {
     }
     reset() {
         const changes = this.updateDataNodeAndTypedValue(this.default);
+        if (!changes) {
+            return;
+        }
         const validationStateChanges = {
             'valid': undefined,
             'errorMessage': '',

package/lib/Fieldset.js

@@ -35,7 +35,7 @@ class Fieldset extends Container_1.default {
         return undefined;
     }
     get items() {
-        return super.items;
+        return super.items ? super.items : [];
     }
     get value() {
         return null;

package/lib/Form.d.ts

@@ -120,6 +120,8 @@ declare class Form extends Container<FormJson> implements FormModel {
     isValid(): boolean;
     dispatch(action: Action): void;
     submit(action: Action, context: any): void;
+    save(action: Action, context: any): void;
+    _saveSuccess(action: Action): void;
     reset(): void;
     getElement(id: string): FieldModel | FieldsetModel | this;
     get qualifiedName(): string;

package/lib/Form.js

@@ -254,7 +254,37 @@ class Form extends Container_1.default {
             const payload = (action === null || action === void 0 ? void 0 : action.payload) || {};
             const successEventName = (payload === null || payload === void 0 ? void 0 : payload.success) ? payload === null || payload === void 0 ? void 0 : payload.success : 'submitSuccess';
             const failureEventName = (payload === null || payload === void 0 ? void 0 : payload.error) ? payload === null || payload === void 0 ? void 0 : payload.error : 'submitError';
-            (0, FunctionRuntime_1.submit)(context, successEventName, failureEventName, payload === null || payload === void 0 ? void 0 : payload.submit_as, payload === null || payload === void 0 ? void 0 : payload.data);
+            const formAction = payload.action || this.action;
+            const metadata = payload.metadata || {
+                'submitMetadata': this.exportSubmitMetaData()
+            };
+            const contentType = (payload === null || payload === void 0 ? void 0 : payload.save_as) || (payload === null || payload === void 0 ? void 0 : payload.submit_as);
+            (0, FunctionRuntime_1.submit)(context, successEventName, failureEventName, contentType, payload === null || payload === void 0 ? void 0 : payload.data, formAction, metadata);
+        }
+    }
+    save(action, context) {
+        var _a;
+        const payload = (action === null || action === void 0 ? void 0 : action.payload) || {};
+        payload.save_as = 'multipart/form-data';
+        payload.metadata = {
+            'draftMetadata': {
+                'lang': this.lang,
+                'draftId': ((_a = this.properties) === null || _a === void 0 ? void 0 : _a.draftId) || ''
+            }
+        };
+        payload.success = 'custom:saveSuccess';
+        payload.error = 'custom:saveError';
+        this.submit(action, context);
+        this.subscribe((action) => {
+            this._saveSuccess(action);
+        }, 'saveSuccess');
+    }
+    _saveSuccess(action) {
+        var _a, _b;
+        const draftId = ((_b = (_a = action === null || action === void 0 ? void 0 : action.payload) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.draftId) || '';
+        const properties = this.properties;
+        if (draftId && properties) {
+            properties.draftId = draftId;
         }
     }
     reset() {

package/lib/controller/Events.d.ts

@@ -62,6 +62,9 @@ export declare class Focus extends ActionImpl {
 export declare class Submit extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }
+export declare class Save extends ActionImpl {
+    constructor(payload?: any, dispatch?: boolean);
+}
 export declare class SubmitSuccess extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);
 }

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.Submit = exports.Focus = exports.ValidationComplete = exports.Blur = exports.Click = exports.FormLoad = exports.Initialize = exports.propertyChange = exports.ExecuteRule = exports.Valid = exports.Invalid = exports.Change = void 0;
+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.Change = void 0;
 class ActionImpl {
     constructor(payload, type, _metadata) {
         this._metadata = _metadata;
@@ -120,6 +120,12 @@ class Submit extends ActionImpl {
     }
 }
 exports.Submit = Submit;
+class Save extends ActionImpl {
+    constructor(payload, dispatch = false) {
+        super(payload, 'save', { dispatch });
+    }
+}
+exports.Save = Save;
 class SubmitSuccess extends ActionImpl {
     constructor(payload, dispatch = false) {
         super(payload, 'submitSuccess', { dispatch });

package/lib/rules/FunctionRuntime.d.ts

@@ -1,6 +1,6 @@
 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 submit: (context: any, success: string, error: string, submitAs?: 'application/json' | 'multipart/form-data' | 'application/x-www-form-urlencoded', input_data?: any) => Promise<void>;
+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 = {
     _func: CustomFunction;
@@ -40,6 +40,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];
         };
+        saveForm: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
+            _signature: never[];
+        };
         request: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => {};
             _signature: never[];

package/lib/rules/FunctionRuntime.js

@@ -123,15 +123,15 @@ const multipartFormData = (data, attachments) => {
     }
     return formData;
 };
-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;
+const submit = (context, success, error, submitAs = 'multipart/form-data', input_data = null, action = '', metadata = null) => __awaiter(void 0, void 0, void 0, function* () {
+    const endpoint = action || context.form.action;
     let data = input_data;
     if (typeof data != 'object' || data == null) {
         data = context.form.exportData();
     }
     const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
     let submitContentType = submitAs;
-    const submitDataAndMetaData = { 'data': data, 'submitMetadata': context.form.exportSubmitMetaData() };
+    const submitDataAndMetaData = Object.assign({ 'data': data }, metadata);
     let formData = submitDataAndMetaData;
     if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
         formData = multipartFormData(submitDataAndMetaData, attachments);
@@ -148,6 +148,8 @@ const createAction = (name, payload = {}) => {
             return new Events_1.Change(payload);
         case 'submit':
             return new Events_1.Submit(payload);
+        case 'save':
+            return new Events_1.Save(payload);
         case 'click':
             return new Events_1.Click(payload);
         case 'addItem':
@@ -353,6 +355,18 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            saveForm: {
+                _func: (args, data, interpreter) => {
+                    const action = toString(args[0]);
+                    const validate_form = args[2] || false;
+                    interpreter.globals.form.dispatch(new Events_1.Save({
+                        action,
+                        validate_form
+                    }));
+                    return {};
+                },
+                _signature: []
+            },
             request: {
                 _func: (args, data, interpreter) => {
                     const uri = toString(args[0]);

package/lib/utils/FormCreationUtils.js

@@ -43,7 +43,7 @@ class FormFieldFactoryImpl {
             });
             retVal = new InstanceManager_1.InstanceManager(newJson, options);
         }
-        else if ('items' in child) {
+        else if ('items' in child || child.fieldType === 'panel') {
             retVal = new Fieldset_1.Fieldset(child, options);
         }
         else {

package/package.json

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