🐛 compatible lru-cache v7 del method and fix its overwrote issue (#96)

Author: kuitos

src/cacheAdapterEnhancer.ts

@@ -5,9 +5,9 @@
  */
 
 import { AxiosAdapter, AxiosPromise } from 'axios';
+import LRUCache from 'lru-cache';
 import buildSortedURL from './utils/buildSortedURL';
-import getDefaultLruCache, { ICacheLike } from './utils/getDefaultLruCache';
-import isCacheLike from './utils/isCacheLike';
+import isCacheLike, { ICacheLike } from './utils/isCacheLike';
 
 declare module 'axios' {
 	interface AxiosRequestConfig {
@@ -30,7 +30,7 @@ export default function cacheAdapterEnhancer(adapter: AxiosAdapter, options: Opt
 	const {
 		enabledByDefault = true,
 		cacheFlag = 'cache',
-		defaultCache = getDefaultLruCache<AxiosPromise>({ ttl: FIVE_MINUTES, max: CAPACITY }),
+		defaultCache = new LRUCache({ ttl: FIVE_MINUTES, max: CAPACITY }),
 	} = options;
 
 	return config => {
@@ -57,7 +57,7 @@ export default function cacheAdapterEnhancer(adapter: AxiosAdapter, options: Opt
 					try {
 						return await adapter(config);
 					} catch (reason) {
-						cache.del(index);
+						'delete' in cache ? cache.delete(index) : cache.del(index);
 						throw reason;
 					}
 

src/index.ts

@@ -4,21 +4,11 @@
  * @since 2017-09-28
  */
 
-import LRUCache from 'lru-cache';
+import Cache from 'lru-cache';
 import cacheAdapterEnhancer from './cacheAdapterEnhancer';
 import retryAdapterEnhancer from './retryAdapterEnhancer';
 import throttleAdapterEnhancer from './throttleAdapterEnhancer';
-import { ICacheLike } from './utils/getDefaultLruCache';
-
-class Cache<K, V> extends LRUCache<K, V> {
-	constructor(options: LRUCache.Options<any, any>) {
-		super(options);
-	}
-
-	del(key: K): boolean {
-		return super.delete(key);
-	}
-}
+import { ICacheLike } from './utils/isCacheLike';
 
 export {
 	Cache,

src/throttleAdapterEnhancer.ts

@@ -5,8 +5,9 @@
  */
 
 import { AxiosAdapter, AxiosPromise, AxiosRequestConfig } from 'axios';
+import LRUCache from 'lru-cache';
 import buildSortedURL from './utils/buildSortedURL';
-import getDefaultLruCache, { ICacheLike } from './utils/getDefaultLruCache';
+import { ICacheLike } from './utils/isCacheLike';
 
 export type RecordedCache = {
 	timestamp: number;
@@ -20,7 +21,7 @@ export type Options = {
 
 export default function throttleAdapterEnhancer(adapter: AxiosAdapter, options: Options = {}): AxiosAdapter {
 
-	const { threshold = 1000, cache = getDefaultLruCache<RecordedCache>({ max: 10 }) } = options;
+	const { threshold = 1000, cache = new LRUCache<string,  RecordedCache>({ max: 10 }) } = options;
 
 	const recordCacheWithRequest = (index: string, config: AxiosRequestConfig) => {
 
@@ -37,7 +38,7 @@ export default function throttleAdapterEnhancer(adapter: AxiosAdapter, options:
 
 				return response;
 			} catch (reason) {
-				cache.del(index);
+				'delete' in cache ? cache.delete(index) : cache.del(index);
 				throw reason;
 			}
 

src/utils/getDefaultLruCache.ts

@@ -3,8 +3,11 @@
  * @homepage https://github.com/kuitos/
  * @since 2018-03-19
  */
-import { ICacheLike } from './getDefaultLruCache';
+export type ICacheLike<T> = {
+  get(key: string): T | undefined;
+  set(key: string, value: T): void;
+} & ({ del(key: string): void } | { delete(key: string): void });
 
 export default function isCacheLike(cache: any): cache is ICacheLike<any> {
-	return typeof cache.get === 'function' && typeof cache.set === 'function' && typeof cache.del === 'function';
+	return typeof cache.get === 'function' && typeof cache.set === 'function' && (typeof cache.delete === 'function' || typeof cache.del === 'function');
 }