pepka 1.12.1 → 1.12.3

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
@@ -163,6 +169,9 @@ const includes = curry2((s, ss) => {
         return false;
     }
 });
+const always = (s) => () => s;
+const identity = (s) => s;
+const trim = (s) => s.trim();
 
 const { min } = Math;
 const z = 0;
@@ -208,7 +217,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)
@@ -335,23 +344,26 @@ const rmel = (index, xs) => {
     return xs;
 };
 const seen = new Set();
-const quniq = (xs) => {
-    seen.clear();
-    let size = length(xs);
+const quniqWith = curry2((getter, xs) => {
+    let size = length(xs), cur;
     for (let i = z; i < size; i++) {
         const x = xs[i];
-        if (seen.has(x)) {
+        cur = getter(x);
+        if (seen.has(cur)) {
             rmel(i, xs);
             size--;
             i--;
         }
         else
-            seen.add(x);
+            seen.add(cur);
     }
+    seen.clear();
     return xs;
-};
+});
+const quniq = quniqWith(identity);
 // Aliases.
 const qpush = qappend;
+const quniqBy = quniqWith;
 
 const { assign } = Object;
 // TODO: over, reduceAsync, propsEq is up to 20x slow due to deep equals.
@@ -407,9 +419,6 @@ const find = curry2((fn, s) => s.find(fn));
 const findIndex = curry2((fn, s) => s.findIndex(fn));
 const indexOf = curry2((x, xs) => findIndex(equals(x), xs));
 const divide = curry2((a, b) => b / a);
-const always = (s) => () => s;
-const identity = (s) => s;
-const trim = (s) => s.trim();
 const not = (x) => !x;
 const keys = (o) => Object.keys(o);
 const values = (o) => Object.values(o);
@@ -646,7 +655,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));
@@ -931,6 +940,8 @@ exports.qreverse = qreverse;
 exports.qslice = qslice;
 exports.qsort = qsort;
 exports.quniq = quniq;
+exports.quniqBy = quniqBy;
+exports.quniqWith = quniqWith;
 exports.qwaitAll = qwaitAll;
 exports.range = range;
 exports.reduce = reduce;

package/dist/bundle.d.ts

@@ -111,6 +111,9 @@ export declare const includes: {
 	(a: unknown): (b: unknown[]) => boolean;
 	(a: unknown, b: unknown[]): boolean;
 };
+export declare const always: <T extends any>(s: T) => () => T;
+export declare const identity: <T extends any>(s: T) => T;
+export declare const trim: (s: string) => string;
 export declare const qappend: {
 	(a: Placeholder, b: any[]): (a: any) => any[];
 	(a: any, b: Placeholder): (b: any[]) => any[];
@@ -144,7 +147,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;
@@ -231,17 +234,30 @@ export declare const qpick: {
 	(a: string[], b: AnyObject): AnyObject;
 };
 export declare const qslice: (...args: AnyArgs) => any;
-export declare const quniq: (xs: any[]) => any[];
+export declare const quniqWith: {
+	(a: Placeholder, b: any[]): (a: AnyFunc) => any[];
+	(a: AnyFunc, b: Placeholder): (b: any[]) => any[];
+	(a: AnyFunc): (b: any[]) => any[];
+	(a: AnyFunc, b: any[]): any[];
+};
+export declare const quniq: (b: any[]) => any[];
 export declare const qpush: {
 	(a: Placeholder, b: any[]): (a: any) => any[];
 	(a: any, b: Placeholder): (b: any[]) => any[];
 	(a: any): (b: any[]) => any[];
 	(a: any, b: any[]): any[];
 };
+export declare const quniqBy: {
+	(a: Placeholder, b: any[]): (a: AnyFunc) => any[];
+	(a: AnyFunc, b: Placeholder): (b: any[]) => any[];
+	(a: AnyFunc): (b: any[]) => any[];
+	(a: AnyFunc, b: any[]): any[];
+};
 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, [
@@ -389,9 +405,6 @@ export declare const divide: {
 	(a: number): (b: number) => number;
 	(a: number, b: number): number;
 };
-export declare const always: <T extends any>(s: T) => () => T;
-export declare const identity: <T extends any>(s: T) => T;
-export declare const trim: (s: string) => string;
 type T_not = {
 	(x: true): false;
 	(x: false): true;

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
@@ -161,6 +167,9 @@ const includes = curry2((s, ss) => {
         return false;
     }
 });
+const always = (s) => () => s;
+const identity = (s) => s;
+const trim = (s) => s.trim();
 
 const { min } = Math;
 const z = 0;
@@ -206,7 +215,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)
@@ -333,23 +342,26 @@ const rmel = (index, xs) => {
     return xs;
 };
 const seen = new Set();
-const quniq = (xs) => {
-    seen.clear();
-    let size = length(xs);
+const quniqWith = curry2((getter, xs) => {
+    let size = length(xs), cur;
     for (let i = z; i < size; i++) {
         const x = xs[i];
-        if (seen.has(x)) {
+        cur = getter(x);
+        if (seen.has(cur)) {
             rmel(i, xs);
             size--;
             i--;
         }
         else
-            seen.add(x);
+            seen.add(cur);
     }
+    seen.clear();
     return xs;
-};
+});
+const quniq = quniqWith(identity);
 // Aliases.
 const qpush = qappend;
+const quniqBy = quniqWith;
 
 const { assign } = Object;
 // TODO: over, reduceAsync, propsEq is up to 20x slow due to deep equals.
@@ -405,9 +417,6 @@ const find = curry2((fn, s) => s.find(fn));
 const findIndex = curry2((fn, s) => s.findIndex(fn));
 const indexOf = curry2((x, xs) => findIndex(equals(x), xs));
 const divide = curry2((a, b) => b / a);
-const always = (s) => () => s;
-const identity = (s) => s;
-const trim = (s) => s.trim();
 const not = (x) => !x;
 const keys = (o) => Object.keys(o);
 const values = (o) => Object.values(o);
@@ -644,7 +653,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));
@@ -808,4 +817,4 @@ const wait = (time) => new QPromise((ff) => setTimeout(ff, time), (timeout) => c
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);
 
