@wdio/utils 9.31.2 → 9.31.6

package/build/index.js

@@ -379,23 +379,100 @@ function WebDriver(options, modifier, propertiesObject = {}) {
   const prototype = Object.create(scopeType.prototype);
   const log4 = logger("webdriver");
   const mittInstance = mitt();
+  const dialogListeners = [];
+  const emitDialogListenerTransition = (previousCount) => {
+    if (previousCount === 0 && dialogListeners.length > 0) {
+      mittInstance.emit("_dialogListenerRegistered");
+    } else if (previousCount > 0 && dialogListeners.length === 0) {
+      mittInstance.emit("_dialogListenerRemoved");
+    }
+  };
+  const addDialogListener = (listener, registered = listener) => {
+    const previousCount = dialogListeners.length;
+    mittInstance.on("dialog", registered);
+    dialogListeners.push({ listener, registered });
+    emitDialogListenerTransition(previousCount);
+  };
+  const removeDialogListener = (listener, registered) => {
+    const previousCount = dialogListeners.length;
+    let index = -1;
+    for (let i = dialogListeners.length - 1; i >= 0; i--) {
+      const entry2 = dialogListeners[i];
+      if (registered ? entry2.registered === registered : entry2.listener === listener) {
+        index = i;
+        break;
+      }
+    }
+    if (index === -1) {
+      return;
+    }
+    const [entry] = dialogListeners.splice(index, 1);
+    mittInstance.off("dialog", entry.registered);
+    emitDialogListenerTransition(previousCount);
+  };
+  const removeAllDialogListeners = () => {
+    const previousCount = dialogListeners.length;
+    mittInstance.off("dialog");
+    dialogListeners.length = 0;
+    emitDialogListenerTransition(previousCount);
+  };
   const eventHandler = {
-    on: mittInstance.on.bind(mittInstance),
-    off: mittInstance.off.bind(mittInstance),
+    on: (type, handler) => {
+      if (type === "dialog") {
+        addDialogListener(handler);
+      } else {
+        mittInstance.on(type, handler);
+      }
+    },
+    off: (type, handler) => {
+      if (type === "dialog") {
+        if (handler) {
+          removeDialogListener(handler);
+        } else {
+          removeAllDialogListeners();
+        }
+      } else {
+        mittInstance.off(type, handler);
+      }
+    },
     emit: mittInstance.emit.bind(mittInstance),
     once: (type, handler) => {
-      const onceWrapper = (...args) => {
-        mittInstance.off(type, onceWrapper);
-        handler(...args);
+      const onceWrapper = (event) => {
+        if (type === "dialog") {
+          removeDialogListener(handler, onceWrapper);
+        } else {
+          mittInstance.off(type, onceWrapper);
+        }
+        handler(event);
       };
-      mittInstance.on(type, onceWrapper);
+      if (type === "dialog") {
+        addDialogListener(handler, onceWrapper);
+      } else {
+        mittInstance.on(type, onceWrapper);
+      }
+    },
+    removeListener: (type, handler) => {
+      if (type === "dialog") {
+        if (handler) {
+          removeDialogListener(handler);
+        } else {
+          removeAllDialogListeners();
+        }
+      } else {
+        mittInstance.off(type, handler);
+      }
     },
-    removeListener: mittInstance.off.bind(mittInstance),
     removeAllListeners: (type) => {
-      if (type) {
+      if (type === "dialog") {
+        removeAllDialogListeners();
+      } else if (type) {
         mittInstance.off(type);
       } else {
-        Object.assign(mittInstance, mitt());
+        const previousCount = dialogListeners.length;
+        mittInstance.off("dialog");
+        dialogListeners.length = 0;
+        emitDialogListenerTransition(previousCount);
+        mittInstance.all.clear();
       }
     }
   };
@@ -519,12 +596,6 @@ function WebDriver(options, modifier, propertiesObject = {}) {
   };
   for (const eventCommand of EVENTHANDLER_FUNCTIONS) {
     prototype[eventCommand] = function(...args) {
-      if (eventCommand === "on" && args[0] === "dialog") {
-        eventHandler.emit("_dialogListenerRegistered");
-      }
-      if (eventCommand === "off" && args[0] === "dialog") {
-        eventHandler.emit("_dialogListenerRemoved");
-      }
       switch (eventCommand) {
         case "on":
           eventHandler.on(args[0], args[1]);
@@ -930,8 +1001,7 @@ var ELEMENT_QUERY_COMMANDS = [
   "nextElement",
   "previousElement",
   "parentElement",
-  "unstable_select",
-  "unstable_filter"
+  "unstable_select"
 ];
 var ELEMENT_PROPS = [
   "elementId",

package/build/monad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monad.d.ts","sourceRoot":"","sources":["../src/monad.ts"],"names":[],"mappings":"AAiBA,UAAU,gBAAgB;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,kBAAkB,CAAA;CAC7C;AA8BD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,gBAAgB,GAAE,gBAAqB;WAwCvF,IAAI,aAAa,MAAM,mBAAmB,QAAQ,wCAAwC,MAAM,EAAE;eA6J1F,MAAM,QAAQ,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAAgB,QAAQ;EA8FzG"}
+{"version":3,"file":"monad.d.ts","sourceRoot":"","sources":["../src/monad.ts"],"names":[],"mappings":"AAiBA,UAAU,gBAAgB;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,kBAAkB,CAAA;CAC7C;AA8BD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,gBAAgB,GAAE,gBAAqB;WA8HvF,IAAI,aAAa,MAAM,mBAAmB,QAAQ,wCAAwC,MAAM,EAAE;eA6J1F,MAAM,QAAQ,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAAgB,QAAQ;EAiFzG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "9.31.2",
+  "version": "9.31.6",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -41,7 +41,7 @@
     "@wdio/logger": "9.29.1",
     "@wdio/types": "9.31.2",
     "decamelize": "^6.0.0",
-    "deepmerge-ts": "^7.0.3",
+    "deepmerge-ts": "^8.0.0",
     "edgedriver": "^6.1.2",
     "geckodriver": "^6.1.1",
     "get-port": "^7.0.0",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "514d1ea03df245adc0a2c193f74476738210f041"
+  "gitHead": "b18898e3c339a2bba3a6c5af46bdf0f4f897cad8"
 }