pepka 1.9.4 → 1.10.0

package/dist/bundle.cjs

@@ -86,6 +86,7 @@ const startsWithWith = (comparator) => curry2((start, s) => {
 const undef = undefined;
 const nul = null;
 const inf = Infinity;
+const not_assigned = Symbol();
 const to = (s) => typeof s;
 const isNull = (s) => (s === nul);
 const isUndef = (s) => (s === undef);
@@ -95,37 +96,30 @@ function isFunc(s) { return to(s) === 'function'; }
 const isStr = (s) => (to(s) === 'string');
 const isObj = (s) => (!isNull(s) && to(s) === 'object');
 const isNil = (s) => (isNull(s) || isUndef(s));
+// TODO: add .then(), .finally() and .catch() to return QPromise.
 class QPromise extends Promise {
     oncancel;
     ff;
-    rj;
     _cancel_data;
     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, oncancel = noop) {
-        let _ff, _rj, _cancel_data;
-        super((ff, rj) => {
-            _ff = ff;
-            _rj = rj;
-            _cancel_data = fn(ff, rj);
-        });
+        let _cancel_data = not_assigned;
+        super((ff, rj) => _cancel_data = fn(ff, rj));
         this.oncancel = oncancel;
-        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))
+        if (_cancel_data !== not_assigned)
             set_cb();
         else
             setTimeout(set_cb);
     }
 }
 
+const { isNaN } = Number;
 // It's faster that toUpperCase() !
 const caseMap = { u: 'U', b: 'B', n: 'N', s: 'S', f: 'F', o: 'O' };
 const symbol = Symbol();
@@ -136,7 +130,8 @@ const type = (s) => {
     const t = to(s);
     return t === 'object'
         ? isNull(s) ? 'Null' : (s.constructor?.name || cap_type(t))
-        : cap_type(t);
+        : t === 'number' && isNaN(s) ? 'NaN'
+            : cap_type(t);
 };
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);

package/dist/bundle.d.ts

@@ -242,7 +242,6 @@ export declare const isNil: <T extends any>(s: T) => T extends (null | undefined
 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, [

package/dist/bundle.mjs

@@ -84,6 +84,7 @@ const startsWithWith = (comparator) => curry2((start, s) => {
 const undef = undefined;
 const nul = null;
 const inf = Infinity;
+const not_assigned = Symbol();
 const to = (s) => typeof s;
 const isNull = (s) => (s === nul);
 const isUndef = (s) => (s === undef);
@@ -93,37 +94,30 @@ function isFunc(s) { return to(s) === 'function'; }
 const isStr = (s) => (to(s) === 'string');
 const isObj = (s) => (!isNull(s) && to(s) === 'object');
 const isNil = (s) => (isNull(s) || isUndef(s));
+// TODO: add .then(), .finally() and .catch() to return QPromise.
 class QPromise extends Promise {
     oncancel;
     ff;
-    rj;
     _cancel_data;
     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, oncancel = noop) {
-        let _ff, _rj, _cancel_data;
-        super((ff, rj) => {
-            _ff = ff;
-            _rj = rj;
-            _cancel_data = fn(ff, rj);
-        });
+        let _cancel_data = not_assigned;
+        super((ff, rj) => _cancel_data = fn(ff, rj));
         this.oncancel = oncancel;
-        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))
+        if (_cancel_data !== not_assigned)
             set_cb();
         else
             setTimeout(set_cb);
     }
 }
 
+const { isNaN } = Number;
 // It's faster that toUpperCase() !
 const caseMap = { u: 'U', b: 'B', n: 'N', s: 'S', f: 'F', o: 'O' };
 const symbol = Symbol();
@@ -134,7 +128,8 @@ const type = (s) => {
     const t = to(s);
     return t === 'object'
         ? isNull(s) ? 'Null' : (s.constructor?.name || cap_type(t))
-        : cap_type(t);
+        : t === 'number' && isNaN(s) ? 'NaN'
+            : cap_type(t);
 };
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);

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

package/src/common.ts

@@ -1,6 +1,7 @@
 import { curry2 } from "./curry"
 import { is_typed_arr } from "./internal"
 import { isNull, isStr, to } from "./utils"
+const {isNaN} = Number
 
 // It's faster that toUpperCase() !
 const caseMap = { u: 'U', b: 'B', n: 'N', s: 'S', f: 'F', o: 'O' }
@@ -13,6 +14,7 @@ export const type = (s: any): string => {
   const t = to(s)
   return t==='object'
     ? isNull(s) ? 'Null' : (s.constructor?.name||cap_type(t))
+    : t==='number'&&isNaN(s) ? 'NaN'
     : cap_type(t)
 }
 export const typeIs = curry2((t: string, s: any) => type(s)===t)

package/src/utils.ts

@@ -17,6 +17,7 @@ export const isStr = <T extends any>(s: T) => (to(s)==='string') as T extends st
 export const isObj = <T extends any>(s: T) => (!isNull(s) && to(s)==='object') as T extends AnyObject ? true : false
 export const isNil = <T extends any>(s: T) => (isNull(s) || isUndef(s)) as T extends (null|undefined) ? true : false
 
+// TODO: add .then(), .finally() and .catch() to return QPromise.
 export class QPromise<T> extends Promise<T> {
   private ff: AnyFunc
   private _cancel_data: any
@@ -26,9 +27,7 @@ export class QPromise<T> extends Promise<T> {
   }
   constructor(fn: AnyFunc<any, [AnyFunc, AnyFunc, AnyFunc?]>, private oncancel = noop) {
     let _cancel_data: any = not_assigned
-    super((ff, rj) => {
-      _cancel_data = fn(ff, rj)
-    })
+    super((ff, rj) => _cancel_data = fn(ff, rj))
     const set_cb = () => this._cancel_data=_cancel_data
     // @ts-ignore-next
     if(_cancel_data!==not_assigned) set_cb()