remove default ttl from memo (#195)

* remove default ttl from memo

Author: sodiray

Diff for: cdn/radash.esm.js

@@ -473,23 +473,27 @@ const memoize = (cache, func, keyFunc, ttl) => {
     const key = keyFunc ? keyFunc(...args) : JSON.stringify({ args });
     const existing = cache[key];
     if (existing !== void 0) {
+      if (!existing.exp)
+        return existing.value;
       if (existing.exp > new Date().getTime()) {
         return existing.value;
       }
     }
     const result = func(...args);
     cache[key] = {
-      exp: new Date().getTime() + ttl,
+      exp: ttl ? new Date().getTime() + ttl : null,
       value: result
     };
     return result;
   };
 };
-const memo = (func, {
-  key = null,
-  ttl = 300
-} = {}) => {
-  return memoize({}, func, key, ttl);
+const memo = (func, options = {}) => {
+  return memoize(
+    {},
+    func,
+    options.key ?? null,
+    options.ttl ?? null
+  );
 };
 const debounce = ({ delay }, func) => {
   let timer = void 0;

Diff for: cdn/radash.js

@@ -476,23 +476,27 @@ var radash = (function (exports) {
       const key = keyFunc ? keyFunc(...args) : JSON.stringify({ args });
       const existing = cache[key];
       if (existing !== void 0) {
+        if (!existing.exp)
+          return existing.value;
         if (existing.exp > new Date().getTime()) {
           return existing.value;
         }
       }
       const result = func(...args);
       cache[key] = {
-        exp: new Date().getTime() + ttl,
+        exp: ttl ? new Date().getTime() + ttl : null,
         value: result
       };
       return result;
     };
   };
-  const memo = (func, {
-    key = null,
-    ttl = 300
-  } = {}) => {
-    return memoize({}, func, key, ttl);
+  const memo = (func, options = {}) => {
+    return memoize(
+      {},
+      func,
+      options.key ?? null,
+      options.ttl ?? null
+    );
   };
   const debounce = ({ delay }, func) => {
     let timer = void 0;

Diff for: cdn/radash.min.js

@@ -1,6 +1,6 @@
 {
   "name": "radash",
-  "version": "10.1.0",
+  "version": "10.2.0",
   "description": "Functional utility library - modern, simple, typed, powerful",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
@@ -48,4 +48,4 @@
   "engines": {
     "node": ">=14.18.0"
   }
-}
+}

Diff for: package.json

@@ -47,48 +47,52 @@ export const proxied = <T, K>(
   )
 }
 
-type Cache<T> = Record<string, { exp: number; value: T }>
+type Cache<T> = Record<string, { exp: number | null; value: T }>
 
 const memoize = <T>(
   cache: Cache<T>,
   func: Func<any, T>,
   keyFunc: Func<string> | null,
-  ttl: number
+  ttl: number | null
 ) => {
   return function callWithMemo(...args: any): T {
     const key = keyFunc ? keyFunc(...args) : JSON.stringify({ args })
     const existing = cache[key]
     if (existing !== undefined) {
+      if (!existing.exp) return existing.value
       if (existing.exp > new Date().getTime()) {
         return existing.value
       }
     }
     const result = func(...args)
     cache[key] = {
-      exp: new Date().getTime() + ttl,
+      exp: ttl ? new Date().getTime() + ttl : null,
       value: result
     }
     return result
   }
 }
 
 /**
- * Creates a memoized function using the key and ttl
- * options. The returned function will only execute
- * the source function when no value has previously
- * been computed or the previous value has expired
+ * Creates a memoized function. The returned function
+ * will only execute the source function when no value
+ * has previously been computed. If a ttl (milliseconds)
+ * is given previously computed values will be checked
+ * for expiration before being returned.
  */
 export const memo = <TFunc extends Function>(
   func: TFunc,
-  {
-    key = null,
-    ttl = 300
-  }: {
-    key?: Func<any, string> | null
+  options: {
+    key?: Func<any, string>
     ttl?: number
   } = {}
 ) => {
-  return memoize({}, func as any, key, ttl) as any as TFunc
+  return memoize(
+    {},
+    func as any,
+    options.key ?? null,
+    options.ttl ?? null
+  ) as any as TFunc
 }
 
 export type DebounceFunction<TArgs extends any[]> = {

Diff for: src/curry.ts

@@ -145,6 +145,15 @@ describe('curry module', () => {
       const resultB = func()
       assert.notEqual(resultA, resultB)
     })
+    test('does not call function again when first value has not expired', async () => {
+      const func = _.memo(() => new Date().getTime(), {
+        ttl: 1000
+      })
+      const resultA = func()
+      await new Promise(res => setTimeout(res, 100))
+      const resultB = func()
+      assert.equal(resultA, resultB)
+    })
   })
 
   describe('debounce function', () => {