@aemforms/af-core 0.22.76 → 0.22.77

package/esm/afb-runtime.js

@@ -1439,7 +1439,7 @@ class BaseNode {
         return [];
     }
     _bindToDataModel(contextualDataModel) {
-        if (this.id === '$form') {
+        if (this.fieldType === 'form' || this.id === '$form') {
             this._data = contextualDataModel;
             return;
         }
@@ -3061,7 +3061,7 @@ class Form extends Container {
                     };
                 });
                 const fieldChangedAction = new FieldChanged(changes, field);
-                this.dispatch(fieldChangedAction);
+                this.notifyDependents(fieldChangedAction);
             }
         });
     }
@@ -3125,7 +3125,7 @@ class Form extends Container {
         return null;
     }
     get id() {
-        return '$form';
+        return this._jsonModel.id || '$form';
     }
     get title() {
         return this._jsonModel.title || '';

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

@@ -95,7 +95,7 @@ declare class Checkbox extends Field {
         description?: string | undefined;
         rules?: import("./types").Items<string> | undefined;
         events?: import("./types").Items<string | string[] | undefined> | undefined;
-        enumNames?: string[] | import("./types").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;

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

@@ -40,8 +40,8 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get emptyValue(): "" | null | undefined;
     get enum(): any[] | undefined;
     set enum(e: any[] | undefined);
-    get enumNames(): string[] | import("./types").EnumName[] | undefined;
-    set enumNames(e: string[] | import("./types").EnumName[] | undefined);
+    get enumNames(): string[] | undefined;
+    set enumNames(e: string[] | undefined);
     get required(): boolean;
     set required(r: boolean);
     get maximum(): number | undefined;
@@ -163,7 +163,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         description?: string | undefined;
         rules?: import("./types").Items<string> | undefined;
         events?: import("./types").Items<string | string[] | undefined> | undefined;
-        enumNames?: string[] | import("./types").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;

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

@@ -26,7 +26,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     getState(forRestore?: boolean): {
         description?: string | undefined;
     } & import("./types/Json").RulesJson & {
-        enumNames?: string[] | import("./types/Json").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
     } & {
         accept?: string[] | undefined;

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

@@ -7,12 +7,8 @@ export type Label = {
     richText?: boolean;
     visible?: boolean;
 };
-export type EnumName = {
-    value: string;
-    richText?: boolean;
-};
 type TranslationConstraintsJson = {
-    enumNames?: string[] | EnumName[];
+    enumNames?: string[];
     enum?: any[];
 };
 export type ConstraintsJson = TranslationConstraintsJson & {

package/lib/BaseNode.js

@@ -336,7 +336,7 @@ class BaseNode {
         return [];
     }
     _bindToDataModel(contextualDataModel) {
-        if (this.id === '$form') {
+        if (this.fieldType === 'form' || this.id === '$form') {
             this._data = contextualDataModel;
             return;
         }

package/lib/Checkbox.d.ts

@@ -95,7 +95,7 @@ declare class Checkbox extends Field {
         description?: string | undefined;
         rules?: import("./types").Items<string> | undefined;
         events?: import("./types").Items<string | string[] | undefined> | undefined;
-        enumNames?: string[] | import("./types").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;

package/lib/Field.d.ts

@@ -40,8 +40,8 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get emptyValue(): "" | null | undefined;
     get enum(): any[] | undefined;
     set enum(e: any[] | undefined);
-    get enumNames(): string[] | import("./types").EnumName[] | undefined;
-    set enumNames(e: string[] | import("./types").EnumName[] | undefined);
+    get enumNames(): string[] | undefined;
+    set enumNames(e: string[] | undefined);
     get required(): boolean;
     set required(r: boolean);
     get maximum(): number | undefined;
@@ -163,7 +163,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         description?: string | undefined;
         rules?: import("./types").Items<string> | undefined;
         events?: import("./types").Items<string | string[] | undefined> | undefined;
-        enumNames?: string[] | import("./types").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
         accept?: string[] | undefined;
         enforceEnum?: boolean | undefined;

package/lib/Form.d.ts

@@ -26,7 +26,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     getState(forRestore?: boolean): {
         description?: string | undefined;
     } & import("./types/Json").RulesJson & {
-        enumNames?: string[] | import("./types/Json").EnumName[] | undefined;
+        enumNames?: string[] | undefined;
         enum?: any[] | undefined;
     } & {
         accept?: string[] | undefined;

package/lib/Form.js

@@ -179,7 +179,7 @@ class Form extends Container_1.default {
                     };
                 });
                 const fieldChangedAction = new Events_1.FieldChanged(changes, field);
-                this.dispatch(fieldChangedAction);
+                this.notifyDependents(fieldChangedAction);
             }
         });
     }
@@ -244,7 +244,7 @@ class Form extends Container_1.default {
         return null;
     }
     get id() {
-        return '$form';
+        return this._jsonModel.id || '$form';
     }
     get title() {
         return this._jsonModel.title || '';

package/lib/types/Json.d.ts

@@ -7,12 +7,8 @@ export declare type Label = {
     richText?: boolean;
     visible?: boolean;
 };
-export declare type EnumName = {
-    value: string;
-    richText?: boolean;
-};
 declare type TranslationConstraintsJson = {
-    enumNames?: string[] | EnumName[];
+    enumNames?: string[];
     enum?: any[];
 };
 export declare type ConstraintsJson = TranslationConstraintsJson & {

package/lib/utils/TranslationUtils.js

@@ -35,11 +35,6 @@ const addTranslationId = (input, additionalTranslationProps = []) => {
 exports.addTranslationId = addTranslationId;
 const _createTranslationId = (input, path, transProps) => {
     Object.entries(input).forEach(([key, value]) => {
-        if (key === 'enumNames' && value instanceof Array) {
-            value = value.map((x) => {
-                return typeof x === 'string' ? x : x === null || x === void 0 ? void 0 : x.value;
-            });
-        }
         if (typeof value == 'object') {
             if (input instanceof Array) {
                 if (value && 'name' in value) {

package/package.json

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