-export { F, QPromise, T, __, add, all, allPass, always, any, anyPass, append, assoc, assocPath, bind, both, callFrom, callWith, clone, cloneShallow, complement, compose, composeAsync, concat, cond, curry, curry2, curry3, debounce, diff, divide, echo, empty, eq, equals, explore, filter, find, findIndex, flat, flatShallow, flatTo, flip, forEach, forEachParallel, forEachSerial, freeze, freezeShallow, fromPairs, genBy, getTmpl, gt, gte, head, identity, ifElse, includes, indexOf, intersection, isEmpty, isNil, join, keys, last, length, lt, lte, map, mapKeys, mapObj, memoize, mergeDeep, mergeDeepAdd, mergeDeepX, mergeShallow, mirror, multiply, noop, not, notf, nth, omit, once, overProp, path, pathEq, pathExists, pathOr, pathsEq, pick, pickBy, prepend, prop, propEq, propLens, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfilterAsync, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qpick, qprepend, qpush, qreduce, qreverse, qslice, qsort, quniq, qwaitAll, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, startsWithShallow, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqBy, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };
+export { F, QPromise, T, __, add, all, allPass, always, any, anyPass, append, assoc, assocPath, bind, both, callFrom, callWith, clone, cloneShallow, complement, compose, composeAsync, concat, cond, curry, curry2, curry3, debounce, diff, divide, echo, empty, eq, equals, explore, filter, find, findIndex, flat, flatShallow, flatTo, flip, forEach, forEachParallel, forEachSerial, freeze, freezeShallow, fromPairs, genBy, getTmpl, gt, gte, head, identity, ifElse, includes, indexOf, intersection, isEmpty, isNil, join, keys, last, length, lt, lte, map, mapKeys, mapObj, memoize, mergeDeep, mergeDeepAdd, mergeDeepX, mergeShallow, mirror, multiply, noop, not, notf, nth, omit, once, overProp, path, pathEq, pathExists, pathOr, pathsEq, pick, pickBy, prepend, prop, propEq, propLens, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfilterAsync, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qpick, qprepend, qpush, qreduce, qreverse, qslice, qsort, quniq, quniqBy, quniqWith, qwaitAll, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, startsWithShallow, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqBy, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };

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.3",
   "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/common.ts

@@ -44,5 +44,8 @@ export const includes = curry2(
     }
   }
 )
-export { length } from './internal'
+export const always = <T extends any>(s: T) => () => s
+export const identity = <T extends any>(s: T) => s
+export const trim = (s: string) => s.trim()
 
+export { length } from './internal'

package/src/quick.ts

@@ -1,4 +1,4 @@
-import { includes, length, type } from "./common"
+import { identity, includes, length, type } from "./common"
 import { curry2, curry3 } from "./curry"
 import { AnyFunc, AnyObject, Reducer } from "./types"
 import { inf, isArray, isFunc, isNil, isNum, isObj, isSafe } from "./utils"
@@ -175,16 +175,19 @@ const rmel = (index: number, xs: any[]) => {
   return xs
 }
 const seen = new Set()
-export const quniq = (xs: any[]) => {
-  seen.clear()
-  let size = length(xs)
+export const quniqWith = curry2((getter: AnyFunc, xs: any[]) => {
+  let size = length(xs), cur: any
   for(let i=z; i<size; i++) {
     const x = xs[i]
-    if(seen.has(x)) {rmel(i, xs); size--; i--}
-    else seen.add(x)
+    cur = getter(x)
+    if(seen.has(cur)) {rmel(i, xs); size--; i--}
+    else seen.add(cur)
   }
+  seen.clear()
   return xs
-}
+})
+export const quniq = quniqWith(identity)
 
 // Aliases.
-export const qpush = qappend
+export const qpush = qappend
+export const quniqBy = quniqWith

package/src/safe.ts

@@ -1,4 +1,4 @@
-import { eq, equals, includes, length, symbol, type } from './common'
+import { always, eq, equals, identity, includes, length, symbol, type } from './common'
 import { __, curry, curry2, curry3 } from './curry'
 import { is_typed_arr, startsWithWith } from './internal'
 import { AnyArray, IndexesOfArray, Split } from './internal_types'
@@ -108,9 +108,6 @@ export const find = curry2((fn: Cond, s: any[]) => s.find(fn))
 export const findIndex = curry2((fn: Cond, s: any[]) => s.findIndex(fn))
 export const indexOf = curry2((x: any, xs: any[]) => findIndex(equals(x), xs))
 export const divide = curry2((a: number, b: number) => b/a)
-export const always = <T extends any>(s: T) => () => s
-export const identity = <T extends any>(s: T) => s
-export const trim = (s: string) => s.trim()
 
 type T_not = {
   (x: true): false

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()