pepka 1.4.3 → 1.6.0

package/dist/bundle.cjs

@@ -136,7 +136,6 @@ const qstartsWithWith = (comparator) => curry2((start, s) => {
     return true;
 });
 
-// TODO: qoverProp, qover array ?
 /** Then next fns seem to be excess due to their safe ver performance should be the same or better:
  * qflat, qpick
  */
@@ -144,7 +143,7 @@ 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));
 // strategy is for arrays: 1->clean, 2->merge, 3->push.
-const mergeDeep$1 = curry3((strategy, o1, o2) => {
+const mergeDeep$1 = (strategy) => curry2((o1, o2) => {
     for (let k in o2) {
         switch (type(o2[k])) {
             case 'Array':
@@ -154,7 +153,7 @@ const mergeDeep$1 = curry3((strategy, o1, o2) => {
                             const o1k = o1[k], o2k = o2[k];
                             for (const i in o2k)
                                 if (o1k[i])
-                                    mergeDeep$1(strategy, o1k[i], o2k[i]);
+                                    mergeDeep$1(strategy)(o1k[i], o2k[i]);
                                 else
                                     o1k[i] = o2k[i];
                             break;
@@ -165,7 +164,7 @@ const mergeDeep$1 = curry3((strategy, o1, o2) => {
                 break;
             case 'Object':
                 if (type(o1[k]) === 'Object') {
-                    mergeDeep$1(strategy, o1[k], o2[k]);
+                    mergeDeep$1(strategy)(o1[k], o2[k]);
                     break;
                 }
             default:
@@ -195,7 +194,7 @@ const qmapKeys = curry2((keyMap, o) => {
     return o;
 });
 const qmap = curry2((pipe, arr) => {
-    for (let i in arr)
+    for (const i in arr)
         arr[i] = pipe(arr[i], +i, arr);
     return arr;
 });
@@ -247,6 +246,8 @@ 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. */
+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);
@@ -273,10 +274,14 @@ const bind = curry2((fn, context) => fn.bind(context));
 const nth = curry2((i, data) => data[i]);
 const slice = curry3((from, to, o) => o.slice(from, (isNum(to) ? to : inf)));
 const flip = (fn) => curry2((b, a) => fn(a, b));
-/** @returns first element of an array. */
+/** @returns first element of an array or a string. */
 const head = nth(0);
-/** @returns last element of an array. */
+/** @returns last element of an array or a string. */
 const tail = slice(1, inf);
+/** Returns last element of an array, readonly array or a string.
+ * @param s Array to extract that element.
+ * @returns undefined if s is empty or last element. */
+const last = (s) => s[length(s) - 1];
 /** @param a @param b @returns a+b  */
 const add = curry2((a, b) => a + b);
 /** @param a @param b @returns b-a  */
@@ -295,11 +300,10 @@ 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));
-const divide = curry2((n, m) => n / m);
+const divide = curry2((a, b) => b / a);
 const always = (s) => () => s;
 const identity = (s) => s;
 const trim = (s) => s.trim();
-const last = (s) => s[length(s) - 1];
 /** @param start string | any[] @param s string | any[] */
 const startsWith = qstartsWithWith((x, y) => equals(x, y));
 const not = (x) => !x;
@@ -343,14 +347,13 @@ const range = curry2((from, to) => genBy(add(from), to - from));
 const uniq = (xs) => qreduce((accum, x) => find(equals(x), accum) ? accum : qappend(x, accum), [], xs);
 const intersection = curry2((xs1, xs2) => xs1.filter(flip(includes)(xs2)));
 const diff = curry2((_xs1, _xs2) => {
-    // BUG: if _xs1 is empty, results in [undefined, ...]
     let len1 = length(_xs1);
-    let len2 = length(_xs2); // xs2 should be shorter 4 Set mem consumption.
-    const xs1 = len1 > len2 ? _xs1 : _xs2; // ['qwe', 'qwe2'].
-    const xs2 = len1 > len2 ? _xs2 : _xs1; // [].
-    if (len1 <= len2)
+    let len2 = length(_xs2);
+    const xs1 = len1 > len2 ? _xs1 : _xs2;
+    const xs2 = len1 > len2 ? _xs2 : _xs1;
+    if (len1 < len2)
         [len1, len2] = [len2, len1];
-    const xset2 = new Set(xs2); // empty set.
+    const xset2 = new Set(xs2);
     const common = new Set();
     const out = [];
     let i;
@@ -378,7 +381,10 @@ const once = (fn) => {
         return cache = fn(...args);
     };
 };
-const reverse = (xs) => compose((ln) => reduce((nxs, _, i) => qappend(xs[ln - i], nxs), [], xs), add(-1), length)(xs);
+const reverse = (xs) => {
+    const ln = length(xs) - 1;
+    return map((_, i) => xs[ln - i], xs);
+};
 const explore = (caption, level = 'log') => tap((v) => console[level](caption, v));
 const cond = curry2((pairs, s) => {
     for (const [cond, fn] of pairs)
@@ -444,7 +450,6 @@ const freezeShallow = (o) => qfreezeShallow(clone(o));
  *  @param array T2[]
 */
 const reduce = curry3((reducer, accum, arr) => qreduce(reducer, clone(accum), arr));
-const pickBy = curry2((cond, o) => filter(cond, o));
 const pick = curry2((props, o) => {
     const out = {};
     for (const p of props)
@@ -452,6 +457,7 @@ const pick = curry2((props, o) => {
             out[p] = o[p];
     return out;
 });
+const pickBy = curry2((cond, o) => compose(flip(pick)(o), qfilter(cond), keys)(o));
 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)));
@@ -486,15 +492,26 @@ const replace = curry3((a, b, where
 const filter = curry2((cond, data) => isArray(data)
     ? data.filter(cond)
     : qfilter(cond, { ...data }));
-const memoize = (fn) => {
-    let cache;
-    let cached = false;
-    return () => cached ? cache : (cached = true, cache = fn());
-};
+/** Saves result of a function with given key and avoids calling it again.
+ * @param {(...args: Args) string} keyGen that takes the same args and returns a key for the cache.
+ * @param {(...args: Args) any} fn to be cached.
+*/
+const memoize = curry2((keyGen, fn) => {
+    const cache = {};
+    return (...args) => {
+        const key = keyGen(...args);
+        if (key in cache)
+            return cache[key];
+        const res = fn(...args);
+        cache[key] = res;
+        return res;
+    };
+});
 const mergeShallow = curry2((o1, o2) => Object.assign({}, o1, o2));
-const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), clone(b)));
-const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), clone(b)));
-const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), clone(b)));
+const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), b));
+const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), b));
+const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
+/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
 const overProp = curry3((prop, pipe, data) => assoc(prop, pipe(data[prop]), data));
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, Object.assign({}, o)));
@@ -519,12 +536,12 @@ const some = any;
 const ecran = '\\';
 // TODO: make it splicy, not accumulatie by symbols.
 /** Supports ecrans: '\\{"json": {yes} \\}'
-  @returns get_tmpl(one{meme}two)({meme: 42}) -> one42two */
+  @returns getTmpl('one{meme}two')({meme: 42}) -> one42two */
 const getTmpl = (tmpl) => {
     const parts = [];
     const keymap = [];
     const len = tmpl.length;
-    let i = 0, s, ln, start = 0, open = false, hasEcran = head(tmpl), hasEcranNext = false, nextChar;
+    let i = 0, s, ln, start = 0, open = false, hasEcran = false, hasEcranNext = false, nextChar;
     for (i = 0; i < len; i++) {
         s = tmpl[i];
         switch (s) {
@@ -703,6 +720,7 @@ exports.qmergeDeepAdd = qmergeDeepAdd;
 exports.qmergeDeepX = qmergeDeepX;
 exports.qmergeShallow = qmergeShallow;
 exports.qomit = qomit;
+exports.qoverProp = qoverProp;
 exports.qprepend = qprepend;
 exports.qreduce = qreduce;
 exports.qreverse = qreverse;

package/dist/bundle.d.ts

@@ -1,15 +1,21 @@
 // Generated by dts-bundle-generator v9.5.1
 
+type AnyArgs = any[];
+type AnyArray<T = any> = T[] | readonly T[];
+type Split<S extends string> = S extends `${infer U}${infer V}` ? [
+	U,
+	...Split<V>
+] : [
+];
+type IndexesOfArray<A> = Exclude<keyof A, keyof [
+]>;
 export type Cond = (x1?: any, x2?: any, x3?: any) => boolean;
 export interface AnyObject {
 	[k: string]: any;
 }
-export type AnyArgs = any[];
 export type Reducer<T = any> = (accum: T, cur: any, index: number) => T;
 export type AnyFunc<ReturnT = any, Args extends AnyArgs = AnyArgs> = (...args: Args) => ReturnT;
-export type TupleFn<ARG1 = any, ARG2 = any, Out = any> = (a: ARG1, b: ARG2) => Out;
 export type Curried<Args extends AnyArgs = AnyArgs, ReturnT = any> = (arg: Args[number]) => Curried<Args> | ReturnT;
-export type BasicType = "String" | "Object" | "Number" | "Symbol" | "Array" | "Null" | "Undefined";
 type Placeholder = symbol;
 export declare const __: Placeholder;
 export declare const curry: (fn: AnyFunc) => (...args: AnyArgs) => any;
@@ -33,7 +39,7 @@ export declare const typeIs: {
 	(a: string): (b: any) => boolean;
 	(a: string, b: any): boolean;
 };
-declare const length$1: (s: any[] | string) => number;
+declare const length$1: (s: AnyArray | string) => number;
 export declare const isNil: (s: any) => boolean;
 export declare const eq: {
 	(a: symbol, b: any): (a: any) => boolean;
@@ -78,10 +84,10 @@ export declare const bind: {
 	(a: any, b: any): any;
 };
 export declare const nth: {
-	(a: symbol, b: string | unknown[]): (a: number) => unknown;
-	(a: number, b: symbol): (b: string | unknown[]) => unknown;
-	(a: number): (b: string | unknown[]) => unknown;
-	(a: number, b: string | unknown[]): unknown;
+	(a: symbol, b: string | any[]): (a: number) => any;
+	(a: number, b: symbol): (b: string | any[]) => any;
+	(a: number): (b: string | any[]) => any;
+	(a: number, b: string | any[]): any;
 };
 export declare const slice: (...args: AnyArgs) => any;
 export declare const flip: <T extends AnyFunc>(fn: T) => {
@@ -90,10 +96,42 @@ export declare const flip: <T extends AnyFunc>(fn: T) => {
 	(a: Parameters<T>[1]): (b: Parameters<T>[0]) => any;
 	(a: Parameters<T>[1], b: Parameters<T>[0]): any;
 };
-/** @returns first element of an array. */
-export declare const head: <T = any>(xs: T[] | string) => T;
-/** @returns last element of an array. */
-export declare const tail: any;
+type FirstChar<T extends string> = T extends `${infer First}${string}` ? Split<T>["length"] extends 1 ? T : FirstChar<First> : T;
+type HeadOverload = {
+	<T extends string>(s: T): FirstChar<T>;
+	<T extends readonly any[]>(s: T): T extends Array<0> ? undefined : T extends readonly [
+		infer U,
+		...any[]
+	] ? U : T extends (infer Y)[] ? Y : any;
+	<T extends any>(s: T[]): null;
+};
+/** @returns first element of an array or a string. */
+export declare const head: HeadOverload;
+type Tail<T extends string> = T extends `${string}${infer Tail}` ? Tail : T extends "" ? "" : string;
+type TailOverload = {
+	<T extends string>(s: T): Tail<T>;
+	<T extends readonly any[]>(s: T): T extends Array<0> ? [
+	] : T extends readonly [
+		any,
+		...infer U
+	] ? U : T;
+	<T extends any>(s: T[]): null;
+};
+/** @returns last element of an array or a string. */
+export declare const tail: TailOverload;
+type LastChar<T extends string> = T extends `${string}${infer Rest}` ? (Split<T>["length"] extends 1 ? T : LastChar<Rest>) : T;
+type LastOverload = {
+	<T extends string>(s: T): LastChar<T>;
+	<T extends readonly any[]>(s: T): T extends Array<0> ? undefined : T extends readonly [
+		...any[],
+		infer U
+	] ? U : T extends (infer Y)[] ? Y : any;
+	<T extends any>(s: T[]): null;
+};
+/** Returns last element of an array, readonly array or a string.
+ * @param s Array to extract that element.
+ * @returns undefined if s is empty or last element. */
+export declare const last: LastOverload;
 /** @param a @param b @returns a+b  */
 export declare const add: {
 	(a: symbol, b: number): (a: number) => number;
@@ -144,10 +182,10 @@ export declare const lte: {
 	(a: number, b: number): boolean;
 };
 export declare const sort: {
-	(a: symbol, b: any[]): (a: any) => any[];
-	(a: any, b: symbol): (b: any[]) => any[];
-	(a: any): (b: any[]) => any[];
-	(a: any, b: any[]): any[];
+	(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 find: {
 	(a: symbol, b: any[]): (a: Cond) => any;
@@ -174,9 +212,8 @@ export declare const divide: {
 	(a: number, b: number): number;
 };
 export declare const always: <T = any>(s: T) => () => T;
-export declare const identity: (s: any) => any;
+export declare const identity: <T = any>(s: T) => T;
 export declare const trim: (s: string) => string;
-export declare const last: (s: any[] | string) => any;
 /** @param start string | any[] @param s string | any[] */
 export declare const startsWith: {
 	(a: symbol, b: string | any[]): (a: string | any[]) => boolean;
@@ -190,11 +227,9 @@ type NotOverload = {
 	(x: any): boolean;
 };
 export declare const not: NotOverload;
-type IndexesOfArray<A> = Exclude<keyof A, keyof [
-]>;
 type KeysOverload = {
-	<T extends any[]>(o: T): string[];
 	<T extends readonly any[]>(o: T): IndexesOfArray<T>[];
+	<T extends any[]>(o: T): string[];
 	<T extends AnyObject>(o: T): (keyof T)[];
 };
 export declare const keys: KeysOverload;
@@ -284,7 +319,7 @@ export declare const genBy: {
 	(a: (i: number) => any, b: number): any[];
 };
 export declare const once: <Func extends AnyFunc>(fn: Func) => (...args: Parameters<Func>) => any;
-export declare const reverse: (xs: any[]) => any;
+export declare const reverse: <T extends unknown>(xs: T[]) => T[];
 export declare const explore: (caption: string, level?: string) => (b: any) => any;
 export declare const cond: {
 	(a: symbol, b: any): (a: [
@@ -361,18 +396,18 @@ export declare const freezeShallow: <T extends AnyObject>(o: T) => Readonly<T>;
  *  @param array T2[]
 */
 export declare const reduce: (...args: AnyArgs) => any;
-export declare const pickBy: {
-	(a: symbol, b: AnyObject): (a: Cond) => any;
-	(a: Cond, b: symbol): (b: AnyObject) => any;
-	(a: Cond): (b: AnyObject) => any;
-	(a: Cond, b: AnyObject): any;
-};
 export declare const pick: {
 	(a: symbol, b: AnyObject): (a: string[]) => {};
 	(a: string[], b: symbol): (b: AnyObject) => {};
 	(a: string[]): (b: AnyObject) => {};
 	(a: string[], b: AnyObject): {};
 };
+export declare const pickBy: {
+	(a: symbol, b: AnyObject): (a: Cond) => any;
+	(a: Cond, b: symbol): (b: AnyObject) => any;
+	(a: Cond): (b: AnyObject) => any;
+	(a: Cond, b: AnyObject): any;
+};
 export declare const omit: {
 	(a: symbol, b: AnyObject): (a: string[]) => any;
 	(a: string[], b: symbol): (b: AnyObject) => any;
@@ -425,7 +460,16 @@ export declare const filter: {
 	(a: (v: any, k: string | number) => boolean): (b: any[] | AnyObject) => any;
 	(a: (v: any, k: string | number) => boolean, b: any[] | AnyObject): any;
 };
-export declare const memoize: (fn: Function) => () => any;
+/** Saves result of a function with given key and avoids calling it again.
+ * @param {(...args: Args) string} keyGen that takes the same args and returns a key for the cache.
+ * @param {(...args: Args) any} fn to be cached.
+*/
+export declare const memoize: {
+	(a: symbol, b: AnyFunc<any, any[]>): (a: (...args: any[]) => string) => (...args: any[]) => any;
+	(a: (...args: any[]) => string, b: symbol): (b: AnyFunc<any, any[]>) => (...args: any[]) => any;
+	(a: (...args: any[]) => string): (b: AnyFunc<any, any[]>) => (...args: any[]) => any;
+	(a: (...args: any[]) => string, b: AnyFunc<any, any[]>): (...args: any[]) => any;
+};
 export declare const mergeShallow: {
 	(a: symbol, b: AnyObject): (a: AnyObject) => AnyObject;
 	(a: AnyObject, b: symbol): (b: AnyObject) => AnyObject;
@@ -450,6 +494,7 @@ export declare const mergeDeepAdd: {
 	(a: AnyObject): (b: AnyObject) => AnyObject;
 	(a: AnyObject, b: AnyObject): AnyObject;
 };
+/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
 export declare const overProp: (...args: AnyArgs) => any;
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 export declare const mapKeys: {
@@ -485,9 +530,9 @@ export declare const zipObj: {
  * @param b T2[]
  */
 export declare const zipWith: (...args: AnyArgs) => any;
-export declare const mirror: (s: any) => any;
-export declare const reflect: (s: any) => any;
-export declare const echo: (s: any) => 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 notf: (fn: AnyFunc) => (...args: any) => boolean | any;
 export declare const push: {
 	(a: symbol, b: any[]): (a: any) => any[];
@@ -512,9 +557,24 @@ export declare const qappend: {
 };
 export declare const qassoc: (...args: AnyArgs) => any;
 export declare const qreduce: (...args: AnyArgs) => any;
-export declare const qmergeDeep: any;
-export declare const qmergeDeepX: any;
-export declare const qmergeDeepAdd: any;
+export declare const qmergeDeep: {
+	(a: symbol, b: AnyObject): (a: AnyObject) => AnyObject;
+	(a: AnyObject, b: symbol): (b: AnyObject) => AnyObject;
+	(a: AnyObject): (b: AnyObject) => AnyObject;
+	(a: AnyObject, b: AnyObject): AnyObject;
+};
+export declare const qmergeDeepX: {
+	(a: symbol, b: AnyObject): (a: AnyObject) => AnyObject;
+	(a: AnyObject, b: symbol): (b: AnyObject) => AnyObject;
+	(a: AnyObject): (b: AnyObject) => AnyObject;
+	(a: AnyObject, b: AnyObject): AnyObject;
+};
+export declare const qmergeDeepAdd: {
+	(a: symbol, b: AnyObject): (a: AnyObject) => AnyObject;
+	(a: AnyObject, b: symbol): (b: AnyObject) => AnyObject;
+	(a: AnyObject): (b: AnyObject) => AnyObject;
+	(a: AnyObject, b: AnyObject): AnyObject;
+};
 export declare const qmergeShallow: {
 	(a: symbol, b: AnyObject): (a: AnyObject) => AnyObject;
 	(a: AnyObject, b: symbol): (b: AnyObject) => AnyObject;
@@ -554,7 +614,8 @@ export declare const qfilter: {
 	(a: (v: any, k: string | number) => boolean): (b: any[] | AnyObject) => any[] | AnyObject;
 	(a: (v: any, k: string | number) => boolean, b: any[] | AnyObject): any[] | AnyObject;
 };
-export declare const qempty: (o: AnyObject | any[]) => any[] | AnyObject;
+export declare const qempty: <T extends any[] | AnyObject>(o: T) => T extends any[] ? [
+] : {};
 export declare const qfreeze: <T extends AnyObject>(o: T) => Readonly<T>;
 export declare const qfreezeShallow: <T extends AnyObject>(o: T) => Readonly<T>;
 export declare const qprepend: {
@@ -578,9 +639,11 @@ 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. */
+export declare const qoverProp: (...args: AnyArgs) => any;
 type StrTmpl = ((data: AnyObject) => string);
 /** Supports ecrans: '\\{"json": {yes} \\}'
-  @returns get_tmpl(one{meme}two)({meme: 42}) -> one42two */
+  @returns getTmpl('one{meme}two')({meme: 42}) -> one42two */
 export declare const getTmpl: (tmpl: string) => StrTmpl;
 /** One promise waits for another. */
 export declare const forEachSerial: {

package/dist/bundle.mjs

@@ -134,7 +134,6 @@ const qstartsWithWith = (comparator) => curry2((start, s) => {
     return true;
 });
 
-// TODO: qoverProp, qover array ?
 /** Then next fns seem to be excess due to their safe ver performance should be the same or better:
  * qflat, qpick
  */
@@ -142,7 +141,7 @@ 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));
 // strategy is for arrays: 1->clean, 2->merge, 3->push.
-const mergeDeep$1 = curry3((strategy, o1, o2) => {
+const mergeDeep$1 = (strategy) => curry2((o1, o2) => {
     for (let k in o2) {
         switch (type(o2[k])) {
             case 'Array':
@@ -152,7 +151,7 @@ const mergeDeep$1 = curry3((strategy, o1, o2) => {
                             const o1k = o1[k], o2k = o2[k];
                             for (const i in o2k)
                                 if (o1k[i])
-                                    mergeDeep$1(strategy, o1k[i], o2k[i]);
+                                    mergeDeep$1(strategy)(o1k[i], o2k[i]);
                                 else
                                     o1k[i] = o2k[i];
                             break;
@@ -163,7 +162,7 @@ const mergeDeep$1 = curry3((strategy, o1, o2) => {
                 break;
             case 'Object':
                 if (type(o1[k]) === 'Object') {
-                    mergeDeep$1(strategy, o1[k], o2[k]);
+                    mergeDeep$1(strategy)(o1[k], o2[k]);
                     break;
                 }
             default:
@@ -193,7 +192,7 @@ const qmapKeys = curry2((keyMap, o) => {
     return o;
 });
 const qmap = curry2((pipe, arr) => {
-    for (let i in arr)
+    for (const i in arr)
         arr[i] = pipe(arr[i], +i, arr);
     return arr;
 });
@@ -245,6 +244,8 @@ 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. */
+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);
@@ -271,10 +272,14 @@ const bind = curry2((fn, context) => fn.bind(context));
 const nth = curry2((i, data) => data[i]);
 const slice = curry3((from, to, o) => o.slice(from, (isNum(to) ? to : inf)));
 const flip = (fn) => curry2((b, a) => fn(a, b));
-/** @returns first element of an array. */
+/** @returns first element of an array or a string. */
 const head = nth(0);
-/** @returns last element of an array. */
+/** @returns last element of an array or a string. */
 const tail = slice(1, inf);
+/** Returns last element of an array, readonly array or a string.
+ * @param s Array to extract that element.
+ * @returns undefined if s is empty or last element. */
+const last = (s) => s[length(s) - 1];
 /** @param a @param b @returns a+b  */
 const add = curry2((a, b) => a + b);
 /** @param a @param b @returns b-a  */
@@ -293,11 +298,10 @@ 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));
-const divide = curry2((n, m) => n / m);
+const divide = curry2((a, b) => b / a);
 const always = (s) => () => s;
 const identity = (s) => s;
 const trim = (s) => s.trim();
-const last = (s) => s[length(s) - 1];
 /** @param start string | any[] @param s string | any[] */
 const startsWith = qstartsWithWith((x, y) => equals(x, y));
 const not = (x) => !x;
@@ -341,14 +345,13 @@ const range = curry2((from, to) => genBy(add(from), to - from));
 const uniq = (xs) => qreduce((accum, x) => find(equals(x), accum) ? accum : qappend(x, accum), [], xs);
 const intersection = curry2((xs1, xs2) => xs1.filter(flip(includes)(xs2)));
 const diff = curry2((_xs1, _xs2) => {
-    // BUG: if _xs1 is empty, results in [undefined, ...]
     let len1 = length(_xs1);
-    let len2 = length(_xs2); // xs2 should be shorter 4 Set mem consumption.
-    const xs1 = len1 > len2 ? _xs1 : _xs2; // ['qwe', 'qwe2'].
-    const xs2 = len1 > len2 ? _xs2 : _xs1; // [].
-    if (len1 <= len2)
+    let len2 = length(_xs2);
+    const xs1 = len1 > len2 ? _xs1 : _xs2;
+    const xs2 = len1 > len2 ? _xs2 : _xs1;
+    if (len1 < len2)
         [len1, len2] = [len2, len1];
-    const xset2 = new Set(xs2); // empty set.
+    const xset2 = new Set(xs2);
     const common = new Set();
     const out = [];
     let i;
@@ -376,7 +379,10 @@ const once = (fn) => {
         return cache = fn(...args);
     };
 };
-const reverse = (xs) => compose((ln) => reduce((nxs, _, i) => qappend(xs[ln - i], nxs), [], xs), add(-1), length)(xs);
+const reverse = (xs) => {
+    const ln = length(xs) - 1;
+    return map((_, i) => xs[ln - i], xs);
+};
 const explore = (caption, level = 'log') => tap((v) => console[level](caption, v));
 const cond = curry2((pairs, s) => {
     for (const [cond, fn] of pairs)
@@ -442,7 +448,6 @@ const freezeShallow = (o) => qfreezeShallow(clone(o));
  *  @param array T2[]
 */
 const reduce = curry3((reducer, accum, arr) => qreduce(reducer, clone(accum), arr));
-const pickBy = curry2((cond, o) => filter(cond, o));
 const pick = curry2((props, o) => {
     const out = {};
     for (const p of props)
@@ -450,6 +455,7 @@ const pick = curry2((props, o) => {
             out[p] = o[p];
     return out;
 });
+const pickBy = curry2((cond, o) => compose(flip(pick)(o), qfilter(cond), keys)(o));
 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)));
@@ -484,15 +490,26 @@ const replace = curry3((a, b, where
 const filter = curry2((cond, data) => isArray(data)
     ? data.filter(cond)
     : qfilter(cond, { ...data }));
-const memoize = (fn) => {
-    let cache;
-    let cached = false;
-    return () => cached ? cache : (cached = true, cache = fn());
-};
+/** Saves result of a function with given key and avoids calling it again.
+ * @param {(...args: Args) string} keyGen that takes the same args and returns a key for the cache.
+ * @param {(...args: Args) any} fn to be cached.
+*/
+const memoize = curry2((keyGen, fn) => {
+    const cache = {};
+    return (...args) => {
+        const key = keyGen(...args);
+        if (key in cache)
+            return cache[key];
+        const res = fn(...args);
+        cache[key] = res;
+        return res;
+    };
+});
 const mergeShallow = curry2((o1, o2) => Object.assign({}, o1, o2));
-const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), clone(b)));
-const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), clone(b)));
-const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), clone(b)));
+const mergeDeep = curry2((a, b) => qmergeDeep(clone(a), b));
+const mergeDeepX = curry2((a, b) => qmergeDeepX(clone(a), b));
+const mergeDeepAdd = curry2((a, b) => qmergeDeepAdd(clone(a), b));
+/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
 const overProp = curry3((prop, pipe, data) => assoc(prop, pipe(data[prop]), data));
 /** mapKeys({ a: 'b' }, { a: 44 }) -> { b: 44 } */
 const mapKeys = curry2((keyMap, o) => qmapKeys(keyMap, Object.assign({}, o)));
@@ -517,12 +534,12 @@ const some = any;
 const ecran = '\\';
 // TODO: make it splicy, not accumulatie by symbols.
 /** Supports ecrans: '\\{"json": {yes} \\}'
-  @returns get_tmpl(one{meme}two)({meme: 42}) -> one42two */
+  @returns getTmpl('one{meme}two')({meme: 42}) -> one42two */
 const getTmpl = (tmpl) => {
     const parts = [];
     const keymap = [];
     const len = tmpl.length;
-    let i = 0, s, ln, start = 0, open = false, hasEcran = head(tmpl), hasEcranNext = false, nextChar;
+    let i = 0, s, ln, start = 0, open = false, hasEcran = false, hasEcranNext = false, nextChar;
     for (i = 0; i < len; i++) {
         s = tmpl[i];
         switch (s) {
@@ -593,4 +610,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, 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, 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.4.3",
+  "version": "1.6.0",
   "ava": {
     "files": [
       "./test/specs/*.ts"
@@ -67,7 +67,7 @@
     "dts-bundle-generator": "^9.5.1",
     "nyc": "^15.1.0",
     "prepend": "^1.0.2",
-    "rollup": "^4.16.1",
+    "rollup": "^4.17.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "ts-node": "^10.9.2",
     "tslint": "^6.1.3",

package/src/common.ts

@@ -1,4 +1,5 @@
 import { curry2 } from "./curry"
+import { AnyArray } from "./internal_types"
 import { to, isNull, isStr, isUndef } from "./utils"
 
 // It's faster that toUpperCase() !
@@ -14,7 +15,7 @@ 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: any[] | string) => s.length
+export const length = (s: AnyArray | string) => s.length
 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

@@ -1,4 +1,5 @@
-import { AnyFunc, AnyArgs } from "./types"
+import { AnyArgs } from "./internal_types"
+import { AnyFunc } from "./types"
 
 type Placeholder = symbol
 export const __: Placeholder = Symbol('Placeholder')

package/src/internal_types.ts

@@ -0,0 +1,7 @@
+export type AnyArgs = any[]
+export type BasicType = 'String'|'Object'|'Number'|'Symbol'|'Array'|'Null'|'Undefined'
+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 []>

package/src/quick.ts

@@ -2,8 +2,6 @@ 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"
-// TODO: qoverProp, qover array ?
-
 /** Then next fns seem to be excess due to their safe ver performance should be the same or better:
  * qflat, qpick
  */
@@ -12,7 +10,7 @@ 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 })
 export const qreduce = curry3(<T>(fn: Reducer, accum: any, arr: T[]) => arr.reduce(fn, accum))
 // strategy is for arrays: 1->clean, 2->merge, 3->push.
-const mergeDeep = curry3((strategy: 1|2|3, o1: AnyObject, o2: AnyObject): AnyObject => {
+const mergeDeep = (strategy: 1|2|3) => curry2((o1: AnyObject, o2: AnyObject): AnyObject => {
   for(let k in o2) {
     switch(type(o2[k])) {
       case 'Array':
@@ -21,7 +19,7 @@ const mergeDeep = curry3((strategy: 1|2|3, o1: AnyObject, o2: AnyObject): AnyObj
             case 2:
               const o1k = o1[k], o2k = o2[k]
               for(const i in o2k)
-                if(o1k[i]) mergeDeep(strategy, o1k[i], o2k[i])
+                if(o1k[i]) mergeDeep(strategy)(o1k[i], o2k[i])
                 else o1k[i] = o2k[i]
               break
             case 3: o1[k].push(...o2[k])
@@ -31,7 +29,7 @@ const mergeDeep = curry3((strategy: 1|2|3, o1: AnyObject, o2: AnyObject): AnyObj
         break
       case 'Object':
         if(type(o1[k])==='Object') {
-          mergeDeep(strategy, o1[k], o2[k])
+          mergeDeep(strategy)(o1[k], o2[k])
           break
         }
       default:
@@ -65,7 +63,7 @@ export const qmapKeys = curry2(
 )
 export const qmap = curry2(
   (pipe: (s: any, i?: number, list?: any[]) => any, arr: any[]) => {
-    for(let i in arr) arr[i] = pipe(arr[i], +i, arr)
+    for(const i in arr) arr[i] = pipe(arr[i], +i, arr)
     return arr
   }
 )
@@ -93,10 +91,10 @@ export const qfilter = curry2(
     return data
   }
 )
-export const qempty = (o: AnyObject|any[]) => {
+export const qempty = <T extends AnyObject|any[]>(o: T): T extends any[] ? [] : {} => {
   if(isArray(o)) o.splice(0)
   else for(const i in o) delete o[i]
-  return o
+  return o as any
 }
 export const qfreeze = <T extends AnyObject>(o: T): Readonly<T> => {
   let v: any
@@ -124,4 +122,9 @@ export const qomit = curry2(
   )
 )
 /** @param start string | any[] @param s string | any[] */
-export const qstartsWith = qstartsWithWith(eq)
+export const qstartsWith = qstartsWithWith(eq)
+/** @param prop string @param pipe(data[prop]) @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)
+)

package/src/safe.ts

@@ -1,8 +1,9 @@
 import { __, curry, curry2, curry3 } from './curry'
-import { isNum, undef, isNull, isArray, isFunc, isObj, inf } from './utils'
+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 { Split, AnyArray, IndexesOfArray } from './internal_types'
 // over, lensProp
 
 export const take = (argN: number) => (...args: any[]) => args[argN]
@@ -38,10 +39,8 @@ export const compose = (
       return s as any as TOut
     }
 )
-export const bind = curry2<AnyFunc>(
-  (fn: AnyFunc, context: any) => fn.bind(context)
-)
-export const nth = curry2(<T=any>(i: number, data: T[] | string) => data[i])
+export const bind = curry2<AnyFunc>((fn: AnyFunc, context: any) => fn.bind(context))
+export const nth = curry2((i: number, data: any[] | string) => data[i])
 export const slice = curry3(
   (from: number, to: number, o: any[] | string) =>
     o.slice(from, (isNum(to)?to:inf) as number)
@@ -49,10 +48,42 @@ export const slice = curry3(
 export const flip = <T extends AnyFunc>(fn: T) => curry2(
   (b: Parameters<T>[1], a: Parameters<T>[0]) => fn(a, b)
 )
-/** @returns first element of an array. */
-export const head = nth(0) as <T = any>(xs: T[] | string) => T
-/** @returns last element of an array. */
-export const tail = slice(1, inf)
+type FirstChar<T extends string> = T extends `${infer First}${string}`
+  ? Split<T>['length'] extends 1 ? T : FirstChar<First>
+  : T
+type HeadOverload = {
+  <T extends string>(s: T): FirstChar<T>
+  <T extends readonly any[]>(s: T): T extends Array<0> ? undefined
+    : T extends readonly [infer U, ...any[]] ? U
+      : T extends (infer Y)[] ? Y : any
+  <T extends any>(s: T[]): null
+}
+/** @returns first element of an array or a string. */
+export const head = nth(0) as HeadOverload
+type Tail<T extends string> = T extends `${string}${infer Tail}`
+  ? Tail : T extends '' ? '' : string
+type TailOverload = {
+  <T extends string>(s: T): Tail<T>
+  <T extends readonly any[]>(s: T): T extends Array<0> ? []
+    : T extends readonly [any, ...infer U] ? U : T
+  <T extends any>(s: T[]): null
+}
+/** @returns last element of an array or a string. */
+export const tail = slice(1, inf) as TailOverload
+type LastChar<T extends string> = T extends `${string}${infer Rest}`
+  ? (Split<T>['length'] extends 1 ? T : LastChar<Rest>) : T
+type LastOverload = {
+  <T extends string>(s: T): LastChar<T>
+  <T extends readonly any[]>(s: T): T extends Array<0>
+    ? undefined
+    : T extends readonly [...any[], infer U] ? U
+      : T extends (infer Y)[] ? Y : any
+  <T extends any>(s: T[]): null
+}
+/** Returns last element of an array, readonly array or a string.
+ * @param s Array to extract that element.
+ * @returns undefined if s is empty or last element. */
+export const last: LastOverload = (s: string | AnyArray) => s[length(s)-1]
 /** @param a @param b @returns a+b  */
 export const add = curry2((a: number, b: number) => a+b)
 /** @param a @param b @returns b-a  */
@@ -67,15 +98,15 @@ export const lt = curry2( (a: number, b: number) => a>b )
 export const gte = curry2( (a: number, b: number) => a<=b )
 /** @param a @param b @returns a≥b  */
 export const lte = curry2( (a: number, b: number) => a>=b )
-export const sort = curry2((sortFn: any, xs: any[]) => xs.sort(sortFn))
+export const sort = curry2((sortFn: (a: any, b: any) => number , xs: any[]) => xs.sort(sortFn))
 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((n: number, m: number) => n/m)
+export const divide = curry2((a: number, b: number) => b/a)
 export const always = <T=any>(s: T) => () => s
-export const identity = (s: any) => s
+export const identity = <T=any>(s: T) => s
 export const trim = (s: string) => s.trim()
-export const last = (s: any[] | string) => s[length(s)-1]
+
 /** @param start string | any[] @param s string | any[] */
 export const startsWith = qstartsWithWith((x: any, y: any) => equals(x, y))
 type NotOverload = {
@@ -84,14 +115,12 @@ type NotOverload = {
   (x: any): boolean
 }
 export const not: NotOverload = (x: any) => !x as any
-type IndexesOfArray<A> = Exclude<keyof A, keyof []>
 type KeysOverload = {
-  <T extends any[]>(o: T): string[]
   <T extends readonly any[]>(o: T): IndexesOfArray<T>[]
+  <T extends any[]>(o: T): string[]
   <T extends AnyObject>(o: T): (keyof T)[]
 }
-export const keys: KeysOverload = (o: number[]) => Object.keys(o)
-
+export const keys: KeysOverload = (o: any) => Object.keys(o)
 export const values = (o: AnyObject | any[]) => Object.values(o)
 export const toPairs = (o: AnyObject | any[]) => Object.entries(o)
 export const test = curry2((re: RegExp, s: string) => re.test(s))
@@ -131,13 +160,12 @@ export const uniq = (xs: any[]) => qreduce(
 [], xs)
 export const intersection = curry2((xs1: any[], xs2: any[]) => xs1.filter(flip(includes)(xs2)))
 export const diff = curry2((_xs1: any[], _xs2: any[]) => {
-  // BUG: if _xs1 is empty, results in [undefined, ...]
   let len1 = length(_xs1)
-  let len2 = length(_xs2) // xs2 should be shorter 4 Set mem consumption.
-  const xs1 = len1>len2 ? _xs1 : _xs2 // ['qwe', 'qwe2'].
-  const xs2 = len1>len2 ? _xs2 : _xs1 // [].
-  if(len1<=len2) [len1, len2] = [len2, len1]
-  const xset2 = new Set(xs2) // empty set.
+  let len2 = length(_xs2)
+  const xs1 = len1>len2 ? _xs1 : _xs2
+  const xs2 = len1>len2 ? _xs2 : _xs1
+  if(len1<len2) [len1, len2] = [len2, len1]
+  const xset2 = new Set(xs2)
   const common = new Set()
   const out: any[] = []
   let i: number
@@ -166,14 +194,10 @@ export const once = <Func extends AnyFunc>(fn: Func) => {
     return cache = fn(...args)
   }
 }
-export const reverse = (xs: any[]) => compose(
-  <T>(ln: number) => reduce(
-    (nxs: T[], _: any, i: number) => qappend(xs[ln-i], nxs),
-    [], xs
-  ),
-  add(-1),
-  length
-)(xs)
+export const reverse = <T extends any>(xs: T[]): T[] => {
+  const ln = length(xs)-1
+  return map((_: any, i: number) => xs[ln-i], xs)
+}
 export const explore = (caption: string, level = 'log') => tap(
   (v: any) => console[level](caption, v)
 )
@@ -266,17 +290,16 @@ export const reduce = curry3(
   <T = any>(reducer: Reducer<T>, accum: T, arr: any[]) =>
     qreduce(reducer, clone(accum), arr)
 )
-export const pickBy = curry2(
-  (cond: Cond, o: AnyObject) => filter(cond, o)
-)
 export const pick = curry2(
   (props: string[], o: AnyObject) => {
     const out = {}
-    for(const p of props)
-      if(p in o) out[p] = o[p]
+    for(const p of props) if(p in o) out[p] = o[p]
     return out
   }
 )
+export const pickBy = curry2(
+  (cond: Cond, o: AnyObject) => compose(flip(pick)(o), qfilter(cond), keys)(o)
+)
 export const omit = curry2(
   (props: string[], o: AnyObject) => filter(
     (_: any, k: string) => !includes(k, props),
@@ -332,24 +355,37 @@ export const filter = curry2(
     ? data.filter(cond)
     : qfilter(cond, {...data})
 )
-export const memoize = (fn: Function) => {
-  let cache: any
-  let cached = false
-  return () => cached ? cache : (cached = true, cache = fn())
-}
+/** Saves result of a function with given key and avoids calling it again.
+ * @param {(...args: Args) string} keyGen that takes the same args and returns a key for the cache.
+ * @param {(...args: Args) any} fn to be cached.
+*/
+export const memoize = curry2(<Args extends any[]>(
+  keyGen: (...args: Args) => string,
+  fn: AnyFunc<any, Args>
+) => {
+  const cache: {[key in string]: ReturnType<typeof fn>} = {}
+  return (...args: Args): ReturnType<typeof fn> => {
+    const key = keyGen(...args)
+    if(key in cache) return cache[key]
+    const res = fn(...args)
+    cache[key] = res
+    return res
+  }
+})
 export const mergeShallow = curry2(
   (o1: AnyObject, o2: AnyObject): AnyObject =>
     Object.assign({}, o1, o2)
 )
 export const mergeDeep = curry2(
-  (a: AnyObject, b: AnyObject) => qmergeDeep(clone(a), clone(b)) as AnyObject
+  (a: AnyObject, b: AnyObject) => qmergeDeep(clone(a), b) as AnyObject
 )
 export const mergeDeepX = curry2(
-  (a: AnyObject, b: AnyObject) => qmergeDeepX(clone(a), clone(b)) as AnyObject
+  (a: AnyObject, b: AnyObject) => qmergeDeepX(clone(a), b) as AnyObject
 )
 export const mergeDeepAdd = curry2(
-  (a: AnyObject, b: AnyObject) => qmergeDeepAdd(clone(a), clone(b)) as AnyObject
+  (a: AnyObject, b: AnyObject) => qmergeDeepAdd(clone(a), b) as AnyObject
 )
+/** @param prop string @param pipe(data[prop]) @param data any @returns data with prop over pipe. */
 export const overProp = curry3(
   (prop: string, pipe: AnyFunc, data: any) =>
     assoc(prop, pipe(data[prop]), data)

package/src/strings.ts

@@ -6,13 +6,13 @@ const ecran = '\\'
 
 // TODO: make it splicy, not accumulatie by symbols.
 /** Supports ecrans: '\\{"json": {yes} \\}'
-  @returns get_tmpl(one{meme}two)({meme: 42}) -> one42two */
+  @returns getTmpl('one{meme}two')({meme: 42}) -> one42two */
 export const getTmpl = (tmpl: string): StrTmpl => {
   const parts: string[] = []
   const keymap: string[] = []
   const len = tmpl.length
   let i = 0, s: string, ln: number, start = 0, open = false,
-      hasEcran = head(tmpl), hasEcranNext = false, nextChar: string
+      hasEcran = false, hasEcranNext = false, nextChar: string
   for(i=0; i<len; i++) {
     s = tmpl[i]
     switch(s) {

package/src/types.ts

@@ -1,11 +1,7 @@
+import { AnyArgs } from "./internal_types"
+
 export type Cond = (x1?: any, x2?: any, x3?: any) => boolean
 export interface AnyObject { [k: string]: any }
-export type AnyArgs = any[]
 export type Reducer<T=any> = (accum: T, cur: any, index: number) => T
 export type AnyFunc<ReturnT = any, Args extends AnyArgs = AnyArgs> = (...args: Args) => ReturnT
-export type TupleFn<ARG1=any, ARG2=any, Out=any> = (a: ARG1, b: ARG2) => Out
-export type Curried<
-  Args extends AnyArgs = AnyArgs,
-  ReturnT = any
-> = (arg: Args[number]) => Curried<Args> | ReturnT
-export type BasicType = 'String'|'Object'|'Number'|'Symbol'|'Array'|'Null'|'Undefined'
+export type Curried<Args extends AnyArgs = AnyArgs, ReturnT = any> = (arg: Args[number]) => Curried<Args> | ReturnT