Store a boolean instead of a string to flag if trailing

jupyterlab · Jul 21, 2022 · e1782ff · e1782ff
1 parent 6e42c14
commit e1782ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/polling/src/index.ts b/packages/polling/src/index.ts
@@ -162,6 +162,7 @@ export namespace IPoll {
  *
  * @typeparam V - Arguments for the underlying function. Defaults to any[].
  */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface IRateLimiter<T = any, U = any, V extends any[] = any[]>
   extends IDisposable {
   /**

diff --git a/packages/polling/src/ratelimiter.ts b/packages/polling/src/ratelimiter.ts
@@ -164,29 +164,28 @@ export class Throttler<
     options?: Throttler.IOptions | number
   ) {
     super(fn, typeof options === 'number' ? options : options && options.limit);
-    if (typeof options !== 'number') {
-      options = options || {};
-      this._edge = 'edge' in options ? options.edge! : this._edge;
+    if (typeof options !== 'number' && options && options.edge === 'trailing') {
+      this._trailing = true;
     }
-    this._interval = this._edge === 'trailing' ? this.limit : Poll.IMMEDIATE;
+    this._interval = this._trailing ? this.limit : Poll.IMMEDIATE;
   }
 
   /**
    * Throttles function invocations if one is currently in flight.
    */
   invoke(...args: V): Promise<T> {
-    if (this._edge === 'trailing') {
+    const idle = this.poll.state.phase !== 'invoked';
+    if (idle || this._trailing) {
       this.args = args;
     }
-    if (this.poll.state.phase !== 'invoked') {
-      this.args = args;
+    if (idle) {
       void this.poll.schedule({ interval: this._interval, phase: 'invoked' });
     }
     return this.payload!.promise;
   }
 
-  private _edge: 'leading' | 'trailing' = 'leading';
   private _interval: number;
+  private _trailing = false;
 }
 
 /**