@aemforms/af-core 0.18.0 → 0.21.0

package/lib/BaseNode.d.ts

@@ -70,11 +70,11 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     /**
      * @private
      */
-    addDependent(action: Action): void;
+    _addDependent(dependent: BaseModel): void;
     /**
      * @private
      */
-    removeDependent(action: Action): void;
+    removeDependent(dependent: BaseModel): void;
     abstract validate(): Array<ValidationError>;
     abstract executeAction(action: Action): any;
     /**

package/lib/BaseNode.js

@@ -216,8 +216,8 @@ class BaseNode {
     /**
      * @private
      */
-    addDependent(action) {
-        if (this._dependents.find(({ node }) => node === action.payload) === undefined) {
+    _addDependent(dependent) {
+        if (this._dependents.find(({ node }) => node === dependent) === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
                 const propsToLook = ['value', 'items'];
@@ -226,17 +226,17 @@ class BaseNode {
                     return propsToLook.indexOf(x.propertyName) > -1;
                 }) > -1;
                 if (isPropChanged) {
-                    action.payload.dispatch(new controller_1.ExecuteRule());
+                    dependent.dispatch(new controller_1.ExecuteRule());
                 }
             });
-            this._dependents.push({ node: action.payload, subscription });
+            this._dependents.push({ node: dependent, subscription });
         }
     }
     /**
      * @private
      */
-    removeDependent(action) {
-        const index = this._dependents.findIndex(({ node }) => node === action.payload);
+    removeDependent(dependent) {
+        const index = this._dependents.findIndex(({ node }) => node === dependent);
         if (index > -1) {
             this._dependents[index].subscription.unsubscribe();
             this._dependents.splice(index, 1);

package/lib/Checkbox.js

@@ -17,7 +17,7 @@ const ValidationUtils_1 = require("./utils/ValidationUtils");
  * @private
  */
 const requiredConstraint = (offValue) => (constraint, value) => {
-    const valid = ValidationUtils_1.Constraints.required(constraint, value) && (!constraint || value != offValue);
+    const valid = ValidationUtils_1.Constraints.required(constraint, value).valid && (!constraint || value != offValue);
     return { valid, value };
 };
 /**

package/lib/Container.js

@@ -250,7 +250,8 @@ class Container extends Scriptable_1.default {
      */
     importData(contextualDataModel) {
         this._bindToDataModel(contextualDataModel);
-        this.syncDataAndFormModel(this.getDataNode());
+        const dataNode = this.getDataNode() || contextualDataModel;
+        this.syncDataAndFormModel(dataNode);
     }
     /**
      * prefill the form with data on the given element

package/lib/controller/EventQueue.d.ts

@@ -11,6 +11,7 @@ import { Logger } from '../Form';
  */
 declare class EventQueue {
     private logger;
+    static readonly MAX_EVENT_CYCLE_COUNT = 10;
     private _runningEventCount;
     private _isProcessing;
     private _pendingEvents;

package/lib/controller/EventQueue.js

@@ -66,7 +66,7 @@ class EventQueue {
             const evntNode = new EventNode(node, e);
             const counter = this._runningEventCount[evntNode.valueOf()] || 0;
             const alreadyExists = this.isQueued(node, e);
-            if (!alreadyExists || counter < 10) {
+            if (!alreadyExists || counter < EventQueue.MAX_EVENT_CYCLE_COUNT) {
                 this.logger.info(`Queued event : ${e.type} node: ${node.id} - ${node.name}`);
                 //console.log(`Event Details ${e.toString()}`)
                 if (priority) {
@@ -78,6 +78,9 @@ class EventQueue {
                 }
                 this._runningEventCount[evntNode.valueOf()] = counter + 1;
             }
+            else {
+                this.logger.info(`Skipped queueing event : ${e.type} node: ${node.id} - ${node.name} with count=${counter}`);
+            }
         });
     }
     runPendingQueue() {
@@ -96,4 +99,5 @@ class EventQueue {
         this._isProcessing = false;
     }
 }
+EventQueue.MAX_EVENT_CYCLE_COUNT = 10;
 exports.default = EventQueue;

package/lib/rules/RuleEngine.js

@@ -10,21 +10,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Controller_1 = require("../controller/Controller");
 const json_formula_1 = require("@adobe/json-formula");
 const FunctionRuntime_1 = __importDefault(require("./FunctionRuntime"));
-/**
- * Implementation of AddDependant event
- * @private
- */
-class AddDependent extends Controller_1.ActionImpl {
-    constructor(payload) {
-        super(payload, 'addDependent');
-    }
-    payloadToJson() {
-        return this.payload.getState();
-    }
-}
 /**
  * Implementation of rule engine
  * @private
@@ -60,7 +47,7 @@ class RuleEngine {
      */
     trackDependency(subscriber) {
         if (this._context && this._context.field !== undefined && this._context.field !== subscriber) {
-            subscriber.dispatch(new AddDependent(this._context.field));
+            subscriber._addDependent(this._context.field);
         }
     }
 }

package/lib/types/Model.d.ts

@@ -208,6 +208,10 @@ export interface BaseModel extends ConstraintsJson, WithController {
      * @private
      */
     _initialize(): any;
+    /**
+     * @private
+     */
+    _addDependent(dependent: BaseModel): any;
 }
 /**
  * Generic field model interface.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.18.0",
+  "version": "0.21.0",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",