pepka 1.6.3 → 1.6.4

package/dist/bundle.cjs

@@ -71,6 +71,9 @@ function curry3(fn) {
     return curry(fn);
 }
 
+const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
+const is_typed_arr = (t) => typed_arr_re.test(t);
+
 const undef = undefined;
 const nul = null;
 const inf = Infinity;
@@ -100,7 +103,7 @@ const isNil = (s) => isNull(s) || isUndef(s);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array'))) {
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
         if (isNull(a) || isNull(b))
             return eq(a, b);
         if (eq(a, b))
@@ -241,6 +244,7 @@ const qfreeze = (o) => {
 };
 const qfreezeShallow = (o) => Object.freeze(o);
 const qprepend = curry2((x, xs) => xs.unshift(x));
+const qsort = curry2((sortFn, xs) => xs.sort(sortFn));
 const qassocPath = curry3((_path, v, o) => {
     const first = _path[0];
     return qassoc(first, _path.length < 2
@@ -301,7 +305,7 @@ const lt = curry2((a, b) => a > b);
 const gte = curry2((a, b) => a <= b);
 /** @param a @param b @returns a≥b  */
 const lte = curry2((a, b) => a >= b);
-const sort = curry2((sortFn, xs) => xs.sort(sortFn)); // TODO: make it shallow cloning.
+const sort = curry2((sortFn, xs) => [...xs].sort(sortFn));
 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));
@@ -426,7 +430,6 @@ const path = pathOr(undef);
 const pathEq = curry3((_path, value, o) => equals(path(_path, o), value));
 const pathsEq = curry3((_path, o1, o2) => equals(path(_path, o1), path(_path, o2)));
 const pathExists = compose(ifElse(equals(symbol), F, T), pathOr(symbol));
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
 const clone = (s, shallow = false) => {
     const t = type(s);
     switch (t) {
@@ -445,7 +448,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return typed_arr_re.test(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(t) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);
@@ -469,7 +472,7 @@ const omit = curry2((props, o) => filter((_, k) => !includes(k, props), o));
 const fromPairs = (pairs) => Object.fromEntries(pairs);
 const concat = curry2(((a, b) => b.concat(a)));
 const map = curry2((pipe, arr) => arr.map(pipe));
-const mapObj = curry2((pipe, o) => qmapObj(pipe, cloneShallow(o)));
+const mapObj = curry2((pipe, o) => qmapObj(pipe, { ...o }));
 const join = curry2((delimeter, arr) => arr.join(delimeter));
 const forEach = curry2((pipe, arr) => arr.forEach(pipe));
 const both = curry3((cond1, cond2, s) => cond2(s) && cond1(s));
@@ -760,6 +763,7 @@ exports.qoverProp = qoverProp;
 exports.qprepend = qprepend;
 exports.qreduce = qreduce;
 exports.qreverse = qreverse;
+exports.qsort = qsort;
 exports.qstartsWith = qstartsWith;
 exports.qstartsWithWith = qstartsWithWith;
 exports.range = range;

package/dist/bundle.d.ts

@@ -180,10 +180,10 @@ export declare const lte: {
 	(a: number, b: number): boolean;
 };
 export declare const sort: {
-	(a: symbol, b: any[]): (a: (a: any, b: any) => number) => any[];
-	(a: (a: any, b: any) => number, b: symbol): (b: any[]) => any[];
-	(a: (a: any, b: any) => number): (b: any[]) => any[];
-	(a: (a: any, b: any) => number, b: any[]): any[];
+	(a: symbol, b: unknown[]): (a: (a: unknown, b: unknown) => number) => unknown[];
+	(a: (a: unknown, b: unknown) => number, b: symbol): (b: unknown[]) => unknown[];
+	(a: (a: unknown, b: unknown) => number): (b: unknown[]) => unknown[];
+	(a: (a: unknown, b: unknown) => number, b: unknown[]): unknown[];
 };
 export declare const find: {
 	(a: symbol, b: any[]): (a: Cond) => any;
@@ -438,10 +438,10 @@ export declare const map: {
 	(a: (s: any, i?: number, list?: any[]) => any, b: any[]): any[];
 };
 export declare const mapObj: {
-	(a: symbol, b: AnyObject): (a: (s: any, i?: string, list?: any[]) => any) => (b: AnyObject) => AnyObject;
-	(a: (s: any, i?: string, list?: any[]) => any, b: symbol): (b: AnyObject) => (b: AnyObject) => AnyObject;
-	(a: (s: any, i?: string, list?: any[]) => any): (b: AnyObject) => (b: AnyObject) => AnyObject;
-	(a: (s: any, i?: string, list?: any[]) => any, b: AnyObject): (b: AnyObject) => AnyObject;
+	(a: symbol, b: AnyObject): (a: (s: any, i?: string, list?: any[]) => any) => AnyObject;
+	(a: (s: any, i?: string, list?: any[]) => any, b: symbol): (b: AnyObject) => AnyObject;
+	(a: (s: any, i?: string, list?: any[]) => any): (b: AnyObject) => AnyObject;
+	(a: (s: any, i?: string, list?: any[]) => any, b: AnyObject): AnyObject;
 };
 export declare const join: {
 	(a: symbol, b: string[]): (a: string) => string;
@@ -632,6 +632,12 @@ export declare const qprepend: {
 	(a: any): (b: any[]) => number;
 	(a: any, b: any[]): number;
 };
+export declare const qsort: {
+	(a: symbol, b: any[]): (a: (a: any, b: any) => number) => any[];
+	(a: (a: any, b: any) => number, b: symbol): (b: any[]) => any[];
+	(a: (a: any, b: any) => number): (b: any[]) => any[];
+	(a: (a: any, b: any) => number, b: any[]): any[];
+};
 export declare const qassocPath: (...args: AnyArgs) => any;
 export declare const qreverse: (arr: any[]) => any[];
 export declare const qomit: {

package/dist/bundle.mjs

@@ -69,6 +69,9 @@ function curry3(fn) {
     return curry(fn);
 }
 
+const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
+const is_typed_arr = (t) => typed_arr_re.test(t);
+
 const undef = undefined;
 const nul = null;
 const inf = Infinity;
@@ -98,7 +101,7 @@ const isNil = (s) => isNull(s) || isUndef(s);
 const eq = curry2((a, b) => a === b);
 const equals = curry2((a, b) => {
     const typea = type(a);
-    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array'))) {
+    if (eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
         if (isNull(a) || isNull(b))
             return eq(a, b);
         if (eq(a, b))
@@ -239,6 +242,7 @@ const qfreeze = (o) => {
 };
 const qfreezeShallow = (o) => Object.freeze(o);
 const qprepend = curry2((x, xs) => xs.unshift(x));
+const qsort = curry2((sortFn, xs) => xs.sort(sortFn));
 const qassocPath = curry3((_path, v, o) => {
     const first = _path[0];
     return qassoc(first, _path.length < 2
@@ -299,7 +303,7 @@ const lt = curry2((a, b) => a > b);
 const gte = curry2((a, b) => a <= b);
 /** @param a @param b @returns a≥b  */
 const lte = curry2((a, b) => a >= b);
-const sort = curry2((sortFn, xs) => xs.sort(sortFn)); // TODO: make it shallow cloning.
+const sort = curry2((sortFn, xs) => [...xs].sort(sortFn));
 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));
@@ -424,7 +428,6 @@ const path = pathOr(undef);
 const pathEq = curry3((_path, value, o) => equals(path(_path, o), value));
 const pathsEq = curry3((_path, o1, o2) => equals(path(_path, o1), path(_path, o2)));
 const pathExists = compose(ifElse(equals(symbol), F, T), pathOr(symbol));
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/;
 const clone = (s, shallow = false) => {
     const t = type(s);
     switch (t) {
@@ -443,7 +446,7 @@ const clone = (s, shallow = false) => {
         case 'Symbol':
             return s;
         default:
-            return typed_arr_re.test(t) ? s.constructor.from(s) : s;
+            return is_typed_arr(t) ? s.constructor.from(s) : s;
     }
 };
 const cloneShallow = (s) => clone(s, true);
@@ -467,7 +470,7 @@ const omit = curry2((props, o) => filter((_, k) => !includes(k, props), o));
 const fromPairs = (pairs) => Object.fromEntries(pairs);
 const concat = curry2(((a, b) => b.concat(a)));
 const map = curry2((pipe, arr) => arr.map(pipe));
-const mapObj = curry2((pipe, o) => qmapObj(pipe, cloneShallow(o)));
+const mapObj = curry2((pipe, o) => qmapObj(pipe, { ...o }));
 const join = curry2((delimeter, arr) => arr.join(delimeter));
 const forEach = curry2((pipe, arr) => arr.forEach(pipe));
 const both = curry3((cond1, cond2, s) => cond2(s) && cond1(s));
@@ -645,4 +648,4 @@ const composeAsync = (() => {
     return (...fns) => (...input) => pipe(fns, input, fns.length - 1);
 })();
 
-export { F, 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, forEachAsync, 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, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qprepend, qreduce, qreverse, qstartsWith, qstartsWithWith, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };
+export { F, 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, forEachAsync, 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, propsEq, push, qappend, qassoc, qassocPath, qempty, qfilter, qfreeze, qfreezeShallow, qmap, qmapKeys, qmapObj, qmergeDeep, qmergeDeepAdd, qmergeDeepX, qmergeShallow, qomit, qoverProp, qprepend, qreduce, qreverse, qsort, qstartsWith, qstartsWithWith, range, reduce, reflect, replace, reverse, sizeof, slice, some, sort, split, startsWith, subtract, symbol, tail, take, tap, test, throttle, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqWith, values, wait, waitAll, waitTap, weakEq, when, zip, zipObj, zipWith };

package/package.json

@@ -12,6 +12,7 @@
     "ramda",
     "functional",
     "fp",
+    "toolkit",
     "pure",
     "strongly-typed",
     "typescript",
@@ -40,7 +41,7 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "1.6.3",
+  "version": "1.6.4",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-node-resolve": "^16.0.0",

package/src/common.ts

@@ -1,4 +1,5 @@
 import { curry2 } from "./curry"
+import { is_typed_arr } from "./internal"
 import { AnyArray, StrLen } from "./internal_types"
 import { to, isNull, isStr, isUndef } from "./utils"
 
@@ -21,7 +22,7 @@ export const isNil = (s: any) => isNull(s) || isUndef(s)
 export const eq = curry2((a: any, b: any) => a===b)
 export const equals = curry2((a: any, b: any) => {
   const typea = type(a)
-  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array'))) {
+  if(eq(typea, type(b)) && (eq(typea, 'Object') || eq(typea, 'Array') || is_typed_arr(typea))) {
     if(isNull(a) || isNull(b)) return eq(a, b)
     if(eq(a, b)) return true
     for(const v of [a, b])

package/src/internal.ts

@@ -0,0 +1,2 @@
+const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/
+export const is_typed_arr = (t: string) => typed_arr_re.test(t)

package/src/safe.ts

@@ -4,6 +4,7 @@ import { qmergeDeep, qreduce, qappend, qmapKeys, qmergeDeepX, qmergeDeepAdd, qfi
 import { AnyFunc, Cond, AnyObject, Reducer } from './types'
 import { symbol, type, length, equals, includes, isNil, qstartsWithWith, eq } from './common'
 import { Split, AnyArray, IndexesOfArray } from './internal_types'
+import { is_typed_arr } from './internal'
 // TODO: over, lensProp. propsEq is up to 20x slow due to deep equals.
 
 export const take = (argN: number) => (...args: any[]) => args[argN]
@@ -260,7 +261,6 @@ export const pathsEq = curry3(
     equals(path(_path, o1), path(_path, o2))
 )
 export const pathExists = compose(ifElse(equals(symbol), F, T), pathOr(symbol))
-const typed_arr_re = /^(.*?)(8|16|32|64)(Clamped)?Array$/
 export const clone = (s: any, shallow = false) => {
   const t = type(s)
   switch(t) {
@@ -275,7 +275,7 @@ export const clone = (s: any, shallow = false) => {
     case 'Boolean': case 'Symbol':
       return s
     default:
-      return typed_arr_re.test(t) ? s.constructor.from(s) : s
+      return is_typed_arr(t) ? s.constructor.from(s) : s
   }
 }
 export const cloneShallow = (s: any) => clone(s, true)