@aemforms/af-core 0.22.76 → 0.22.78

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 || '';
@@ -3898,12 +3898,15 @@ class Field extends Scriptable {
     }
     triggerValidationEvent(changes) {
         if (changes.validity) {
-            if (this.validity.valid) {
-                this.dispatch(new Valid());
-            }
-            else {
-                this.dispatch(new Invalid());
-            }
+            this.#triggerValidationEvent();
+        }
+    }
+    #triggerValidationEvent() {
+        if (this.validity.valid) {
+            this.dispatch(new Valid());
+        }
+        else {
+            this.dispatch(new Invalid());
         }
     }
     validate() {
@@ -3911,8 +3914,8 @@ class Field extends Scriptable {
             return [];
         }
         const changes = this.evaluateConstraints();
+        this.#triggerValidationEvent();
         if (changes.validity) {
-            this.triggerValidationEvent(changes);
             this.notifyDependents(new Change({ changes: Object.values(changes) }));
         }
         return this.valid ? [] : [new ValidationError(this.id, [this._jsonModel.errorMessage])];

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

@@ -3,6 +3,7 @@ import Scriptable from './Scriptable';
 import DataValue from './data/DataValue';
 import DataGroup from './data/DataGroup';
 declare class Field extends Scriptable<FieldJson> implements FieldModel {
+    #private;
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
@@ -40,8 +41,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 +164,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

@@ -3,6 +3,7 @@ import Scriptable from './Scriptable';
 import DataValue from './data/DataValue';
 import DataGroup from './data/DataGroup';
 declare class Field extends Scriptable<FieldJson> implements FieldModel {
+    #private;
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
@@ -40,8 +41,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 +164,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/Field.js

@@ -5,9 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+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 _Field_instances, _Field_triggerValidationEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
 const ValidationUtils_1 = require("./utils/ValidationUtils");
@@ -23,6 +29,7 @@ const validTypes = ['string', 'number', 'integer', 'boolean', 'file', 'string[]'
 class Field extends Scriptable_1.default {
     constructor(params, _options) {
         super(params, _options);
+        _Field_instances.add(this);
         this._ruleNodeReference = [];
         if (_options.mode !== 'restore') {
             this._applyDefaults();
@@ -642,12 +649,7 @@ class Field extends Scriptable_1.default {
     }
     triggerValidationEvent(changes) {
         if (changes.validity) {
-            if (this.validity.valid) {
-                this.dispatch(new Events_1.Valid());
-            }
-            else {
-                this.dispatch(new Events_1.Invalid());
-            }
+            __classPrivateFieldGet(this, _Field_instances, "m", _Field_triggerValidationEvent).call(this);
         }
     }
     validate() {
@@ -655,8 +657,8 @@ class Field extends Scriptable_1.default {
             return [];
         }
         const changes = this.evaluateConstraints();
+        __classPrivateFieldGet(this, _Field_instances, "m", _Field_triggerValidationEvent).call(this);
         if (changes.validity) {
-            this.triggerValidationEvent(changes);
             this.notifyDependents(new Events_1.Change({ changes: Object.values(changes) }));
         }
         return this.valid ? [] : [new types_1.ValidationError(this.id, [this._jsonModel.errorMessage])];
@@ -692,6 +694,14 @@ class Field extends Scriptable_1.default {
         }
     }
 }
+_Field_instances = new WeakSet(), _Field_triggerValidationEvent = function _Field_triggerValidationEvent() {
+    if (this.validity.valid) {
+        this.dispatch(new Events_1.Valid());
+    }
+    else {
+        this.dispatch(new Events_1.Invalid());
+    }
+};
 __decorate([
     (0, BaseNode_1.dependencyTracked)(),
     (0, BaseNode_1.exclude)('button', 'image', 'plain-text')

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.78",
   "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.78"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",