pepka 1.9.1 → 1.9.3

package/dist/bundle.cjs

@@ -96,22 +96,33 @@ const isStr = (s) => (to(s) === 'string');
 const isObj = (s) => (!isNull(s) && to(s) === 'object');
 const isNil = (s) => (isNull(s) || isUndef(s));
 class QPromise extends Promise {
+    oncancel;
     ff;
     rj;
+    _cancel_data;
     cancel(resolve = false) {
         if (resolve)
             this.ff();
         else {
-            this.catch(noop);
+            super.catch(noop);
             this.rj('canceled');
+            this.oncancel(this._cancel_data);
         }
     }
-    constructor(fn) {
+    constructor(fn, oncancel = noop) {
+        let _ff, _rj, _cancel_data;
         super((ff, rj) => {
-            this.ff = ff;
-            this.rj = rj;
-            return fn(ff, rj);
+            _ff = ff;
+            _rj = rj;
+            _cancel_data = fn(ff, rj);
         });
+        this.oncancel = oncancel;
+        const set_cb = () => { this.ff = _ff; this.rj = _rj; this._cancel_data = _cancel_data; };
+        // @ts-ignore-next
+        if (!isUndef(_ff) || !isUndef(_rj))
+            set_cb();
+        else
+            setTimeout(set_cb);
     }
 }
 
@@ -785,7 +796,7 @@ const throttle = (time, fn) => {
         return res;
     };
 };
-const wait = (time) => new QPromise((ff) => setTimeout(ff, time));
+const wait = (time) => new QPromise((ff) => setTimeout(ff, time), (timeout) => clearTimeout(timeout));
 
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);

package/dist/bundle.d.ts

@@ -240,13 +240,16 @@ export declare const qpush: {
 };
 export declare const isNil: <T extends any>(s: T) => T extends (null | undefined) ? true : false;
 export declare class QPromise<T> extends Promise<T> {
+	private oncancel;
 	private ff;
 	private rj;
+	private _cancel_data;
 	cancel(resolve?: boolean): void;
 	constructor(fn: AnyFunc<any, [
 		AnyFunc,
-		AnyFunc
-	]>);
+		AnyFunc,
+		AnyFunc?
+	]>, oncancel?: (...args: any[]) => any);
 }
 export declare const take: (argN: number) => (...args: any[]) => any;
 export declare const ifElse: (...args: AnyArgs) => any;

package/dist/bundle.mjs

@@ -94,22 +94,33 @@ const isStr = (s) => (to(s) === 'string');
 const isObj = (s) => (!isNull(s) && to(s) === 'object');
 const isNil = (s) => (isNull(s) || isUndef(s));
 class QPromise extends Promise {
+    oncancel;
     ff;
     rj;
+    _cancel_data;
     cancel(resolve = false) {
         if (resolve)
             this.ff();
         else {
-            this.catch(noop);
+            super.catch(noop);
             this.rj('canceled');
+            this.oncancel(this._cancel_data);
         }
     }
-    constructor(fn) {
+    constructor(fn, oncancel = noop) {
+        let _ff, _rj, _cancel_data;
         super((ff, rj) => {
-            this.ff = ff;
-            this.rj = rj;
-            return fn(ff, rj);
+            _ff = ff;
+            _rj = rj;
+            _cancel_data = fn(ff, rj);
         });
+        this.oncancel = oncancel;
+        const set_cb = () => { this.ff = _ff; this.rj = _rj; this._cancel_data = _cancel_data; };
+        // @ts-ignore-next
+        if (!isUndef(_ff) || !isUndef(_rj))
+            set_cb();
+        else
+            setTimeout(set_cb);
     }
 }
 
@@ -783,7 +794,7 @@ const throttle = (time, fn) => {
         return res;
     };
 };
-const wait = (time) => new QPromise((ff) => setTimeout(ff, time));
+const wait = (time) => new QPromise((ff) => setTimeout(ff, time), (timeout) => clearTimeout(timeout));
 
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);

package/package.json

@@ -41,7 +41,7 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.9.1",
+  "version": "1.9.3",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/timers.ts

@@ -26,4 +26,7 @@ export const throttle = <T extends AnyFunc>(time: number, fn: T) => {
     return res
   }
 }
-export const wait = (time: number) => new QPromise<any>((ff) => setTimeout(ff, time))
+export const wait = (time: number) => new QPromise<any>(
+  (ff) => setTimeout(ff, time),
+  (timeout: any) => clearTimeout(timeout)
+)

package/src/utils.ts

@@ -19,17 +19,24 @@ export const isNil = <T extends any>(s: T) => (isNull(s) || isUndef(s)) as T ext
 export class QPromise<T> extends Promise<T> {
   private ff: AnyFunc
   private rj: AnyFunc
+  private _cancel_data: any
   public cancel(resolve = false) {
     if(resolve) this.ff()
     else {
-      this.catch(noop)
+      super.catch(noop)
       this.rj('canceled')
+      this.oncancel(this._cancel_data)
     }
   }
-  constructor(fn: AnyFunc<any, [AnyFunc, AnyFunc]>) {
+  constructor(fn: AnyFunc<any, [AnyFunc, AnyFunc, AnyFunc?]>, private oncancel = noop) {
+    let _ff: AnyFunc, _rj: AnyFunc, _cancel_data: any
     super((ff, rj) => {
-      this.ff=ff; this.rj = rj
-      return fn(ff, rj)
+      _ff=ff; _rj=rj
+      _cancel_data = fn(ff, rj)
     })
+    const set_cb = () => {this.ff=_ff; this.rj=_rj; this._cancel_data=_cancel_data}
+    // @ts-ignore-next
+    if(!isUndef(_ff) || !isUndef(_rj)) set_cb()
+    else setTimeout(set_cb)
   }
 }