pepka 1.12.2 → 1.13.0

package/dist/bundle.cjs

@@ -69,8 +69,7 @@ function curry3(fn) {
 }
 
 const length = (s) => s.length;
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
-const is_typed_arr = (t) => typed_arr_re.test(t);
+const is_typed_arr = (x) => ArrayBuffer.isView(x);
 /** @param start string | any[] @param s string | any[] */
 const startsWithWith = (comparator) => curry2((start, s) => {
     const len_start = length(start);
@@ -144,20 +143,32 @@ const type = (s) => {
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
+    if (a === b)
+        return true;
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+    const ta = is_typed_arr(a);
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+        if (ta) {
+            if (typea === 'Buffer')
+                return a.equals(b);
+            const len = length(a);
+            if (len !== length(b))
+                return false;
+            for (let i = 0; i < len; i++)
+                if (a[i] !== b[i])
+                    return false;
+            return true;
+        }
         if (isNull(a) || isNull(b))
             return eq(a, b);
-        if (eq(a, b))
-            return true;
         for (const v of [a, b])
             for (const k in v)
-                if (!((eq(v, b)) && (k in a)) &&
-                    !((eq(v, a)) && (k in b) && equals(a[k], b[k])))
+                if (!(v === b && (k in a)) &&
+                    !(v === a && (k in b) && equals(a[k], b[k])))
                     return false;
         return true;
     }
-    return eq(a, b);
+    return false;
 });
 const includes = curry2((s, ss) => {
     if (isStr(ss))
@@ -169,6 +180,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;
@@ -341,23 +355,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.
@@ -413,9 +430,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);
@@ -568,7 +582,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return is_typed_arr(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(s) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);
@@ -937,6 +951,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[];
@@ -231,13 +234,25 @@ 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;
@@ -390,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

@@ -67,8 +67,7 @@ function curry3(fn) {
 }
 
 const length = (s) => s.length;
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
-const is_typed_arr = (t) => typed_arr_re.test(t);
+const is_typed_arr = (x) => ArrayBuffer.isView(x);
 /** @param start string | any[] @param s string | any[] */
 const startsWithWith = (comparator) => curry2((start, s) => {
     const len_start = length(start);
@@ -142,20 +141,32 @@ const type = (s) => {
 const typeIs = curry2((t, s) => type(s) === t);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
+    if (a === b)
+        return true;
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+    const ta = is_typed_arr(a);
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+        if (ta) {
+            if (typea === 'Buffer')
+                return a.equals(b);
+            const len = length(a);
+            if (len !== length(b))
+                return false;
+            for (let i = 0; i < len; i++)
+                if (a[i] !== b[i])
+                    return false;
+            return true;
+        }
         if (isNull(a) || isNull(b))
             return eq(a, b);
-        if (eq(a, b))
-            return true;
         for (const v of [a, b])
             for (const k in v)
-                if (!((eq(v, b)) && (k in a)) &&
-                    !((eq(v, a)) && (k in b) && equals(a[k], b[k])))
+                if (!(v === b && (k in a)) &&
+                    !(v === a && (k in b) && equals(a[k], b[k])))
                     return false;
         return true;
     }
-    return eq(a, b);
+    return false;
 });
 const includes = curry2((s, ss) => {
     if (isStr(ss))
@@ -167,6 +178,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;
@@ -339,23 +353,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.
@@ -411,9 +428,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);
@@ -566,7 +580,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return is_typed_arr(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(s) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);
@@ -814,4 +828,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

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

package/src/common.ts

@@ -1,5 +1,5 @@
 import { curry2 } from "./curry"
-import { is_typed_arr } from "./internal"
+import { is_typed_arr, length } from "./internal"
 import { isNull, isStr, to } from "./utils"
 const {isNaN} = Number
 
@@ -21,19 +21,26 @@ export const typeIs = curry2((t: string, s: any) => type(s)===t)
 
 export const eq = curry2((a: any, b: any) => a===b)
 export const equals = curry2((a: any, b: any) => {
+  if(a===b) return true
   const typea = type(a)
-  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
+  const ta = is_typed_arr(a)
+  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || ta)) {
+    if(ta) {
+      if(typea==='Buffer') return (a as Buffer).equals(b)
+      const len = length(a as any)
+      if(len!==length(b)) return false
+      for(let i=0; i<len; i++) if(a[i]!==b[i]) return false
+      return true
+    }
     if(isNull(a) || isNull(b)) return eq(a, b)
-    if(eq(a, b)) return true
-    for(const v of [a, b])
-      for(const k in v)
-        if(
-          !((eq(v, b)) && (k in a)) &&
-          !((eq(v, a)) && (k in b) && equals(a[k], b[k]))
-        ) return false
+    for(const v of [a, b]) for(const k in v)
+      if(
+        !(v===b && (k in a)) &&
+        !(v===a && (k in b) && equals(a[k], b[k]))
+      ) return false
     return true
   }
-  return eq(a, b)
+  return false
 })
 export const includes = curry2(
   <T>(s: T, ss: T[]) => {
@@ -44,5 +51,9 @@ export const includes = curry2(
     }
   }
 )
+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/internal.ts

@@ -2,8 +2,7 @@ import { curry2 } from "./curry"
 import { AnyArray, StrLen } from "./internal_types"
 
 export const length = <T extends AnyArray | string>(s: T): T extends string ? StrLen<T> : T['length'] => s.length as any
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/
-export const is_typed_arr = (t: string) => typed_arr_re.test(t)
+export const is_typed_arr = (x: any) => ArrayBuffer.isView(x)
 /** @param start string | any[] @param s string | any[] */
 export const startsWithWith = (comparator: (x: any, y: any)=>boolean) => curry2(
   (start: any[] | string, s: any[] | string) => {

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
@@ -304,7 +301,7 @@ export const clone = <T extends any>(s: T, shallow = false): T => {
     case 'Boolean': case 'Symbol':
       return s
     default:
-      return is_typed_arr(t) ? (s as any).constructor.from(s) : s
+      return is_typed_arr(s) ? (s as any).constructor.from(s) : s
   }
 }
 export const cloneShallow = (s: any) => clone(s, true)