pepka 1.4.3 → 1.5.3

package/dist/bundle.cjs

@@ -486,11 +486,21 @@ 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)));

package/dist/bundle.d.ts

@@ -425,7 +425,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;

package/dist/bundle.mjs

@@ -484,11 +484,21 @@ 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)));

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.5.3",
   "ava": {
     "files": [
       "./test/specs/*.ts"

package/src/safe.ts

@@ -332,11 +332,23 @@ 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)