@deephaven/mocks 0.24.1-beta.3 → 0.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/mocks",
-  "version": "0.24.1-beta.3+c65f268",
+  "version": "0.25.0",
   "description": "Deephaven Mocks for common libraries",
   "repository": {
     "type": "git",
@@ -17,5 +17,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c65f268e3b426948dc3569d1c393eb18c3b14cf4"
+  "gitHead": "e8da34e9b99e4af6c485c4f714ae1dcd02a97e95"
 }

package/src/lodash.debounce.js

@@ -1,8 +1,9 @@
 // lodash debounce needs mocking: https://github.com/facebook/jest/issues/3465#issuecomment-539496798
 
-const debounce = jest.fn().mockImplementation((callback, delay) => {
+const debounce = jest.fn((callback, delay) => {
   let timer = null;
   let pendingArgs = null;
+  let lastThis = this;
 
   const cancel = jest.fn(() => {
     if (timer) {
@@ -14,17 +15,18 @@ const debounce = jest.fn().mockImplementation((callback, delay) => {
 
   const flush = jest.fn(() => {
     if (timer) {
-      callback(...pendingArgs);
+      callback.apply(lastThis, pendingArgs);
       cancel();
     }
   });
 
-  const wrapped = (...args) => {
+  function wrapped(...args) {
     cancel();
 
+    lastThis = this;
     pendingArgs = args;
     timer = setTimeout(flush, wrapped.delay);
-  };
+  }
 
   wrapped.cancel = cancel;
   wrapped.flush = flush;

package/src/lodash.throttle.js

@@ -1,52 +1,52 @@
-const throttle = jest
-  .fn()
-  .mockImplementation((callback, delay = 0, options = {}) => {
-    const { leading = true, trailing = true } = options;
-    let timer = null;
-    let pendingArgs = null;
-    let pendingCall = false;
-
-    const cancel = jest.fn(() => {
-      if (timer) {
-        clearTimeout(timer);
-      }
-      timer = null;
-      pendingArgs = null;
-      pendingCall = false;
-    });
-
-    const flush = jest.fn(() => {
-      if (timer && trailing && pendingCall) {
-        callback(...pendingArgs);
-      }
-      cancel();
-    });
-
-    const throttled = (...args) => {
-      // Calling throttled function during the delay period
-      if (timer) {
-        pendingCall = true;
-        pendingArgs = args;
-        return;
-      }
-
-      // Called outside of a throttle delay
-      if (leading) {
-        pendingCall = false;
-        callback(...args);
-      } else {
-        pendingCall = true;
-      }
+const throttle = jest.fn((callback, delay = 0, options = {}) => {
+  const { leading = true, trailing = true } = options;
+  let timer = null;
+  let pendingArgs = null;
+  let pendingCall = false;
+  let lastThis = this;
+
+  const cancel = jest.fn(() => {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = null;
+    pendingArgs = null;
+    pendingCall = false;
+  });
+
+  const flush = jest.fn(() => {
+    if (timer && trailing && pendingCall) {
+      callback.apply(lastThis, pendingArgs);
+    }
+    cancel();
+  });
 
+  function throttled(...args) {
+    lastThis = this;
+    // Calling throttled function during the delay period
+    if (timer) {
+      pendingCall = true;
       pendingArgs = args;
-      timer = setTimeout(flush, throttled.delay);
-    };
+      return;
+    }
 
-    throttled.cancel = cancel;
-    throttled.flush = flush;
-    throttled.delay = delay;
+    // Called outside of a throttle delay
+    if (leading) {
+      pendingCall = false;
+      callback(...args);
+    } else {
+      pendingCall = true;
+    }
 
-    return throttled;
-  });
+    pendingArgs = args;
+    timer = setTimeout(flush, throttled.delay);
+  }
+
+  throttled.cancel = cancel;
+  throttled.flush = flush;
+  throttled.delay = delay;
+
+  return throttled;
+});
 
 export default throttle;