pepka 1.12.1 → 1.12.2

package/dist/bundle.cjs

@@ -102,15 +102,21 @@ const isSafe = (prop) => !(prop in unsafe_props);
 class QPromise extends Promise {
     oncancel;
     ff;
+    rj;
     _cancel_data;
     cancel(resolve = false) {
         if (resolve)
-            this.ff();
+            this.ff?.();
+        else
+            this.rj?.();
         this.oncancel(this._cancel_data);
     }
     constructor(fn, oncancel = noop) {
         let _cancel_data = not_assigned;
-        super((ff, rj) => _cancel_data = fn(ff, rj));
+        super((ff, rj) => {
+            _cancel_data = fn(ff, rj);
+            setTimeout(() => { this.ff = ff; this.rj = rj; });
+        });
         this.oncancel = oncancel;
         const set_cb = () => this._cancel_data = _cancel_data;
         // @ts-ignore-next
@@ -208,7 +214,7 @@ const qmergeDeepX = mergeDeep$1(2);
 const qmergeDeepAdd = mergeDeep$1(3);
 /** @param o1 <- o2 */
 const qmergeShallow = curry2((o1, o2) => Object.assign(o1, o2));
-/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
+/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } removes a key when null. */
 const qmapKeys = curry2((keyMap, o) => {
     let k, mapped, newKey, newValue, swap = {}, inswap;
     for (k in keyMap)
@@ -646,7 +652,7 @@ const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
  * @param data any
  * @returns data with prop over pipe.
 */
-const overProp = curry3((prop, pipe, data) => (prop in data) && assoc(prop, pipe(data[prop]), data));
+const overProp = curry3((prop, pipe, data) => prop in data ? assoc(prop, pipe(data[prop]), data) : data);
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, assign({}, o)));
 const zip = curry2((a, b) => map((s, i) => [s, b[i]], a));

package/dist/bundle.d.ts

@@ -144,7 +144,7 @@ export declare const qmergeShallow: {
 	(a: AnyObject): (b: AnyObject) => AnyObject;
 	(a: AnyObject, b: AnyObject): AnyObject;
 };
-/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
+/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } removes a key when null. */
 export declare const qmapKeys: {
 	(a: Placeholder, b: AnyObject): (a: {
 		[oldKey: string]: string | AnyFunc;
@@ -242,6 +242,7 @@ 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

@@ -100,15 +100,21 @@ const isSafe = (prop) => !(prop in unsafe_props);
 class QPromise extends Promise {
     oncancel;
     ff;
+    rj;
     _cancel_data;
     cancel(resolve = false) {
         if (resolve)
-            this.ff();
+            this.ff?.();
+        else
+            this.rj?.();
         this.oncancel(this._cancel_data);
     }
     constructor(fn, oncancel = noop) {
         let _cancel_data = not_assigned;
-        super((ff, rj) => _cancel_data = fn(ff, rj));
+        super((ff, rj) => {
+            _cancel_data = fn(ff, rj);
+            setTimeout(() => { this.ff = ff; this.rj = rj; });
+        });
         this.oncancel = oncancel;
         const set_cb = () => this._cancel_data = _cancel_data;
         // @ts-ignore-next
@@ -206,7 +212,7 @@ const qmergeDeepX = mergeDeep$1(2);
 const qmergeDeepAdd = mergeDeep$1(3);
 /** @param o1 <- o2 */
 const qmergeShallow = curry2((o1, o2) => Object.assign(o1, o2));
-/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
+/** qmapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } removes a key when null. */
 const qmapKeys = curry2((keyMap, o) => {
     let k, mapped, newKey, newValue, swap = {}, inswap;
     for (k in keyMap)
@@ -644,7 +650,7 @@ const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
  * @param data any
  * @returns data with prop over pipe.
 */
-const overProp = curry3((prop, pipe, data) => (prop in data) && assoc(prop, pipe(data[prop]), data));
+const overProp = curry3((prop, pipe, data) => prop in data ? assoc(prop, pipe(data[prop]), data) : data);
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, assign({}, o)));
 const zip = curry2((a, b) => map((s, i) => [s, b[i]], a));

package/package.json

@@ -36,13 +36,13 @@
     "lint": "tslint src/*.ts",
     "gentypes": "dts-bundle-generator --no-check --export-referenced-types=false -o dist/bundle.d.ts src/index.ts",
     "dev": "cross-env NODE_ENV=development BUILD=es rollup -c",
-    "watch": "nodemon --watch src 'npm run dev'",
+    "watch": "nodemon --watch src --ext ts,js --exec \"npm run dev\"",
     "prod:cjs": "cross-env NODE_ENV=production BUILD=cjs rollup -c",
     "prod:es": "cross-env NODE_ENV=production BUILD=es rollup -c",
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.12.1",
+  "version": "1.12.2",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -50,6 +50,7 @@
     "@types/node": "^25.5.0",
     "cross-env": "^10.1.0",
     "dts-bundle-generator": "^9.5.1",
+    "nodemon": "^3.1.14",
     "rollup": "^4.59.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "ts-node": "^10.9.2",

package/src/utils.ts

@@ -21,14 +21,18 @@ export const isSafe = (prop: string) => !(prop in unsafe_props)
 // TODO: add .then(), .finally() and .catch() to return QPromise.
 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()
+    if(resolve) this.ff?.(); else this.rj?.()
     this.oncancel(this._cancel_data)
   }
   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)
+      setTimeout(() => {this.ff = ff; this.rj = rj})
+    })
     const set_cb = () => this._cancel_data=_cancel_data
     // @ts-ignore-next
     if(_cancel_data!==not_assigned) set_cb()