pepka 1.9.3 → 1.9.4

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.3",
+  "version": "1.9.4",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",

package/src/utils.ts

@@ -4,6 +4,7 @@ import { AnyFunc, AnyObject } from "./types"
 export const undef = undefined
 export const nul = null
 export const inf = Infinity
+export const not_assigned = Symbol()
 export const to = (s: any) => typeof s
 export const isNull = <T extends any>(s: T) => (s===nul) as T extends null ? true : false
 export const isUndef = <T extends any>(s: T) => (s===undef) as T extends undefined ? true : false
@@ -18,25 +19,19 @@ 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 {
-      super.catch(noop)
-      this.rj('canceled')
-      this.oncancel(this._cancel_data)
-    }
+    this.oncancel(this._cancel_data)
   }
   constructor(fn: AnyFunc<any, [AnyFunc, AnyFunc, AnyFunc?]>, private oncancel = noop) {
-    let _ff: AnyFunc, _rj: AnyFunc, _cancel_data: any
+    let _cancel_data: any = not_assigned
     super((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}
+    const set_cb = () => this._cancel_data=_cancel_data
     // @ts-ignore-next
-    if(!isUndef(_ff) || !isUndef(_rj)) set_cb()
+    if(_cancel_data!==not_assigned) set_cb()
     else setTimeout(set_cb)
   }
 }