@aemforms/af-core 0.22.35 → 0.22.37

package/lib/BaseNode.d.ts

@@ -91,4 +91,6 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     protected _applyUpdates(propNames: string[], updates: any): any;
     get qualifiedName(): any;
     focus(): void;
+    protected _getDefaults(): any;
+    protected _applyDefaultsInModel(): void;
 }

package/lib/BaseNode.js

@@ -437,6 +437,23 @@ class BaseNode {
             this.parent.activeChild = this;
         }
     }
+    _getDefaults() {
+        return {};
+    }
+    _applyDefaultsInModel() {
+        Object.entries(this._getDefaults()).map(([key, value]) => {
+            if (this._jsonModel[key] === undefined && value !== undefined) {
+                this._jsonModel[key] = value;
+            }
+            else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+                Object.keys(value).forEach((keyOfValue) => {
+                    if (this._jsonModel[key][keyOfValue] === undefined) {
+                        this._jsonModel[key][keyOfValue] = value[keyOfValue];
+                    }
+                });
+            }
+        });
+    }
 }
 __decorate([
     dependencyTracked()

package/lib/Checkbox.d.ts

@@ -72,6 +72,11 @@ declare class Checkbox extends Field {
         readOnly: boolean;
         enabled: boolean;
         visible: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+        required: boolean;
         type: string | undefined;
     };
     get enum(): any[];

package/lib/CheckboxGroup.d.ts

@@ -12,6 +12,11 @@ declare class CheckboxGroup extends Field {
         readOnly: boolean;
         enabled: boolean;
         visible: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+        required: boolean;
         type: string | undefined;
     };
 }

package/lib/Field.d.ts

@@ -14,6 +14,11 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         readOnly: boolean;
         enabled: boolean;
         visible: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+        required: boolean;
         type: string | undefined;
     };
     protected _getFallbackType(): string | undefined;

package/lib/Field.js

@@ -46,6 +46,11 @@ class Field extends Scriptable_1.default {
             readOnly: false,
             enabled: true,
             visible: true,
+            label: {
+                visible: true,
+                richText: false
+            },
+            required: false,
             type: this._getFallbackType()
         };
     }
@@ -79,11 +84,7 @@ class Field extends Scriptable_1.default {
         return finalType;
     }
     _applyDefaults() {
-        Object.entries(this._getDefaults()).map(([key, value]) => {
-            if (this._jsonModel[key] === undefined && value !== undefined) {
-                this._jsonModel[key] = value;
-            }
-        });
+        super._applyDefaultsInModel();
         this.coerceParam('required', 'boolean');
         this.coerceParam('readOnly', 'boolean');
         this.coerceParam('enabled', 'boolean');

package/lib/Fieldset.d.ts

@@ -6,6 +6,16 @@ export declare class Fieldset extends Container<FieldsetJson> implements Fieldse
         parent: ContainerModel;
         fieldFactory: IFormFieldFactory;
     });
+    protected _getDefaults(): {
+        visible: boolean;
+        enabled: boolean;
+        readOnly: boolean;
+        required: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+    };
     private _applyDefaults;
     get type(): "array" | "object" | undefined;
     get items(): (FieldModel | FieldsetModel)[];

package/lib/Fieldset.js

@@ -6,10 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fieldset = void 0;
 const Container_1 = __importDefault(require("./Container"));
 const Events_1 = require("./controller/Events");
-const defaults = {
-    visible: true,
-    enabled: true
-};
 const notifyChildrenAttributes = [
     'readOnly', 'enabled'
 ];
@@ -20,12 +16,20 @@ class Fieldset extends Container_1.default {
         this.queueEvent(new Events_1.Initialize());
         this.queueEvent(new Events_1.ExecuteRule());
     }
-    _applyDefaults() {
-        Object.entries(defaults).map(([key, value]) => {
-            if (this._jsonModel[key] === undefined) {
-                this._jsonModel[key] = value;
+    _getDefaults() {
+        return {
+            visible: true,
+            enabled: true,
+            readOnly: false,
+            required: false,
+            label: {
+                visible: true,
+                richText: false
             }
-        });
+        };
+    }
+    _applyDefaults() {
+        super._applyDefaultsInModel();
         if (this._jsonModel.dataRef && this._jsonModel.type === undefined) {
             this._jsonModel.type = 'object';
         }

package/lib/FileUpload.d.ts

@@ -8,6 +8,11 @@ declare class FileUpload extends Field implements FieldModel {
         readOnly: boolean;
         enabled: boolean;
         visible: boolean;
+        label: {
+            visible: boolean;
+            richText: boolean;
+        };
+        required: boolean;
         type: string | undefined;
     };
     protected _getFallbackType(): string | undefined;

package/lib/data/DataGroup.js

@@ -65,7 +65,12 @@ class DataGroup extends DataValue_1.default {
         }
     }
     $removeDataNode(name) {
-        this.$_items[name] = undefined;
+        if (this.$type === 'array') {
+            this.$_items.splice(name, 1);
+        }
+        else {
+            this.$_items[name] = undefined;
+        }
     }
     $getDataNode(name) {
         if (this.$_items.hasOwnProperty(name)) {

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', 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) => Promise<void>;
 export declare type CustomFunction = Function;
 export declare type FunctionDefinition = {
     _func: CustomFunction;

package/lib/utils/FormUtils.js

@@ -202,24 +202,19 @@ const dataURItoBlob = (dataURI) => {
     }
 };
 exports.dataURItoBlob = dataURItoBlob;
-const isFormContainer = (model) => {
-    return (':items' in model || 'cqItems' in model) && (':itemsOrder' in model || 'cqItemsOrder' in model) && 'fieldType' in model;
+const isFormOrSiteContainer = (model) => {
+    return (':items' in model || 'cqItems' in model) && (':itemsOrder' in model || 'cqItemsOrder' in model);
 };
 const sitesModelToFormModel = (sitesModel) => {
     if (!sitesModel || !Object.keys(sitesModel).length) {
         return sitesModel;
     }
-    if (isFormContainer(sitesModel)) {
+    if (isFormOrSiteContainer(sitesModel)) {
         const itemsArr = [];
         const itemsOrder = sitesModel[':itemsOrder'] || sitesModel.cqItemsOrder;
         const items = sitesModel[':items'] || sitesModel.cqItems;
         itemsOrder.forEach((elemName) => {
-            if (isFormContainer(items[elemName])) {
-                itemsArr.push((0, exports.sitesModelToFormModel)(items[elemName]));
-            }
-            else {
-                itemsArr.push(items[elemName]);
-            }
+            itemsArr.push((0, exports.sitesModelToFormModel)(items[elemName]));
         });
         sitesModel.items = itemsArr;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.35",
+  "version": "0.22.37",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.35"
+    "@aemforms/af-formatters": "^0.22.37"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",