@player-ui/data-change-listener-plugin 0.4.0 → 0.4.1-next.1

package/dist/index.cjs.js

@@ -2,18 +2,38 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var player = require('@player-ui/player');
+
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 const LISTENER_TYPES = {
   dataChange: "dataChange."
 };
 const WILDCARD_REGEX = /\._\.|\._$/;
-function replaceExpressionIndexes(exp, indexes) {
+function replaceExpressionIndexes(expression, indexes) {
   if (indexes.length === 0) {
-    return exp;
+    return expression;
   }
-  if (typeof exp === "object" && exp !== null) {
-    return Object.values(exp).map((subExp) => replaceExpressionIndexes(subExp, indexes));
+  if (player.isExpressionNode(expression)) {
+    return expression;
   }
-  let workingExp = String(exp);
+  if (Array.isArray(expression)) {
+    return expression.map((subExp) => replaceExpressionIndexes(subExp, indexes));
+  }
+  let workingExp = String(expression);
   for (let replacementIndex = 0; replacementIndex < indexes.length; replacementIndex += 1) {
     const regex = new RegExp(`_index${replacementIndex === 0 ? "" : replacementIndex.toString()}_`, "g");
     workingExp = workingExp.replace(regex, indexes[replacementIndex].toString());
@@ -99,7 +119,12 @@ class DataChangeListenerPlugin {
       const { silent = false } = options || {};
       if (silent)
         return;
-      onFieldUpdateHandler(updates.map((t) => t.binding));
+      const validUpdates = updates.filter((update) => {
+        var _a;
+        const committedVal = (_a = options == null ? void 0 : options.context) == null ? void 0 : _a.model.get(update.binding);
+        return committedVal === update.newValue;
+      });
+      onFieldUpdateHandler(validUpdates.map((t) => t.binding));
     }));
     const resolveViewInterceptor = {
       call: (view) => {
@@ -112,6 +137,10 @@ class DataChangeListenerPlugin {
     };
     player.hooks.viewController.tap(this.name, (viewController) => {
       viewController.hooks.resolveView.intercept(resolveViewInterceptor);
+      viewController.hooks.resolveView.tap(this.name, (view) => {
+        const _a = view, withoutListeners = __objRest(_a, ["listeners"]);
+        return withoutListeners;
+      });
     });
     player.hooks.flowController.tap(this.name, (flowController) => {
       flowController.hooks.flow.tap(this.name, (flow) => {

package/dist/index.esm.js

@@ -1,15 +1,35 @@
+import { isExpressionNode } from '@player-ui/player';
+
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 const LISTENER_TYPES = {
   dataChange: "dataChange."
 };
 const WILDCARD_REGEX = /\._\.|\._$/;
-function replaceExpressionIndexes(exp, indexes) {
+function replaceExpressionIndexes(expression, indexes) {
   if (indexes.length === 0) {
-    return exp;
+    return expression;
   }
-  if (typeof exp === "object" && exp !== null) {
-    return Object.values(exp).map((subExp) => replaceExpressionIndexes(subExp, indexes));
+  if (isExpressionNode(expression)) {
+    return expression;
   }
-  let workingExp = String(exp);
+  if (Array.isArray(expression)) {
+    return expression.map((subExp) => replaceExpressionIndexes(subExp, indexes));
+  }
+  let workingExp = String(expression);
   for (let replacementIndex = 0; replacementIndex < indexes.length; replacementIndex += 1) {
     const regex = new RegExp(`_index${replacementIndex === 0 ? "" : replacementIndex.toString()}_`, "g");
     workingExp = workingExp.replace(regex, indexes[replacementIndex].toString());
@@ -95,7 +115,12 @@ class DataChangeListenerPlugin {
       const { silent = false } = options || {};
       if (silent)
         return;
-      onFieldUpdateHandler(updates.map((t) => t.binding));
+      const validUpdates = updates.filter((update) => {
+        var _a;
+        const committedVal = (_a = options == null ? void 0 : options.context) == null ? void 0 : _a.model.get(update.binding);
+        return committedVal === update.newValue;
+      });
+      onFieldUpdateHandler(validUpdates.map((t) => t.binding));
     }));
     const resolveViewInterceptor = {
       call: (view) => {
@@ -108,6 +133,10 @@ class DataChangeListenerPlugin {
     };
     player.hooks.viewController.tap(this.name, (viewController) => {
       viewController.hooks.resolveView.intercept(resolveViewInterceptor);
+      viewController.hooks.resolveView.tap(this.name, (view) => {
+        const _a = view, withoutListeners = __objRest(_a, ["listeners"]);
+        return withoutListeners;
+      });
     });
     player.hooks.flowController.tap(this.name, (flowController) => {
       flowController.hooks.flow.tap(this.name, (flow) => {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@player-ui/data-change-listener-plugin",
-  "version": "0.4.0",
+  "version": "0.4.1-next.1",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "@player-ui/player": "0.4.0"
+    "@player-ui/player": "0.4.1-next.1"
   },
   "dependencies": {
     "@babel/runtime": "7.15.4"
@@ -52,6 +52,14 @@
     {
       "name": "Kelly Harrop",
       "url": "https://github.com/kharrop"
+    },
+    {
+      "name": "Alejandro Fimbres",
+      "url": "https://github.com/lexfm"
+    },
+    {
+      "name": "Rafael Campos",
+      "url": "https://github.com/rafbcampos"
     }
   ]
 }

package/src/index.ts

@@ -9,6 +9,7 @@ import type {
   BindingInstance,
   BindingParser,
 } from '@player-ui/player';
+import { isExpressionNode } from '@player-ui/player';
 
 const LISTENER_TYPES = {
   dataChange: 'dataChange.',
@@ -35,20 +36,24 @@ export type ViewListenerHandler = (
 
 /** Sub out any _index_ refs with the ones from the supplied list */
 function replaceExpressionIndexes(
-  exp: ExpressionType,
+  expression: ExpressionType,
   indexes: Array<string | number>
 ): ExpressionType {
   if (indexes.length === 0) {
-    return exp;
+    return expression;
   }
 
-  if (typeof exp === 'object' && exp !== null) {
-    return Object.values(exp).map((subExp) =>
+  if (isExpressionNode(expression)) {
+    return expression;
+  }
+
+  if (Array.isArray(expression)) {
+    return expression.map((subExp) =>
       replaceExpressionIndexes(subExp, indexes)
-    );
+    ) as any;
   }
 
-  let workingExp = String(exp);
+  let workingExp = String(expression);
 
   for (
     let replacementIndex = 0;
@@ -230,7 +235,11 @@ export class DataChangeListenerPlugin implements PlayerPlugin {
       dc.hooks.onUpdate.tap(this.name, (updates, options) => {
         const { silent = false } = options || {};
         if (silent) return;
-        onFieldUpdateHandler(updates.map((t) => t.binding));
+        const validUpdates = updates.filter((update) => {
+          const committedVal = options?.context?.model.get(update.binding);
+          return committedVal === update.newValue;
+        });
+        onFieldUpdateHandler(validUpdates.map((t) => t.binding));
       })
     );
 
@@ -261,6 +270,12 @@ export class DataChangeListenerPlugin implements PlayerPlugin {
       this.name,
       (viewController: ViewController) => {
         viewController.hooks.resolveView.intercept(resolveViewInterceptor);
+
+        // remove listeners after extracting so that it does not get triggered in subsequent view updates
+        viewController.hooks.resolveView.tap(this.name, (view) => {
+          const { listeners, ...withoutListeners } = view as any;
+          return withoutListeners;
+        });
       }
     );