pepka 1.6.0 → 1.6.1

package/dist/bundle.cjs

@@ -136,9 +136,9 @@ const qstartsWithWith = (comparator) => curry2((start, s) => {
     return true;
 });
 
-/** Then next fns seem to be excess due to their safe ver performance should be the same or better:
- * qflat, qpick
- */
+/* Then next fns seem to be excess due to their safe ver performance should be the same or better:
+* qflat, qpick
+*/
 const qappend = curry2((s, xs) => { xs.push(s); return xs; });
 const qassoc = curry3((prop, v, obj) => { obj[prop] = v; return obj; });
 const qreduce = curry3((fn, accum, arr) => arr.reduce(fn, accum));
@@ -193,6 +193,7 @@ const qmapKeys = curry2((keyMap, o) => {
         }
     return o;
 });
+// FIXME: qmap(any, tags) -> some function!!!
 const qmap = curry2((pipe, arr) => {
     for (const i in arr)
         arr[i] = pipe(arr[i], +i, arr);
@@ -246,15 +247,15 @@ const qreverse = (arr) => arr.reverse();
 const qomit = curry2((props, o) => qfilter((_, k) => !includes(k, props), o));
 /** @param start string | any[] @param s string | any[] */
 const qstartsWith = qstartsWithWith(eq);
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/** @param prop string @param pipe (data[prop]): prop_value @param data any
+ * @returns data with prop over pipe. */
 const qoverProp = curry3((prop, pipe, data) => qassoc(prop, pipe(data[prop]), data));
 
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);
 
-// over, lensProp
+// TODO: over, lensProp. propsEq is up to 20x slow due to deep equals.
 const take = (argN) => (...args) => args[argN];
-const weakEq = curry2((a, b) => a == b);
 const ifElse = curry((cond, pipeYes, pipeNo, s) => cond(s) ? pipeYes(s) : pipeNo(s));
 const when = curry3((cond, pipe, s) => ifElse(cond, pipe, identity, s));
 const compose = ((...fns) => (...args) => {
@@ -343,8 +344,10 @@ const sizeof = (s) => {
         return length(s);
 };
 const range = curry2((from, to) => genBy(add(from), to - from));
+/** @param cond (x, y): bool @param xs any[] @returns xs without duplicates, using cond as a comparator.  */
+const uniqWith = curry2((cond, xs) => qreduce((accum, x) => find((y) => cond(x, y), accum) ? accum : qappend(x, accum), [], xs));
 /** @param xs any[] @returns xs without duplicates.  */
-const uniq = (xs) => qreduce((accum, x) => find(equals(x), accum) ? accum : qappend(x, accum), [], xs);
+const uniq = uniqWith(equals);
 const intersection = curry2((xs1, xs2) => xs1.filter(flip(includes)(xs2)));
 const diff = curry2((_xs1, _xs2) => {
     let len1 = length(_xs1);
@@ -532,6 +535,7 @@ const echo = identity;
 const notf = complement;
 const push = append;
 const some = any;
+const weakEq = eq;
 
 const ecran = '\\';
 // TODO: make it splicy, not accumulatie by symbols.
@@ -751,6 +755,7 @@ exports.type = type;
 exports.typeIs = typeIs;
 exports.uncurry = uncurry;
 exports.uniq = uniq;
+exports.uniqWith = uniqWith;
 exports.values = values;
 exports.waitAll = waitAll;
 exports.waitTap = waitTap;

package/dist/bundle.d.ts

@@ -9,6 +9,11 @@ type Split<S extends string> = S extends `${infer U}${infer V}` ? [
 ];
 type IndexesOfArray<A> = Exclude<keyof A, keyof [
 ]>;
+type StrLen<S extends string, Acc extends 0[] = [
+]> = S extends `${string}${infer Rest}` ? StrLen<Rest, [
+	...Acc,
+	0
+]> : Acc["length"];
 export type Cond = (x1?: any, x2?: any, x3?: any) => boolean;
 export interface AnyObject {
 	[k: string]: any;
@@ -39,7 +44,7 @@ export declare const typeIs: {
 	(a: string): (b: any) => boolean;
 	(a: string, b: any): boolean;
 };
-declare const length$1: (s: AnyArray | string) => number;
+declare const length$1: <T extends string | AnyArray>(s: T) => T extends string ? StrLen<T> : T["length"];
 export declare const isNil: (s: any) => boolean;
 export declare const eq: {
 	(a: symbol, b: any): (a: any) => boolean;
@@ -67,12 +72,6 @@ export declare const qstartsWithWith: (comparator: (x: any, y: any) => boolean)
 	(a: string | any[], b: string | any[]): boolean;
 };
 export declare const take: (argN: number) => (...args: any[]) => any;
-export declare const weakEq: {
-	(a: symbol, b: any): (a: any) => boolean;
-	(a: any, b: symbol): (b: any) => boolean;
-	(a: any): (b: any) => boolean;
-	(a: any, b: any): boolean;
-};
 export declare const ifElse: (...args: AnyArgs) => any;
 export declare const when: (...args: AnyArgs) => any;
 type Composed<TIn extends any[], TOut> = (...xs: TIn) => TOut;
@@ -211,8 +210,8 @@ export declare const divide: {
 	(a: number): (b: number) => number;
 	(a: number, b: number): number;
 };
-export declare const always: <T = any>(s: T) => () => T;
-export declare const identity: <T = any>(s: T) => T;
+export declare const always: <T extends unknown>(s: T) => () => T;
+export declare const identity: <T extends unknown>(s: T) => T;
 export declare const trim: (s: string) => string;
 /** @param start string | any[] @param s string | any[] */
 export declare const startsWith: {
@@ -298,8 +297,15 @@ export declare const range: {
 	(a: number): (b: number) => any[];
 	(a: number, b: number): any[];
 };
+/** @param cond (x, y): bool @param xs any[] @returns xs without duplicates, using cond as a comparator.  */
+export declare const uniqWith: {
+	(a: symbol, b: any[]): (a: (x: any, y: any) => boolean) => any;
+	(a: (x: any, y: any) => boolean, b: symbol): (b: any[]) => any;
+	(a: (x: any, y: any) => boolean): (b: any[]) => any;
+	(a: (x: any, y: any) => boolean, b: any[]): any;
+};
 /** @param xs any[] @returns xs without duplicates.  */
-export declare const uniq: (xs: any[]) => any;
+export declare const uniq: (b: any[]) => any;
 export declare const intersection: {
 	(a: symbol, b: any[]): (a: any[]) => any[];
 	(a: any[], b: symbol): (b: any[]) => any[];
@@ -530,9 +536,9 @@ export declare const zipObj: {
  * @param b T2[]
  */
 export declare const zipWith: (...args: AnyArgs) => any;
-export declare const mirror: <T = any>(s: T) => T;
-export declare const reflect: <T = any>(s: T) => T;
-export declare const echo: <T = any>(s: T) => T;
+export declare const mirror: <T extends unknown>(s: T) => T;
+export declare const reflect: <T extends unknown>(s: T) => T;
+export declare const echo: <T extends unknown>(s: T) => T;
 export declare const notf: (fn: AnyFunc) => (...args: any) => boolean | any;
 export declare const push: {
 	(a: symbol, b: any[]): (a: any) => any[];
@@ -546,9 +552,12 @@ export declare const some: {
 	(a: Cond): (b: any[]) => boolean;
 	(a: Cond, b: any[]): boolean;
 };
-/** Then next fns seem to be excess due to their safe ver performance should be the same or better:
- * qflat, qpick
- */
+export declare const weakEq: {
+	(a: symbol, b: any): (a: any) => boolean;
+	(a: any, b: symbol): (b: any) => boolean;
+	(a: any): (b: any) => boolean;
+	(a: any, b: any): boolean;
+};
 export declare const qappend: {
 	(a: symbol, b: any[]): (a: any) => any[];
 	(a: any, b: symbol): (b: any[]) => any[];
@@ -639,7 +648,8 @@ export declare const qstartsWith: {
 	(a: string | any[]): (b: string | any[]) => boolean;
 	(a: string | any[], b: string | any[]): boolean;
 };
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/** @param prop string @param pipe (data[prop]): prop_value @param data any
+ * @returns data with prop over pipe. */
 export declare const qoverProp: (...args: AnyArgs) => any;
 type StrTmpl = ((data: AnyObject) => string);
 /** Supports ecrans: '\\{"json": {yes} \\}'

package/dist/bundle.mjs

@@ -134,9 +134,9 @@ const qstartsWithWith = (comparator) => curry2((start, s) => {
     return true;
 });
 
-/** Then next fns seem to be excess due to their safe ver performance should be the same or better:
- * qflat, qpick
- */
+/* Then next fns seem to be excess due to their safe ver performance should be the same or better:
+* qflat, qpick
+*/
 const qappend = curry2((s, xs) => { xs.push(s); return xs; });
 const qassoc = curry3((prop, v, obj) => { obj[prop] = v; return obj; });
 const qreduce = curry3((fn, accum, arr) => arr.reduce(fn, accum));
@@ -191,6 +191,7 @@ const qmapKeys = curry2((keyMap, o) => {
         }
     return o;
 });
+// FIXME: qmap(any, tags) -> some function!!!
 const qmap = curry2((pipe, arr) => {
     for (const i in arr)
         arr[i] = pipe(arr[i], +i, arr);
@@ -244,15 +245,15 @@ const qreverse = (arr) => arr.reverse();
 const qomit = curry2((props, o) => qfilter((_, k) => !includes(k, props), o));
 /** @param start string | any[] @param s string | any[] */
 const qstartsWith = qstartsWithWith(eq);
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/** @param prop string @param pipe (data[prop]): prop_value @param data any
+ * @returns data with prop over pipe. */
 const qoverProp = curry3((prop, pipe, data) => qassoc(prop, pipe(data[prop]), data));
 
 // TODO: possibly introduce a second argument limiting unfolding.
 const uncurry = (fn) => (...args) => qreduce(((fn, arg) => fn ? fn(arg) : fn), fn, args);
 
-// over, lensProp
+// TODO: over, lensProp. propsEq is up to 20x slow due to deep equals.
 const take = (argN) => (...args) => args[argN];
-const weakEq = curry2((a, b) => a == b);
 const ifElse = curry((cond, pipeYes, pipeNo, s) => cond(s) ? pipeYes(s) : pipeNo(s));
 const when = curry3((cond, pipe, s) => ifElse(cond, pipe, identity, s));
 const compose = ((...fns) => (...args) => {
@@ -341,8 +342,10 @@ const sizeof = (s) => {
         return length(s);
 };
 const range = curry2((from, to) => genBy(add(from), to - from));
+/** @param cond (x, y): bool @param xs any[] @returns xs without duplicates, using cond as a comparator.  */
+const uniqWith = curry2((cond, xs) => qreduce((accum, x) => find((y) => cond(x, y), accum) ? accum : qappend(x, accum), [], xs));
 /** @param xs any[] @returns xs without duplicates.  */
-const uniq = (xs) => qreduce((accum, x) => find(equals(x), accum) ? accum : qappend(x, accum), [], xs);
+const uniq = uniqWith(equals);
 const intersection = curry2((xs1, xs2) => xs1.filter(flip(includes)(xs2)));
 const diff = curry2((_xs1, _xs2) => {
     let len1 = length(_xs1);
@@ -530,6 +533,7 @@ const echo = identity;
 const notf = complement;
 const push = append;
 const some = any;
+const weakEq = eq;
 
 const ecran = '\\';
 // TODO: make it splicy, not accumulatie by symbols.
@@ -610,4 +614,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, 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, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, values, 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, 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, toLower, toPairs, toUpper, trim, type, typeIs, uncurry, uniq, uniqWith, values, 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.6.0",
+  "version": "1.6.1",
   "ava": {
     "files": [
       "./test/specs/*.ts"

package/src/common.ts

@@ -1,5 +1,5 @@
 import { curry2 } from "./curry"
-import { AnyArray } from "./internal_types"
+import { AnyArray, StrLen } from "./internal_types"
 import { to, isNull, isStr, isUndef } from "./utils"
 
 // It's faster that toUpperCase() !
@@ -15,7 +15,8 @@ export const type = (s: any): string => {
     : caseMap[t[0]] + t.slice(1)
 }
 export const typeIs = curry2((t: string, s: any) => type(s)===t)
-export const length = (s: AnyArray | string) => s.length
+
+export const length = <T extends AnyArray | string>(s: T): T extends string ? StrLen<T> : T["length"] => s.length as any
 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) => {

package/src/curry.ts

@@ -75,10 +75,10 @@ export function curry2<Func extends Func2>(fn: Func) {
     if(aln === 1 && withPlaceholder1)
       throw new Error('Senseless placeholder usage.')
     return aln>1
-    ? withPlaceholder1
-      ? endlessph((a: p0) => fn(a, b))
-      : fn(a, b) as ReturnType<Func>
-    : (b: p1) => fn(a, b)
+      ? withPlaceholder1
+        ? endlessph((a: p0) => fn(a, b))
+        : fn(a, b) as ReturnType<Func>
+      : (b: p1) => fn(a, b)
   }
   return curried2
 }

package/src/internal_types.ts

@@ -4,4 +4,8 @@ export type TupleFn<ARG1=any, ARG2=any, Out=any> = (a: ARG1, b: ARG2) => Out
 export type IDArray = Uint8Array|Uint16Array|Uint32Array
 export type AnyArray<T=any> = T[] | readonly T[]
 export type Split<S extends string> = S extends `${infer U}${infer V}` ? [U, ...Split<V>] : []
-export type IndexesOfArray<A> = Exclude<keyof A, keyof []>
+export type IndexesOfArray<A> = Exclude<keyof A, keyof []>
+export type StrLen<S extends string, Acc extends 0[] = []> =
+  S extends `${string}${infer Rest}`
+    ? StrLen<Rest, [...Acc, 0]>
+    : Acc["length"]

package/src/quick.ts

@@ -2,9 +2,9 @@ import { curry2, curry3 } from "./curry"
 import { includes, isNil, type, eq, qstartsWithWith } from "./common"
 import { AnyObject, Reducer, AnyFunc } from "./types"
 import { isFunc, isArray, isObj } from "./utils"
-/** Then next fns seem to be excess due to their safe ver performance should be the same or better:
- * qflat, qpick
- */
+/* Then next fns seem to be excess due to their safe ver performance should be the same or better:
+* qflat, qpick
+*/
 
 export const qappend = curry2((s: any, xs: any[]) => {xs.push(s); return xs})
 export const qassoc = curry3((prop: string, v: any, obj: AnyObject) => { obj[prop] = v; return obj })
@@ -61,6 +61,7 @@ export const qmapKeys = curry2(
     return o
   }
 )
+// FIXME: qmap(any, tags) -> some function!!!
 export const qmap = curry2(
   (pipe: (s: any, i?: number, list?: any[]) => any, arr: any[]) => {
     for(const i in arr) arr[i] = pipe(arr[i], +i, arr)
@@ -123,8 +124,8 @@ export const qomit = curry2(
 )
 /** @param start string | any[] @param s string | any[] */
 export const qstartsWith = qstartsWithWith(eq)
-/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
+/** @param prop string @param pipe (data[prop]): prop_value @param data any
+ * @returns data with prop over pipe. */
 export const qoverProp = curry3(
-  (prop: string, pipe: AnyFunc, data: any) =>
-    qassoc(prop, pipe(data[prop]), data)
+  (prop: string, pipe: AnyFunc, data: any) => qassoc(prop, pipe(data[prop]), data)
 )

package/src/safe.ts

@@ -2,12 +2,11 @@ import { __, curry, curry2, curry3 } from './curry'
 import { isNum, undef, isArray, isFunc, isObj, inf } from './utils'
 import { qmergeDeep, qreduce, qappend, qmapKeys, qmergeDeepX, qmergeDeepAdd, qfilter, qfreeze, qfreezeShallow, qmapObj } from './quick'
 import { AnyFunc, Cond, AnyObject, Reducer } from './types'
-import { symbol, type, length, equals, includes, isNil, qstartsWithWith } from './common'
+import { symbol, type, length, equals, includes, isNil, qstartsWithWith, eq } from './common'
 import { Split, AnyArray, IndexesOfArray } from './internal_types'
-// over, lensProp
+// TODO: over, lensProp. propsEq is up to 20x slow due to deep equals.
 
 export const take = (argN: number) => (...args: any[]) => args[argN]
-export const weakEq = curry2((a: any, b: any) => a==b)
 export const ifElse = curry(
   (
     cond: (s: any) => boolean,
@@ -103,8 +102,8 @@ 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=any>(s: T) => () => s
-export const identity = <T=any>(s: T) => s
+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()
 
 /** @param start string | any[] @param s string | any[] */
@@ -153,11 +152,13 @@ export const sizeof = (s: any[] | string | AnyObject) => {
   } else return length(s as any[])
 }
 export const range = curry2((from: number, to: number) => genBy(add(from), to-from))
-/** @param xs any[] @returns xs without duplicates.  */
-export const uniq = (xs: any[]) => qreduce(
+/** @param cond (x, y): bool @param xs any[] @returns xs without duplicates, using cond as a comparator.  */
+export const uniqWith = curry2((cond: (x: any, y: any) => boolean, xs: any[]) => qreduce(
   <T>(accum: any, x: T) =>
-    find(equals(x), accum) ? accum : qappend(x, accum),
-[], xs)
+    find((y) => cond(x as any, y), accum) ? accum : qappend(x, accum),
+[], xs))
+/** @param xs any[] @returns xs without duplicates.  */
+export const uniq = uniqWith(equals)
 export const intersection = curry2((xs1: any[], xs2: any[]) => xs1.filter(flip(includes)(xs2)))
 export const diff = curry2((_xs1: any[], _xs2: any[]) => {
   let len1 = length(_xs1)
@@ -425,4 +426,5 @@ export const reflect = identity
 export const echo = identity
 export const notf = complement
 export const push = append
-export const some = any
+export const some = any
+export const weakEq = eq