pepka 1.4.2 → 1.5.3

package/dist/bundle.cjs

@@ -343,11 +343,14 @@ 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) => {
-    const len1 = length(_xs1);
-    const len2 = length(_xs2); // xs2 should be shorter 4 Set mem consumption.
-    const xs1 = len1 > len2 ? _xs1 : _xs2;
-    const xs2 = len1 > len2 ? _xs2 : _xs1;
-    const xset2 = new Set(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)
+        [len1, len2] = [len2, len1];
+    const xset2 = new Set(xs2); // empty set.
     const common = new Set();
     const out = [];
     let i;
@@ -483,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

@@ -341,11 +341,14 @@ 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) => {
-    const len1 = length(_xs1);
-    const len2 = length(_xs2); // xs2 should be shorter 4 Set mem consumption.
-    const xs1 = len1 > len2 ? _xs1 : _xs2;
-    const xs2 = len1 > len2 ? _xs2 : _xs1;
-    const xset2 = new Set(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)
+        [len1, len2] = [len2, len1];
+    const xset2 = new Set(xs2); // empty set.
     const common = new Set();
     const out = [];
     let i;
@@ -481,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

@@ -35,7 +35,6 @@
     "test": "npm run gentypes && npm run prod:es && ava",
     "test:report": "nyc npm test && nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "test:lazy": "ava",
-    "dts-fix": "node dts-fix.js",
     "gentypes": "dts-bundle-generator --no-check --export-referenced-types=false -o dist/bundle.d.ts src/index.ts",
     "dev": "cross-env NODE_ENV=development BUILD=es rollup -c",
     "prod:cjs": "cross-env NODE_ENV=production BUILD=cjs rollup -c",
@@ -43,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.2",
+  "version": "1.5.3",
   "ava": {
     "files": [
       "./test/specs/*.ts"

package/src/safe.ts

@@ -131,11 +131,13 @@ 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[]) => {
-  const len1 = length(_xs1)
-  const len2 = length(_xs2) // xs2 should be shorter 4 Set mem consumption.
-  const xs1 = len1>len2 ? _xs1 : _xs2
-  const xs2 = len1>len2 ? _xs2 : _xs1
-  const xset2 = new Set(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) [len1, len2] = [len2, len1]
+  const xset2 = new Set(xs2) // empty set.
   const common = new Set()
   const out: any[] = []
   let i: number
@@ -330,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)

package/dts-fix.js

@@ -1,10 +0,0 @@
-
-// they seem to fix it.
-
-import prepend from 'prepend'
-
-const s = 'export { __ }\n'
-
-prepend('./dist/bundle.d.ts', s, function(error) {
-  if (error) console.error(error.message)
-})