From e6247c430c29406641f6a4cad7b21b9117d4be54 Mon Sep 17 00:00:00 2001 From: Angel Nikolov Date: Sat, 20 Feb 2021 22:41:21 +0200 Subject: [PATCH 1/4] Added update and remove methods to strategies. --- cacheable.decorator.ts | 6 ++--- common/DOMStorageStrategy.ts | 24 +++++++++++++++---- common/IAsyncStorageStrategy.ts | 10 +++++++- common/IStorageStrategy.ts | 10 +++++++- common/InMemoryStorageStrategy.ts | 11 ++++++++- common/LocalStorageStrategy.ts | 25 ++++++++++++++++---- karma.conf.js | 2 +- promise.cacheable.decorator.js | 1 - promise.cacheable.decorator.ts | 7 +++--- specs/observable-cacheable.decorator.spec.ts | 20 ++++++++-------- specs/promise-cacheable.decorator.spec.ts | 13 +++++++++- 11 files changed, 99 insertions(+), 30 deletions(-) diff --git a/cacheable.decorator.ts b/cacheable.decorator.ts index 9105e15..a0c6c2f 100644 --- a/cacheable.decorator.ts +++ b/cacheable.decorator.ts @@ -64,14 +64,14 @@ export function Cacheable(cacheConfig: IObservableCacheConfig = {}) { /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { /** * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } @@ -111,7 +111,7 @@ export function Cacheable(cacheConfig: IObservableCacheConfig = {}) { ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1) ) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/common/DOMStorageStrategy.ts b/common/DOMStorageStrategy.ts index 6b076c7..d71d973 100644 --- a/common/DOMStorageStrategy.ts +++ b/common/DOMStorageStrategy.ts @@ -1,5 +1,5 @@ -import { IStorageStrategy } from './IStorageStrategy'; -import { ICachePair, GlobalCacheConfig } from '.'; +import {IStorageStrategy} from './IStorageStrategy'; +import {ICachePair, GlobalCacheConfig} from '.'; /** * @deprecated Use {@link LocalStorageStrategy} instead. */ @@ -43,6 +43,14 @@ export class DOMStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } + remove(index: number, entity: any, cacheKey: string) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + } + updateAtIndex(index: number, entity: any, cacheKey: string) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -51,6 +59,14 @@ export class DOMStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } + update(index: number, entity: any, cacheKey: string) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + } + removeAll(cacheKey: string) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { @@ -59,7 +75,7 @@ export class DOMStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } - private getRawData(): { [key: string]: Array> } { + private getRawData(): {[key: string]: Array>} { const data = localStorage.getItem(this.masterCacheKey); try { return JSON.parse(data) || {}; @@ -68,7 +84,7 @@ export class DOMStorageStrategy extends IStorageStrategy { } } - private storeRawData(data: { [key: string]: Array> }): void { + private storeRawData(data: {[key: string]: Array>}): void { localStorage.setItem(this.masterCacheKey, JSON.stringify(data)); } } diff --git a/common/IAsyncStorageStrategy.ts b/common/IAsyncStorageStrategy.ts index b0fcc46..acfcf44 100644 --- a/common/IAsyncStorageStrategy.ts +++ b/common/IAsyncStorageStrategy.ts @@ -1,10 +1,18 @@ -import { ICachePair } from '.'; +import {ICachePair} from '.'; export abstract class IAsyncStorageStrategy { abstract getAll(cacheKey: string): Array> | Promise>>; abstract add(entity: ICachePair, cacheKey: string): void | Promise; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void | Promise; + abstract update?(index: number, entity: ICachePair, cacheKey: string): Promise; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void | Promise; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): Promise; abstract removeAll(cacheKey: string): void | Promise; abstract addMany(entities: ICachePair[], cacheKey: string): Promise; } \ No newline at end of file diff --git a/common/IStorageStrategy.ts b/common/IStorageStrategy.ts index 397d363..5c1536a 100644 --- a/common/IStorageStrategy.ts +++ b/common/IStorageStrategy.ts @@ -1,10 +1,18 @@ -import { ICachePair } from '.'; +import {ICachePair} from '.'; export abstract class IStorageStrategy { abstract getAll(cacheKey: string): Array>; abstract add(entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void; + abstract update?(index: number, entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): void; abstract removeAll(cacheKey: string): void; abstract addMany(entities: ICachePair[], cacheKey: string): void; } \ No newline at end of file diff --git a/common/InMemoryStorageStrategy.ts b/common/InMemoryStorageStrategy.ts index 5e36aad..4404d51 100644 --- a/common/InMemoryStorageStrategy.ts +++ b/common/InMemoryStorageStrategy.ts @@ -7,7 +7,7 @@ export class InMemoryStorageStrategy extends IStorageStrategy { add(cachePair: ICachePair) { this.cachePairs.push(cachePair) }; - + addMany(cachePairs: ICachePair[]) { this.cachePairs = cachePairs; }; @@ -17,6 +17,11 @@ export class InMemoryStorageStrategy extends IStorageStrategy { Object.assign(updatee, entity); } + update(index: number, entity: ICachePair) { + const updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + } + getAll() { return this.cachePairs; }; @@ -25,6 +30,10 @@ export class InMemoryStorageStrategy extends IStorageStrategy { this.cachePairs.splice(index, 1); } + remove(index: number) { + this.cachePairs.splice(index, 1); + } + removeAll() { this.cachePairs.length = 0; } diff --git a/common/LocalStorageStrategy.ts b/common/LocalStorageStrategy.ts index 02b1b16..9f12989 100644 --- a/common/LocalStorageStrategy.ts +++ b/common/LocalStorageStrategy.ts @@ -1,5 +1,5 @@ -import { IStorageStrategy } from './IStorageStrategy'; -import { ICachePair, GlobalCacheConfig } from '.'; +import {IStorageStrategy} from './IStorageStrategy'; +import {ICachePair, GlobalCacheConfig} from '.'; export class LocalStorageStrategy extends IStorageStrategy { private masterCacheKey: string = GlobalCacheConfig.globalCacheKey; constructor() { @@ -40,6 +40,15 @@ export class LocalStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } + + remove(index: number, entity: any, cacheKey: string) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + } + updateAtIndex(index: number, entity: any, cacheKey: string) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -48,6 +57,14 @@ export class LocalStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } + update(index: number, entity: any, cacheKey: string) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + } + removeAll(cacheKey: string) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { @@ -56,7 +73,7 @@ export class LocalStorageStrategy extends IStorageStrategy { this.storeRawData(allCachedData); } - private getRawData(): { [key: string]: Array> } { + private getRawData(): {[key: string]: Array>} { const data = localStorage.getItem(this.masterCacheKey); try { return JSON.parse(data) || {}; @@ -65,7 +82,7 @@ export class LocalStorageStrategy extends IStorageStrategy { } } - private storeRawData(data: { [key: string]: Array> }): void { + private storeRawData(data: {[key: string]: Array>}): void { localStorage.setItem(this.masterCacheKey, JSON.stringify(data)); } } diff --git a/karma.conf.js b/karma.conf.js index c1e0677..8878c25 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -40,6 +40,6 @@ module.exports = function(config) { flags: ['--no-sandbox'] } }, - singleRun: true + singleRun: false }); }; diff --git a/promise.cacheable.decorator.js b/promise.cacheable.decorator.js index 959ff57..d4b40e2 100644 --- a/promise.cacheable.decorator.js +++ b/promise.cacheable.decorator.js @@ -15,7 +15,6 @@ var removeCachePair = function (cachePairs, parameters, cacheConfig) { function PCacheable(cacheConfig) { if (cacheConfig === void 0) { cacheConfig = {}; } return function (_target, _propertyKey, propertyDescriptor) { - console.log(_propertyKey) var cacheKey = cacheConfig.cacheKey || _target.constructor.name + '#' + _propertyKey; var oldMethod = propertyDescriptor.value; if (propertyDescriptor && propertyDescriptor.value) { diff --git a/promise.cacheable.decorator.ts b/promise.cacheable.decorator.ts index 05d098b..444e037 100644 --- a/promise.cacheable.decorator.ts +++ b/promise.cacheable.decorator.ts @@ -25,14 +25,14 @@ const getResponse = (oldMethod: Function, cacheKey: string, cacheConfig: ICacheC /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { /** * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } @@ -40,6 +40,7 @@ const getResponse = (oldMethod: Function, cacheKey: string, cacheConfig: ICacheC return promiseImplementation.resolve(_foundCachePair.response); } else if (_foundPendingCachePair) { return _foundPendingCachePair.response; + } else { const response$ = (oldMethod.call(context, ...parameters) as Promise) .then(response => { @@ -59,7 +60,7 @@ const getResponse = (oldMethod: Function, cacheKey: string, cacheConfig: ICacheC ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1) ) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/specs/observable-cacheable.decorator.spec.ts b/specs/observable-cacheable.decorator.spec.ts index 749ad21..dd05ab9 100644 --- a/specs/observable-cacheable.decorator.spec.ts +++ b/specs/observable-cacheable.decorator.spec.ts @@ -18,7 +18,7 @@ strategies.forEach(s => { if (s) { GlobalCacheConfig.storageStrategy = s; } - describe('CacheableDecorator', () => { + describe(`${!s ? 'InMemoryStorageStrategy' : s.name}: CacheableDecorator`, () => { let service: IService> = null; let mockServiceCallSpy: jasmine.Spy = null; const cacheModifier = new Subject(); @@ -913,9 +913,9 @@ strategies.forEach(s => { it('should work correctly with a custom storage strategy', () => { const addSpy = spyOn(InMemoryStorageStrategy.prototype, 'add').and.callThrough(); - const updateAtIndexSpy = spyOn(InMemoryStorageStrategy.prototype, 'updateAtIndex').and.callThrough(); + const updateSpy = spyOn(InMemoryStorageStrategy.prototype, 'update').and.callThrough(); const getAllSpy = spyOn(InMemoryStorageStrategy.prototype, 'getAll').and.callThrough(); - const removeAtIndexSpy = spyOn(InMemoryStorageStrategy.prototype, 'removeAtIndex').and.callThrough(); + const removeSpy = spyOn(InMemoryStorageStrategy.prototype, 'remove').and.callThrough(); const removeAllSpy = spyOn(InMemoryStorageStrategy.prototype, 'removeAll').and.callThrough(); jasmine.clock().mockDate(); @@ -924,7 +924,7 @@ strategies.forEach(s => { 1000 ); // called removeAtIndex once, because of how the cache works, it always removes the last cached pair with this method - expect(removeAtIndexSpy).toHaveBeenCalledTimes(1); + expect(removeSpy).toHaveBeenCalledTimes(1); expect(asyncFreshData).toEqual({ payload: 'test' }); expect(mockServiceCallSpy).toHaveBeenCalledTimes(1); // one add call, one getAll call @@ -935,7 +935,7 @@ strategies.forEach(s => { service.getDateWithCustomStorageStrategyProvided('test') ); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(1); + expect(updateSpy).toHaveBeenCalledTimes(1); expect(cachedResponse).toEqual({ payload: 'test' }); /** * call count should still be one, since we rerouted to cache, instead of service call @@ -954,7 +954,7 @@ strategies.forEach(s => { */ service.getDateWithCustomStorageStrategyProvided('test').subscribe(); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(2); + expect(updateSpy).toHaveBeenCalledTimes(2); // one more getAll cache and it is renewed expect(getAllSpy).toHaveBeenCalledTimes(3); expect(addSpy).toHaveBeenCalledTimes(1); @@ -968,7 +968,7 @@ strategies.forEach(s => { service.getDateWithCustomStorageStrategyProvided('test') ); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(3); + expect(updateSpy).toHaveBeenCalledTimes(3); // one more getAll call, and still just one add call, since the cache was renewed due to sliding expiration expect(getAllSpy).toHaveBeenCalledTimes(4); expect(addSpy).toHaveBeenCalledTimes(1); @@ -987,7 +987,7 @@ strategies.forEach(s => { service.getDateWithCustomStorageStrategyProvided('test') ); // cache has expired so the currently cached pair should have been swapped by now by calling the removeAtIndex method first - expect(removeAtIndexSpy).toHaveBeenCalledTimes(2); + expect(removeSpy).toHaveBeenCalledTimes(2); expect(getAllSpy).toHaveBeenCalledTimes(5); expect(addSpy).toHaveBeenCalledTimes(1); /** @@ -1001,9 +1001,9 @@ strategies.forEach(s => { */ globalCacheBusterNotifier.next(); expect(addSpy).toHaveBeenCalledTimes(1); - expect(updateAtIndexSpy).toHaveBeenCalledTimes(3); + expect(updateSpy).toHaveBeenCalledTimes(3); expect(getAllSpy).toHaveBeenCalledTimes(5); - expect(removeAtIndexSpy).toHaveBeenCalledTimes(2); + expect(removeSpy).toHaveBeenCalledTimes(2); expect(removeAllSpy).toHaveBeenCalled(); }) diff --git a/specs/promise-cacheable.decorator.spec.ts b/specs/promise-cacheable.decorator.spec.ts index de3ac09..411bbad 100644 --- a/specs/promise-cacheable.decorator.spec.ts +++ b/specs/promise-cacheable.decorator.spec.ts @@ -29,6 +29,12 @@ class AsyncStorageStrategy extends IAsyncStorageStrategy { return Promise.resolve(); } + update(index: number, entity: ICachePair) { + const updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + return Promise.resolve(); + } + getAll() { return Promise.resolve(this.cachePairs); }; @@ -38,6 +44,11 @@ class AsyncStorageStrategy extends IAsyncStorageStrategy { return Promise.resolve(); } + remove(index: number) { + this.cachePairs.splice(index, 1); + return Promise.resolve(); + } + removeAll() { this.cachePairs.length = 0; return Promise.resolve(); @@ -50,7 +61,7 @@ strategies.forEach(s => { GlobalCacheConfig.storageStrategy = s; } - describe('PCacheableDecorator', () => { + describe(`${!s ? 'InMemoryStorageStrategy' : s.name}: PCacheableDecorator`, () => { let service: IService> = null; let mockServiceCallSpy: jasmine.Spy = null; const cacheModifier = new Subject(); From d8790c11796c1511e727355230078a847788e364 Mon Sep 17 00:00:00 2001 From: Angel Nikolov Date: Sat, 20 Feb 2021 22:42:28 +0200 Subject: [PATCH 2/4] Updated version. --- dist/cjs/cacheable.decorator.js | 6 +++--- dist/cjs/cacheable.decorator.js.map | 2 +- dist/cjs/common/DOMStorageStrategy.d.ts | 2 ++ dist/cjs/common/DOMStorageStrategy.js | 14 +++++++++++++ dist/cjs/common/DOMStorageStrategy.js.map | 2 +- dist/cjs/common/IAsyncStorageStrategy.d.ts | 8 ++++++++ dist/cjs/common/IAsyncStorageStrategy.js.map | 2 +- dist/cjs/common/IStorageStrategy.d.ts | 8 ++++++++ dist/cjs/common/IStorageStrategy.js.map | 2 +- dist/cjs/common/InMemoryStorageStrategy.d.ts | 2 ++ dist/cjs/common/InMemoryStorageStrategy.js | 7 +++++++ .../cjs/common/InMemoryStorageStrategy.js.map | 2 +- dist/cjs/common/LocalStorageStrategy.d.ts | 2 ++ dist/cjs/common/LocalStorageStrategy.js | 14 +++++++++++++ dist/cjs/common/LocalStorageStrategy.js.map | 2 +- dist/cjs/promise.cacheable.decorator.js | 6 +++--- dist/cjs/promise.cacheable.decorator.js.map | 2 +- .../observable-cacheable.decorator.spec.js | 20 +++++++++---------- ...observable-cacheable.decorator.spec.js.map | 2 +- .../specs/promise-cacheable.decorator.spec.js | 11 +++++++++- .../promise-cacheable.decorator.spec.js.map | 2 +- dist/esm2015/cacheable.decorator.js | 6 +++--- dist/esm2015/cacheable.decorator.js.map | 2 +- dist/esm2015/common/DOMStorageStrategy.d.ts | 2 ++ dist/esm2015/common/DOMStorageStrategy.js | 14 +++++++++++++ dist/esm2015/common/DOMStorageStrategy.js.map | 2 +- .../esm2015/common/IAsyncStorageStrategy.d.ts | 8 ++++++++ .../common/IAsyncStorageStrategy.js.map | 2 +- dist/esm2015/common/IStorageStrategy.d.ts | 8 ++++++++ dist/esm2015/common/IStorageStrategy.js.map | 2 +- .../common/InMemoryStorageStrategy.d.ts | 2 ++ .../esm2015/common/InMemoryStorageStrategy.js | 7 +++++++ .../common/InMemoryStorageStrategy.js.map | 2 +- dist/esm2015/common/LocalStorageStrategy.d.ts | 2 ++ dist/esm2015/common/LocalStorageStrategy.js | 14 +++++++++++++ .../common/LocalStorageStrategy.js.map | 2 +- dist/esm2015/promise.cacheable.decorator.js | 6 +++--- .../promise.cacheable.decorator.js.map | 2 +- dist/esm5/cacheable.decorator.js | 6 +++--- dist/esm5/cacheable.decorator.js.map | 2 +- dist/esm5/common/DOMStorageStrategy.d.ts | 2 ++ dist/esm5/common/DOMStorageStrategy.js | 14 +++++++++++++ dist/esm5/common/DOMStorageStrategy.js.map | 2 +- dist/esm5/common/IAsyncStorageStrategy.d.ts | 8 ++++++++ dist/esm5/common/IAsyncStorageStrategy.js.map | 2 +- dist/esm5/common/IStorageStrategy.d.ts | 8 ++++++++ dist/esm5/common/IStorageStrategy.js.map | 2 +- dist/esm5/common/InMemoryStorageStrategy.d.ts | 2 ++ dist/esm5/common/InMemoryStorageStrategy.js | 7 +++++++ .../common/InMemoryStorageStrategy.js.map | 2 +- dist/esm5/common/LocalStorageStrategy.d.ts | 2 ++ dist/esm5/common/LocalStorageStrategy.js | 14 +++++++++++++ dist/esm5/common/LocalStorageStrategy.js.map | 2 +- dist/esm5/promise.cacheable.decorator.js | 6 +++--- dist/esm5/promise.cacheable.decorator.js.map | 2 +- package.json | 2 +- 56 files changed, 233 insertions(+), 53 deletions(-) diff --git a/dist/cjs/cacheable.decorator.js b/dist/cjs/cacheable.decorator.js index a041fb3..f402f41 100644 --- a/dist/cjs/cacheable.decorator.js +++ b/dist/cjs/cacheable.decorator.js @@ -59,7 +59,7 @@ function Cacheable(cacheConfig) { /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy_1.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy_1.remove ? storageStrategy_1.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy_1.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || common_1.GlobalCacheConfig.slidingExpiration) { @@ -67,7 +67,7 @@ function Cacheable(cacheConfig) { * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy_1.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy_1.update ? storageStrategy_1.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy_1.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -97,7 +97,7 @@ function Cacheable(cacheConfig) { (cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy_1.removeAtIndex(0, cacheKey); + storageStrategy_1.remove ? storageStrategy_1.remove(0, cachePairs[0], cacheKey) : storageStrategy_1.removeAtIndex(0, cacheKey); } storageStrategy_1.add({ parameters: cacheParameters, diff --git a/dist/cjs/cacheable.decorator.js.map b/dist/cjs/cacheable.decorator.js.map index ba4e481..d95c2b7 100644 --- a/dist/cjs/cacheable.decorator.js.map +++ b/dist/cjs/cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":";;AAAA,6BAA2D;AAC3D,4CAA6E;AAC7E,mCAAiH;AAGpG,QAAA,yBAAyB,GAAG,IAAI,cAAO,EAAQ,CAAC;AAE7D,mBAA0B,WAAwC;IAAxC,4BAAA,EAAA,gBAAwC;IAChE,OAAO,UACL,OAAe,EACf,YAAoB,EACpB,kBAAwE;QAExE,IAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,YAAY,CAAC;QACvF,IAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC3C,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAClD,IAAI,iBAAe,GAAqB,CAAC,WAAW,CAAC,eAAe;gBAClE,CAAC,CAAC,IAAI,0BAAiB,CAAC,eAAe,EAAsB;gBAC7D,CAAC,CAAC,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;YACtC,IAAM,mBAAiB,GAAuC,EAAE,CAAC;YACjE,IAAI,WAAW,CAAC,aAAa,EAAE;gBAC7B,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,UAAA,QAAQ,IAAI,OAAA,iBAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,EAA7E,CAA6E,CAAC,CAAA;aAC/H;YACD;;;;eAIG;YACH,YAAK,CACH,iCAAyB,CAAC,YAAY,EAAE,EACxC,WAAW,CAAC,mBAAmB;gBAC7B,CAAC,CAAC,WAAW,CAAC,mBAAmB;gBACjC,CAAC,CAAC,YAAK,EAAE,CACZ,CAAC,SAAS,CAAC,UAAA,CAAC;gBACX,iBAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpC,mBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,IAAM,aAAa,GAAG,WAAW,CAAC,aAAa,IAAI,0BAAiB,CAAC,aAAa,CAAC;YACnF,WAAW,CAAC,aAAa,GAAG,aAAa;gBACvC,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,+BAAsB,CAAC;YAC3B,IAAM,WAAW,GAAG,WAAW,CAAC,WAAW,IAAI,0BAAiB,CAAC,WAAW,CAAC;YAC7E,WAAW,CAAC,WAAW,GAAG,WAAW;gBACnC,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,uBAAc,CAAC;YAEnB,6EAA6E;YAC5E,kBAAkB,CAAC,KAAa,GAAG;gBAAS,oBAAyB;qBAAzB,UAAyB,EAAzB,qBAAyB,EAAzB,IAAyB;oBAAzB,+BAAyB;;gBACpE,IAAM,UAAU,GAAuC,iBAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACxF,IAAI,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBAC1D,IAAI,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,UAAA,EAAE;oBACtC,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;gBAAzD,CAAyD,CAAC,CAAC;gBAC7D,IAAM,sBAAsB,GAAG,mBAAiB,CAAC,IAAI,CAAC,UAAA,EAAE;oBACtD,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;gBAAzD,CAAyD,CAC1D,CAAC;gBACF;;mBAEG;gBACH,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,0BAAiB,CAAC,MAAM,CAAC,IAAI,eAAe,IAAI,eAAe,CAAC,OAAO,EAAE;oBAClG,IACE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;wBAClE,CAAC,WAAW,CAAC,MAAM,IAAI,0BAAiB,CAAC,MAAM,CAAC,EAChD;wBACA;;2BAEG;wBACH,iBAAe,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAe,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,iBAAe,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;wBAC/L,eAAe,GAAG,IAAI,CAAC;qBACxB;yBAAM,IAAI,WAAW,CAAC,iBAAiB,IAAI,0BAAiB,CAAC,iBAAiB,EAAE;wBAC/E;;2BAEG;wBACH,eAAe,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;wBACrC,iBAAe,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAe,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,iBAAe,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;qBACjN;iBACF;gBAED,IAAI,eAAe,EAAE;oBACnB,IAAM,OAAO,GAAG,SAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBAC7C,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;iBAC7D;qBAAM,IAAI,sBAAsB,EAAE;oBACjC,OAAO,sBAAsB,CAAC,QAAQ,CAAC;iBACxC;qBAAM;oBACL,IAAM,SAAS,GAAI,SAAS,CAAC,IAAI,OAAd,SAAS,GAAM,IAAI,SAAK,UAAU,EAEnD,CAAC,IAAI,CACL,oBAAQ,CAAC;wBACP;;2BAEG;wBACH,IAAM,yBAAyB,GAAG,mBAAiB,CAAC,IAAI,CAAC,UAAA,EAAE;4BACzD,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;wBAAzD,CAAyD,CAC1D,CAAC;wBACF,mBAAiB,CAAC,MAAM,CACtB,mBAAiB,CAAC,OAAO,CAAC,yBAAyB,CAAC,EACpD,CAAC,CACF,CAAC;oBACJ,CAAC,CAAC,EACF,eAAG,CAAC,UAAA,QAAQ;wBACV;;;2BAGG;wBACH,IACE,CAAC,WAAW,CAAC,kBAAkB;4BAC/B,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EACxC;4BACA,IACE,CAAC,CAAC,WAAW,CAAC,aAAa,IAAI,0BAAiB,CAAC,aAAa,CAAC;gCAC/D,CAAC,WAAW,CAAC,aAAa,IAAI,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC;gCACpE,CAAC,CAAC,WAAW,CAAC,aAAa,IAAI,0BAAiB,CAAC,aAAa,CAAC;oCAC7D,CAAC,WAAW,CAAC,aAAa,IAAI,0BAAiB,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EACzF;gCACA,iBAAe,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAe,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,iBAAe,CAAC,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;6BAC1H;4BACD,iBAAe,CAAC,GAAG,CAAC;gCAClB,UAAU,EAAE,eAAe;gCAC3B,QAAQ,UAAA;gCACR,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,IAAI,0BAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;6BAC9E,EAAE,QAAQ,CAAC,CAAC;yBACd;oBACH,CAAC,CAAC,EACF,yBAAa,CAAC,CAAC,CAAC,EAChB,oBAAQ,EAAE,CACX,CAAC;oBACF;;uBAEG;oBACH,mBAAiB,CAAC,IAAI,CAAC;wBACrB,UAAU,EAAE,eAAe;wBAC3B,QAAQ,EAAE,SAAS;wBACnB,OAAO,EAAE,IAAI,IAAI,EAAE;qBACpB,CAAC,CAAC;oBACH,OAAO,SAAS,CAAC;iBAClB;YACH,CAAC,CAAC;SACH;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAA;AACH,CAAC;AApID,8BAoIC;AAAA,CAAC"} \ No newline at end of file diff --git a/dist/cjs/common/DOMStorageStrategy.d.ts b/dist/cjs/common/DOMStorageStrategy.d.ts index b3bb76d..9aa63b6 100644 --- a/dist/cjs/common/DOMStorageStrategy.d.ts +++ b/dist/cjs/common/DOMStorageStrategy.d.ts @@ -10,7 +10,9 @@ export declare class DOMStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/cjs/common/DOMStorageStrategy.js b/dist/cjs/common/DOMStorageStrategy.js index d605bf3..19c3bda 100644 --- a/dist/cjs/common/DOMStorageStrategy.js +++ b/dist/cjs/common/DOMStorageStrategy.js @@ -54,6 +54,13 @@ var DOMStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + DOMStorageStrategy.prototype.remove = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + }; DOMStorageStrategy.prototype.updateAtIndex = function (index, entity, cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -61,6 +68,13 @@ var DOMStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + DOMStorageStrategy.prototype.update = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + }; DOMStorageStrategy.prototype.removeAll = function (cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/cjs/common/DOMStorageStrategy.js.map b/dist/cjs/common/DOMStorageStrategy.js.map index 7455182..0410c62 100644 --- a/dist/cjs/common/DOMStorageStrategy.js.map +++ b/dist/cjs/common/DOMStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAsD;AACtD,sBAAkD;AAClD;;GAEG;AACH;IAAwC,sCAAgB;IAEtD;QAAA,YACE,iBAAO,SAIR;QANO,oBAAc,GAAW,oBAAiB,CAAC,cAAc,CAAC;QAGhE,IAAI,OAAO,YAAY,IAAI,WAAW,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;SAC3C;;IACH,CAAC;IAED,gCAAG,GAAH,UAAI,SAA0B,EAAE,QAAgB;QAC9C,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC5B,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SAC9B;QACD,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAAA,CAAC;IAGF,oCAAO,GAAP,UAAQ,UAA6B,EAAE,QAAgB;QACrD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC5B,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SAC9B;QACD,aAAa,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAAA,CAAC;IAEF,mCAAM,GAAN,UAAO,QAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAAA,CAAC;IAEF,0CAAa,GAAb,UAAc,KAAa,EAAE,QAAgB;QAC3C,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,0CAAa,GAAb,UAAc,KAAa,EAAE,MAAW,EAAE,QAAgB;QACxD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,sCAAS,GAAT,UAAU,QAAgB;QACxB,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAEO,uCAAU,GAAlB;QACE,IAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC;IAEO,yCAAY,GAApB,UAAqB,IAA+C;QAClE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IACH,yBAAC;AAAD,CAAC,AApED,CAAwC,mCAAgB,GAoEvD;AApEY,gDAAkB"} \ No newline at end of file +{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/cjs/common/IAsyncStorageStrategy.d.ts b/dist/cjs/common/IAsyncStorageStrategy.d.ts index a864da3..58acb68 100644 --- a/dist/cjs/common/IAsyncStorageStrategy.d.ts +++ b/dist/cjs/common/IAsyncStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IAsyncStorageStrategy { abstract getAll(cacheKey: string): Array> | Promise>>; abstract add(entity: ICachePair, cacheKey: string): void | Promise; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void | Promise; + abstract update?(index: number, entity: ICachePair, cacheKey: string): Promise; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void | Promise; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): Promise; abstract removeAll(cacheKey: string): void | Promise; abstract addMany(entities: ICachePair[], cacheKey: string): Promise; } diff --git a/dist/cjs/common/IAsyncStorageStrategy.js.map b/dist/cjs/common/IAsyncStorageStrategy.js.map index b89a2c8..7bf0994 100644 --- a/dist/cjs/common/IAsyncStorageStrategy.js.map +++ b/dist/cjs/common/IAsyncStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":";;AAEA;IAAA;IAOA,CAAC;IAAD,4BAAC;AAAD,CAAC,AAPD,IAOC;AAPqB,sDAAqB"} \ No newline at end of file +{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":";;AAEA;IAAA;IAeA,CAAC;IAAD,4BAAC;AAAD,CAAC,AAfD,IAeC;AAfqB,sDAAqB"} \ No newline at end of file diff --git a/dist/cjs/common/IStorageStrategy.d.ts b/dist/cjs/common/IStorageStrategy.d.ts index 0c60e82..e90e777 100644 --- a/dist/cjs/common/IStorageStrategy.d.ts +++ b/dist/cjs/common/IStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IStorageStrategy { abstract getAll(cacheKey: string): Array>; abstract add(entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void; + abstract update?(index: number, entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): void; abstract removeAll(cacheKey: string): void; abstract addMany(entities: ICachePair[], cacheKey: string): void; } diff --git a/dist/cjs/common/IStorageStrategy.js.map b/dist/cjs/common/IStorageStrategy.js.map index 8e79b0f..e413e09 100644 --- a/dist/cjs/common/IStorageStrategy.js.map +++ b/dist/cjs/common/IStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":";;AAEA;IAAA;IAOA,CAAC;IAAD,uBAAC;AAAD,CAAC,AAPD,IAOC;AAPqB,4CAAgB"} \ No newline at end of file +{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":";;AAEA;IAAA;IAeA,CAAC;IAAD,uBAAC;AAAD,CAAC,AAfD,IAeC;AAfqB,4CAAgB"} \ No newline at end of file diff --git a/dist/cjs/common/InMemoryStorageStrategy.d.ts b/dist/cjs/common/InMemoryStorageStrategy.d.ts index d209e84..9f6c113 100644 --- a/dist/cjs/common/InMemoryStorageStrategy.d.ts +++ b/dist/cjs/common/InMemoryStorageStrategy.d.ts @@ -5,7 +5,9 @@ export declare class InMemoryStorageStrategy extends IStorageStrategy { add(cachePair: ICachePair): void; addMany(cachePairs: ICachePair[]): void; updateAtIndex(index: number, entity: ICachePair): void; + update(index: number, entity: ICachePair): void; getAll(): ICachePair[]; removeAtIndex(index: number): void; + remove(index: number): void; removeAll(): void; } diff --git a/dist/cjs/common/InMemoryStorageStrategy.js b/dist/cjs/common/InMemoryStorageStrategy.js index 42093cb..d885894 100644 --- a/dist/cjs/common/InMemoryStorageStrategy.js +++ b/dist/cjs/common/InMemoryStorageStrategy.js @@ -30,6 +30,10 @@ var InMemoryStorageStrategy = /** @class */ (function (_super) { var updatee = this.cachePairs[index]; Object.assign(updatee, entity); }; + InMemoryStorageStrategy.prototype.update = function (index, entity) { + var updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + }; InMemoryStorageStrategy.prototype.getAll = function () { return this.cachePairs; }; @@ -37,6 +41,9 @@ var InMemoryStorageStrategy = /** @class */ (function (_super) { InMemoryStorageStrategy.prototype.removeAtIndex = function (index) { this.cachePairs.splice(index, 1); }; + InMemoryStorageStrategy.prototype.remove = function (index) { + this.cachePairs.splice(index, 1); + }; InMemoryStorageStrategy.prototype.removeAll = function () { this.cachePairs.length = 0; }; diff --git a/dist/cjs/common/InMemoryStorageStrategy.js.map b/dist/cjs/common/InMemoryStorageStrategy.js.map index 23eada8..7e6d179 100644 --- a/dist/cjs/common/InMemoryStorageStrategy.js.map +++ b/dist/cjs/common/InMemoryStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoD;AAGpD;IAA6C,2CAAgB;IAA7D;QAAA,qEA2BC;QA1BS,gBAAU,GAA2B,EAAE,CAAC;;IA0BlD,CAAC;IAxBC,qCAAG,GAAH,UAAI,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,yCAAO,GAAP,UAAQ,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa,EAAE,MAAuB;QAClD,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,2CAAS,GAAT;QACE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IACH,8BAAC;AAAD,CAAC,AA3BD,CAA6C,mCAAgB,GA2B5D;AA3BY,0DAAuB"} \ No newline at end of file +{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAoD;AAGpD;IAA6C,2CAAgB;IAA7D;QAAA,qEAoCC;QAnCS,gBAAU,GAA2B,EAAE,CAAC;;IAmClD,CAAC;IAjCC,qCAAG,GAAH,UAAI,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,yCAAO,GAAP,UAAQ,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa,EAAE,MAAuB;QAClD,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN,UAAO,KAAa,EAAE,MAAuB;QAC3C,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,wCAAM,GAAN,UAAO,KAAa;QAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,2CAAS,GAAT;QACE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IACH,8BAAC;AAAD,CAAC,AApCD,CAA6C,mCAAgB,GAoC5D;AApCY,0DAAuB"} \ No newline at end of file diff --git a/dist/cjs/common/LocalStorageStrategy.d.ts b/dist/cjs/common/LocalStorageStrategy.d.ts index 9527ce9..11979d4 100644 --- a/dist/cjs/common/LocalStorageStrategy.d.ts +++ b/dist/cjs/common/LocalStorageStrategy.d.ts @@ -7,7 +7,9 @@ export declare class LocalStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/cjs/common/LocalStorageStrategy.js b/dist/cjs/common/LocalStorageStrategy.js index 45a8639..d0b5998 100644 --- a/dist/cjs/common/LocalStorageStrategy.js +++ b/dist/cjs/common/LocalStorageStrategy.js @@ -51,6 +51,13 @@ var LocalStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + LocalStorageStrategy.prototype.remove = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + }; LocalStorageStrategy.prototype.updateAtIndex = function (index, entity, cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -58,6 +65,13 @@ var LocalStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + LocalStorageStrategy.prototype.update = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + }; LocalStorageStrategy.prototype.removeAll = function (cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/cjs/common/LocalStorageStrategy.js.map b/dist/cjs/common/LocalStorageStrategy.js.map index 9bc9de2..3928adf 100644 --- a/dist/cjs/common/LocalStorageStrategy.js.map +++ b/dist/cjs/common/LocalStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/cjs/promise.cacheable.decorator.js b/dist/cjs/promise.cacheable.decorator.js index dd53d46..9226fbe 100644 --- a/dist/cjs/promise.cacheable.decorator.js +++ b/dist/cjs/promise.cacheable.decorator.js @@ -55,7 +55,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || common_1.GlobalCacheConfig.slidingExpiration) { @@ -63,7 +63,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -87,7 +87,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair (cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || common_1.GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/dist/cjs/promise.cacheable.decorator.js.map b/dist/cjs/promise.cacheable.decorator.js.map index 6431914..be32ec7 100644 --- a/dist/cjs/promise.cacheable.decorator.js.map +++ b/dist/cjs/promise.cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/cjs/specs/observable-cacheable.decorator.spec.js b/dist/cjs/specs/observable-cacheable.decorator.spec.js index 319299b..a3e95fd 100644 --- a/dist/cjs/specs/observable-cacheable.decorator.spec.js +++ b/dist/cjs/specs/observable-cacheable.decorator.spec.js @@ -61,7 +61,7 @@ strategies.forEach(function (s) { if (s) { common_1.GlobalCacheConfig.storageStrategy = s; } - describe('CacheableDecorator', function () { + describe((!s ? 'InMemoryStorageStrategy' : s.name) + ": CacheableDecorator", function () { var service = null; var mockServiceCallSpy = null; var cacheModifier = new rxjs_2.Subject(); @@ -767,14 +767,14 @@ strategies.forEach(function (s) { }); it('should work correctly with a custom storage strategy', function () { var addSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'add').and.callThrough(); - var updateAtIndexSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'updateAtIndex').and.callThrough(); + var updateSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'update').and.callThrough(); var getAllSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'getAll').and.callThrough(); - var removeAtIndexSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'removeAtIndex').and.callThrough(); + var removeSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'remove').and.callThrough(); var removeAllSpy = spyOn(InMemoryStorageStrategy_1.InMemoryStorageStrategy.prototype, 'removeAll').and.callThrough(); jasmine.clock().mockDate(); var asyncFreshData = _timedStreamAsyncAwait(service.getDateWithCustomStorageStrategyProvided('test'), 1000); // called removeAtIndex once, because of how the cache works, it always removes the last cached pair with this method - expect(removeAtIndexSpy).toHaveBeenCalledTimes(1); + expect(removeSpy).toHaveBeenCalledTimes(1); expect(asyncFreshData).toEqual({ payload: 'test' }); expect(mockServiceCallSpy).toHaveBeenCalledTimes(1); // one add call, one getAll call @@ -782,7 +782,7 @@ strategies.forEach(function (s) { expect(addSpy).toHaveBeenCalledTimes(1); var cachedResponse = _timedStreamAsyncAwait(service.getDateWithCustomStorageStrategyProvided('test')); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(1); + expect(updateSpy).toHaveBeenCalledTimes(1); expect(cachedResponse).toEqual({ payload: 'test' }); /** * call count should still be one, since we rerouted to cache, instead of service call @@ -800,7 +800,7 @@ strategies.forEach(function (s) { */ service.getDateWithCustomStorageStrategyProvided('test').subscribe(); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(2); + expect(updateSpy).toHaveBeenCalledTimes(2); // one more getAll cache and it is renewed expect(getAllSpy).toHaveBeenCalledTimes(3); expect(addSpy).toHaveBeenCalledTimes(1); @@ -810,7 +810,7 @@ strategies.forEach(function (s) { */ var cachedResponse2 = _timedStreamAsyncAwait(service.getDateWithCustomStorageStrategyProvided('test')); // this call will renew the updateAtIndex call count since it's used to renew the cache - expect(updateAtIndexSpy).toHaveBeenCalledTimes(3); + expect(updateSpy).toHaveBeenCalledTimes(3); // one more getAll call, and still just one add call, since the cache was renewed due to sliding expiration expect(getAllSpy).toHaveBeenCalledTimes(4); expect(addSpy).toHaveBeenCalledTimes(1); @@ -825,7 +825,7 @@ strategies.forEach(function (s) { jasmine.clock().tick(7501); var cachedResponse3 = _timedStreamAsyncAwait(service.getDateWithCustomStorageStrategyProvided('test')); // cache has expired so the currently cached pair should have been swapped by now by calling the removeAtIndex method first - expect(removeAtIndexSpy).toHaveBeenCalledTimes(2); + expect(removeSpy).toHaveBeenCalledTimes(2); expect(getAllSpy).toHaveBeenCalledTimes(5); expect(addSpy).toHaveBeenCalledTimes(1); /** @@ -838,9 +838,9 @@ strategies.forEach(function (s) { */ cacheable_decorator_1.globalCacheBusterNotifier.next(); expect(addSpy).toHaveBeenCalledTimes(1); - expect(updateAtIndexSpy).toHaveBeenCalledTimes(3); + expect(updateSpy).toHaveBeenCalledTimes(3); expect(getAllSpy).toHaveBeenCalledTimes(5); - expect(removeAtIndexSpy).toHaveBeenCalledTimes(2); + expect(removeSpy).toHaveBeenCalledTimes(2); expect(removeAllSpy).toHaveBeenCalled(); }); it('use the maxAge and slidingExpiration from the GlobalCacheConfig', function () { diff --git a/dist/cjs/specs/observable-cacheable.decorator.spec.js.map b/dist/cjs/specs/observable-cacheable.decorator.spec.js.map index 187435a..5d37357 100644 --- a/dist/cjs/specs/observable-cacheable.decorator.spec.js.map +++ b/dist/cjs/specs/observable-cacheable.decorator.spec.js.map @@ -1 +1 @@ -{"version":3,"file":"observable-cacheable.decorator.spec.js","sourceRoot":"","sources":["../../../specs/observable-cacheable.decorator.spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"observable-cacheable.decorator.spec.js","sourceRoot":"","sources":["../../../specs/observable-cacheable.decorator.spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/cjs/specs/promise-cacheable.decorator.spec.js b/dist/cjs/specs/promise-cacheable.decorator.spec.js index 9541e97..a7ac2ad 100644 --- a/dist/cjs/specs/promise-cacheable.decorator.spec.js +++ b/dist/cjs/specs/promise-cacheable.decorator.spec.js @@ -84,6 +84,11 @@ var AsyncStorageStrategy = /** @class */ (function (_super) { Object.assign(updatee, entity); return Promise.resolve(); }; + AsyncStorageStrategy.prototype.update = function (index, entity) { + var updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + return Promise.resolve(); + }; AsyncStorageStrategy.prototype.getAll = function () { return Promise.resolve(this.cachePairs); }; @@ -92,6 +97,10 @@ var AsyncStorageStrategy = /** @class */ (function (_super) { this.cachePairs.splice(index, 1); return Promise.resolve(); }; + AsyncStorageStrategy.prototype.remove = function (index) { + this.cachePairs.splice(index, 1); + return Promise.resolve(); + }; AsyncStorageStrategy.prototype.removeAll = function () { this.cachePairs.length = 0; return Promise.resolve(); @@ -104,7 +113,7 @@ strategies.forEach(function (s) { if (s) { common_1.GlobalCacheConfig.storageStrategy = s; } - describe('PCacheableDecorator', function () { + describe((!s ? 'InMemoryStorageStrategy' : s.name) + ": PCacheableDecorator", function () { var service = null; var mockServiceCallSpy = null; var cacheModifier = new rxjs_1.Subject(); diff --git a/dist/cjs/specs/promise-cacheable.decorator.spec.js.map b/dist/cjs/specs/promise-cacheable.decorator.spec.js.map index 28ff74b..1949ffc 100644 --- a/dist/cjs/specs/promise-cacheable.decorator.spec.js.map +++ b/dist/cjs/specs/promise-cacheable.decorator.spec.js.map @@ -1 +1 @@ -{"version":3,"file":"promise-cacheable.decorator.spec.js","sourceRoot":"","sources":["../../../specs/promise-cacheable.decorator.spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"promise-cacheable.decorator.spec.js","sourceRoot":"","sources":["../../../specs/promise-cacheable.decorator.spec.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm2015/cacheable.decorator.js b/dist/esm2015/cacheable.decorator.js index 796f069..c06cdac 100644 --- a/dist/esm2015/cacheable.decorator.js +++ b/dist/esm2015/cacheable.decorator.js @@ -48,7 +48,7 @@ export function Cacheable(cacheConfig = {}) { /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { @@ -56,7 +56,7 @@ export function Cacheable(cacheConfig = {}) { * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -84,7 +84,7 @@ export function Cacheable(cacheConfig = {}) { (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/dist/esm2015/cacheable.decorator.js.map b/dist/esm2015/cacheable.decorator.js.map index 5f72c62..c325cc0 100644 --- a/dist/esm2015/cacheable.decorator.js.map +++ b/dist/esm2015/cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm2015/common/DOMStorageStrategy.d.ts b/dist/esm2015/common/DOMStorageStrategy.d.ts index b3bb76d..9aa63b6 100644 --- a/dist/esm2015/common/DOMStorageStrategy.d.ts +++ b/dist/esm2015/common/DOMStorageStrategy.d.ts @@ -10,7 +10,9 @@ export declare class DOMStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/esm2015/common/DOMStorageStrategy.js b/dist/esm2015/common/DOMStorageStrategy.js index c9b56e1..6dc4fd5 100644 --- a/dist/esm2015/common/DOMStorageStrategy.js +++ b/dist/esm2015/common/DOMStorageStrategy.js @@ -40,6 +40,13 @@ export class DOMStorageStrategy extends IStorageStrategy { } this.storeRawData(allCachedData); } + remove(index, entity, cacheKey) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + } updateAtIndex(index, entity, cacheKey) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -47,6 +54,13 @@ export class DOMStorageStrategy extends IStorageStrategy { } this.storeRawData(allCachedData); } + update(index, entity, cacheKey) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + } removeAll(cacheKey) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/esm2015/common/DOMStorageStrategy.js.map b/dist/esm2015/common/DOMStorageStrategy.js.map index 4c5c603..4a8404b 100644 --- a/dist/esm2015/common/DOMStorageStrategy.js.map +++ b/dist/esm2015/common/DOMStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm2015/common/IAsyncStorageStrategy.d.ts b/dist/esm2015/common/IAsyncStorageStrategy.d.ts index a864da3..58acb68 100644 --- a/dist/esm2015/common/IAsyncStorageStrategy.d.ts +++ b/dist/esm2015/common/IAsyncStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IAsyncStorageStrategy { abstract getAll(cacheKey: string): Array> | Promise>>; abstract add(entity: ICachePair, cacheKey: string): void | Promise; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void | Promise; + abstract update?(index: number, entity: ICachePair, cacheKey: string): Promise; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void | Promise; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): Promise; abstract removeAll(cacheKey: string): void | Promise; abstract addMany(entities: ICachePair[], cacheKey: string): Promise; } diff --git a/dist/esm2015/common/IAsyncStorageStrategy.js.map b/dist/esm2015/common/IAsyncStorageStrategy.js.map index 7a74e64..29f74fb 100644 --- a/dist/esm2015/common/IAsyncStorageStrategy.js.map +++ b/dist/esm2015/common/IAsyncStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":"AAEA,MAAM;CAOL"} \ No newline at end of file +{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":"AAEA,MAAM;CAeL"} \ No newline at end of file diff --git a/dist/esm2015/common/IStorageStrategy.d.ts b/dist/esm2015/common/IStorageStrategy.d.ts index 0c60e82..e90e777 100644 --- a/dist/esm2015/common/IStorageStrategy.d.ts +++ b/dist/esm2015/common/IStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IStorageStrategy { abstract getAll(cacheKey: string): Array>; abstract add(entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void; + abstract update?(index: number, entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): void; abstract removeAll(cacheKey: string): void; abstract addMany(entities: ICachePair[], cacheKey: string): void; } diff --git a/dist/esm2015/common/IStorageStrategy.js.map b/dist/esm2015/common/IStorageStrategy.js.map index b1ba2df..335e294 100644 --- a/dist/esm2015/common/IStorageStrategy.js.map +++ b/dist/esm2015/common/IStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":"AAEA,MAAM;CAOL"} \ No newline at end of file +{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":"AAEA,MAAM;CAeL"} \ No newline at end of file diff --git a/dist/esm2015/common/InMemoryStorageStrategy.d.ts b/dist/esm2015/common/InMemoryStorageStrategy.d.ts index d209e84..9f6c113 100644 --- a/dist/esm2015/common/InMemoryStorageStrategy.d.ts +++ b/dist/esm2015/common/InMemoryStorageStrategy.d.ts @@ -5,7 +5,9 @@ export declare class InMemoryStorageStrategy extends IStorageStrategy { add(cachePair: ICachePair): void; addMany(cachePairs: ICachePair[]): void; updateAtIndex(index: number, entity: ICachePair): void; + update(index: number, entity: ICachePair): void; getAll(): ICachePair[]; removeAtIndex(index: number): void; + remove(index: number): void; removeAll(): void; } diff --git a/dist/esm2015/common/InMemoryStorageStrategy.js b/dist/esm2015/common/InMemoryStorageStrategy.js index 10b2894..e2fcf3d 100644 --- a/dist/esm2015/common/InMemoryStorageStrategy.js +++ b/dist/esm2015/common/InMemoryStorageStrategy.js @@ -16,6 +16,10 @@ export class InMemoryStorageStrategy extends IStorageStrategy { const updatee = this.cachePairs[index]; Object.assign(updatee, entity); } + update(index, entity) { + const updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + } getAll() { return this.cachePairs; } @@ -23,6 +27,9 @@ export class InMemoryStorageStrategy extends IStorageStrategy { removeAtIndex(index) { this.cachePairs.splice(index, 1); } + remove(index) { + this.cachePairs.splice(index, 1); + } removeAll() { this.cachePairs.length = 0; } diff --git a/dist/esm2015/common/InMemoryStorageStrategy.js.map b/dist/esm2015/common/InMemoryStorageStrategy.js.map index fded297..8841ac4 100644 --- a/dist/esm2015/common/InMemoryStorageStrategy.js.map +++ b/dist/esm2015/common/InMemoryStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD,MAAM,8BAA+B,SAAQ,gBAAgB;IAA7D;;QACU,eAAU,GAA2B,EAAE,CAAC;IA0BlD,CAAC;IAxBC,GAAG,CAAC,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,OAAO,CAAC,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,KAAa,EAAE,MAAuB;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD,MAAM,8BAA+B,SAAQ,gBAAgB;IAA7D;;QACU,eAAU,GAA2B,EAAE,CAAC;IAmClD,CAAC;IAjCC,GAAG,CAAC,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,OAAO,CAAC,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,KAAa,EAAE,MAAuB;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAuB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,aAAa,CAAC,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF"} \ No newline at end of file diff --git a/dist/esm2015/common/LocalStorageStrategy.d.ts b/dist/esm2015/common/LocalStorageStrategy.d.ts index 9527ce9..11979d4 100644 --- a/dist/esm2015/common/LocalStorageStrategy.d.ts +++ b/dist/esm2015/common/LocalStorageStrategy.d.ts @@ -7,7 +7,9 @@ export declare class LocalStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/esm2015/common/LocalStorageStrategy.js b/dist/esm2015/common/LocalStorageStrategy.js index 1a75fb5..32dd0a6 100644 --- a/dist/esm2015/common/LocalStorageStrategy.js +++ b/dist/esm2015/common/LocalStorageStrategy.js @@ -37,6 +37,13 @@ export class LocalStorageStrategy extends IStorageStrategy { } this.storeRawData(allCachedData); } + remove(index, entity, cacheKey) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + } updateAtIndex(index, entity, cacheKey) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -44,6 +51,13 @@ export class LocalStorageStrategy extends IStorageStrategy { } this.storeRawData(allCachedData); } + update(index, entity, cacheKey) { + const allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + } removeAll(cacheKey) { const allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/esm2015/common/LocalStorageStrategy.js.map b/dist/esm2015/common/LocalStorageStrategy.js.map index 95050ba..e40691c 100644 --- a/dist/esm2015/common/LocalStorageStrategy.js.map +++ b/dist/esm2015/common/LocalStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm2015/promise.cacheable.decorator.js b/dist/esm2015/promise.cacheable.decorator.js index a7c1ee4..108be22 100644 --- a/dist/esm2015/promise.cacheable.decorator.js +++ b/dist/esm2015/promise.cacheable.decorator.js @@ -22,7 +22,7 @@ const getResponse = (oldMethod, cacheKey, cacheConfig, context, cachePairs, para /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { @@ -30,7 +30,7 @@ const getResponse = (oldMethod, cacheKey, cacheConfig, context, cachePairs, para * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -54,7 +54,7 @@ const getResponse = (oldMethod, cacheKey, cacheConfig, context, cachePairs, para (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/dist/esm2015/promise.cacheable.decorator.js.map b/dist/esm2015/promise.cacheable.decorator.js.map index 259a12a..3561915 100644 --- a/dist/esm2015/promise.cacheable.decorator.js.map +++ b/dist/esm2015/promise.cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm5/cacheable.decorator.js b/dist/esm5/cacheable.decorator.js index 0aeb6cf..d91c666 100644 --- a/dist/esm5/cacheable.decorator.js +++ b/dist/esm5/cacheable.decorator.js @@ -57,7 +57,7 @@ export function Cacheable(cacheConfig) { /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy_1.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy_1.remove ? storageStrategy_1.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy_1.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { @@ -65,7 +65,7 @@ export function Cacheable(cacheConfig) { * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy_1.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy_1.update ? storageStrategy_1.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy_1.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -95,7 +95,7 @@ export function Cacheable(cacheConfig) { (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy_1.removeAtIndex(0, cacheKey); + storageStrategy_1.remove ? storageStrategy_1.remove(0, cachePairs[0], cacheKey) : storageStrategy_1.removeAtIndex(0, cacheKey); } storageStrategy_1.add({ parameters: cacheParameters, diff --git a/dist/esm5/cacheable.decorator.js.map b/dist/esm5/cacheable.decorator.js.map index 7bebfaf..3266719 100644 --- a/dist/esm5/cacheable.decorator.js.map +++ b/dist/esm5/cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"cacheable.decorator.js","sourceRoot":"","sources":["../../cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm5/common/DOMStorageStrategy.d.ts b/dist/esm5/common/DOMStorageStrategy.d.ts index b3bb76d..9aa63b6 100644 --- a/dist/esm5/common/DOMStorageStrategy.d.ts +++ b/dist/esm5/common/DOMStorageStrategy.d.ts @@ -10,7 +10,9 @@ export declare class DOMStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/esm5/common/DOMStorageStrategy.js b/dist/esm5/common/DOMStorageStrategy.js index 1e6fb81..5ae39b5 100644 --- a/dist/esm5/common/DOMStorageStrategy.js +++ b/dist/esm5/common/DOMStorageStrategy.js @@ -52,6 +52,13 @@ var DOMStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + DOMStorageStrategy.prototype.remove = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + }; DOMStorageStrategy.prototype.updateAtIndex = function (index, entity, cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -59,6 +66,13 @@ var DOMStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + DOMStorageStrategy.prototype.update = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + }; DOMStorageStrategy.prototype.removeAll = function (cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/esm5/common/DOMStorageStrategy.js.map b/dist/esm5/common/DOMStorageStrategy.js.map index fb08070..478c4aa 100644 --- a/dist/esm5/common/DOMStorageStrategy.js.map +++ b/dist/esm5/common/DOMStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DOMStorageStrategy.js","sourceRoot":"","sources":["../../../common/DOMStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/esm5/common/IAsyncStorageStrategy.d.ts b/dist/esm5/common/IAsyncStorageStrategy.d.ts index a864da3..58acb68 100644 --- a/dist/esm5/common/IAsyncStorageStrategy.d.ts +++ b/dist/esm5/common/IAsyncStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IAsyncStorageStrategy { abstract getAll(cacheKey: string): Array> | Promise>>; abstract add(entity: ICachePair, cacheKey: string): void | Promise; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void | Promise; + abstract update?(index: number, entity: ICachePair, cacheKey: string): Promise; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void | Promise; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): Promise; abstract removeAll(cacheKey: string): void | Promise; abstract addMany(entities: ICachePair[], cacheKey: string): Promise; } diff --git a/dist/esm5/common/IAsyncStorageStrategy.js.map b/dist/esm5/common/IAsyncStorageStrategy.js.map index 261e547..1b90034 100644 --- a/dist/esm5/common/IAsyncStorageStrategy.js.map +++ b/dist/esm5/common/IAsyncStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":"AAEA;IAAA;IAOA,CAAC;IAAD,4BAAC;AAAD,CAAC,AAPD,IAOC"} \ No newline at end of file +{"version":3,"file":"IAsyncStorageStrategy.js","sourceRoot":"","sources":["../../../common/IAsyncStorageStrategy.ts"],"names":[],"mappings":"AAEA;IAAA;IAeA,CAAC;IAAD,4BAAC;AAAD,CAAC,AAfD,IAeC"} \ No newline at end of file diff --git a/dist/esm5/common/IStorageStrategy.d.ts b/dist/esm5/common/IStorageStrategy.d.ts index 0c60e82..e90e777 100644 --- a/dist/esm5/common/IStorageStrategy.d.ts +++ b/dist/esm5/common/IStorageStrategy.d.ts @@ -2,8 +2,16 @@ import { ICachePair } from '.'; export declare abstract class IStorageStrategy { abstract getAll(cacheKey: string): Array>; abstract add(entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void; + abstract update?(index: number, entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): void; abstract removeAll(cacheKey: string): void; abstract addMany(entities: ICachePair[], cacheKey: string): void; } diff --git a/dist/esm5/common/IStorageStrategy.js.map b/dist/esm5/common/IStorageStrategy.js.map index dc63af0..6b053a3 100644 --- a/dist/esm5/common/IStorageStrategy.js.map +++ b/dist/esm5/common/IStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":"AAEA;IAAA;IAOA,CAAC;IAAD,uBAAC;AAAD,CAAC,AAPD,IAOC"} \ No newline at end of file +{"version":3,"file":"IStorageStrategy.js","sourceRoot":"","sources":["../../../common/IStorageStrategy.ts"],"names":[],"mappings":"AAEA;IAAA;IAeA,CAAC;IAAD,uBAAC;AAAD,CAAC,AAfD,IAeC"} \ No newline at end of file diff --git a/dist/esm5/common/InMemoryStorageStrategy.d.ts b/dist/esm5/common/InMemoryStorageStrategy.d.ts index d209e84..9f6c113 100644 --- a/dist/esm5/common/InMemoryStorageStrategy.d.ts +++ b/dist/esm5/common/InMemoryStorageStrategy.d.ts @@ -5,7 +5,9 @@ export declare class InMemoryStorageStrategy extends IStorageStrategy { add(cachePair: ICachePair): void; addMany(cachePairs: ICachePair[]): void; updateAtIndex(index: number, entity: ICachePair): void; + update(index: number, entity: ICachePair): void; getAll(): ICachePair[]; removeAtIndex(index: number): void; + remove(index: number): void; removeAll(): void; } diff --git a/dist/esm5/common/InMemoryStorageStrategy.js b/dist/esm5/common/InMemoryStorageStrategy.js index c494b0b..573c8be 100644 --- a/dist/esm5/common/InMemoryStorageStrategy.js +++ b/dist/esm5/common/InMemoryStorageStrategy.js @@ -28,6 +28,10 @@ var InMemoryStorageStrategy = /** @class */ (function (_super) { var updatee = this.cachePairs[index]; Object.assign(updatee, entity); }; + InMemoryStorageStrategy.prototype.update = function (index, entity) { + var updatee = this.cachePairs[index]; + Object.assign(updatee, entity); + }; InMemoryStorageStrategy.prototype.getAll = function () { return this.cachePairs; }; @@ -35,6 +39,9 @@ var InMemoryStorageStrategy = /** @class */ (function (_super) { InMemoryStorageStrategy.prototype.removeAtIndex = function (index) { this.cachePairs.splice(index, 1); }; + InMemoryStorageStrategy.prototype.remove = function (index) { + this.cachePairs.splice(index, 1); + }; InMemoryStorageStrategy.prototype.removeAll = function () { this.cachePairs.length = 0; }; diff --git a/dist/esm5/common/InMemoryStorageStrategy.js.map b/dist/esm5/common/InMemoryStorageStrategy.js.map index 43068d2..8e6e07a 100644 --- a/dist/esm5/common/InMemoryStorageStrategy.js.map +++ b/dist/esm5/common/InMemoryStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD;IAA6C,2CAAgB;IAA7D;QAAA,qEA2BC;QA1BS,gBAAU,GAA2B,EAAE,CAAC;;IA0BlD,CAAC;IAxBC,qCAAG,GAAH,UAAI,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,yCAAO,GAAP,UAAQ,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa,EAAE,MAAuB;QAClD,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,2CAAS,GAAT;QACE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IACH,8BAAC;AAAD,CAAC,AA3BD,CAA6C,gBAAgB,GA2B5D"} \ No newline at end of file +{"version":3,"file":"InMemoryStorageStrategy.js","sourceRoot":"","sources":["../../../common/InMemoryStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD;IAA6C,2CAAgB;IAA7D;QAAA,qEAoCC;QAnCS,gBAAU,GAA2B,EAAE,CAAC;;IAmClD,CAAC;IAjCC,qCAAG,GAAH,UAAI,SAA0B;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC;IAAA,CAAC;IAEF,yCAAO,GAAP,UAAQ,UAA6B;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa,EAAE,MAAuB;QAClD,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN,UAAO,KAAa,EAAE,MAAuB;QAC3C,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,wCAAM,GAAN;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAAA,CAAC;IAEF,+CAAa,GAAb,UAAc,KAAa;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,wCAAM,GAAN,UAAO,KAAa;QAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,2CAAS,GAAT;QACE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IACH,8BAAC;AAAD,CAAC,AApCD,CAA6C,gBAAgB,GAoC5D"} \ No newline at end of file diff --git a/dist/esm5/common/LocalStorageStrategy.d.ts b/dist/esm5/common/LocalStorageStrategy.d.ts index 9527ce9..11979d4 100644 --- a/dist/esm5/common/LocalStorageStrategy.d.ts +++ b/dist/esm5/common/LocalStorageStrategy.d.ts @@ -7,7 +7,9 @@ export declare class LocalStorageStrategy extends IStorageStrategy { addMany(cachePairs: ICachePair[], cacheKey: string): void; getAll(cacheKey: string): ICachePair[]; removeAtIndex(index: number, cacheKey: string): void; + remove(index: number, entity: any, cacheKey: string): void; updateAtIndex(index: number, entity: any, cacheKey: string): void; + update(index: number, entity: any, cacheKey: string): void; removeAll(cacheKey: string): void; private getRawData(); private storeRawData(data); diff --git a/dist/esm5/common/LocalStorageStrategy.js b/dist/esm5/common/LocalStorageStrategy.js index 5545f30..2126d9a 100644 --- a/dist/esm5/common/LocalStorageStrategy.js +++ b/dist/esm5/common/LocalStorageStrategy.js @@ -49,6 +49,13 @@ var LocalStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + LocalStorageStrategy.prototype.remove = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { + allCachedData[cacheKey].splice(index, 1); + } + this.storeRawData(allCachedData); + }; LocalStorageStrategy.prototype.updateAtIndex = function (index, entity, cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { @@ -56,6 +63,13 @@ var LocalStorageStrategy = /** @class */ (function (_super) { } this.storeRawData(allCachedData); }; + LocalStorageStrategy.prototype.update = function (index, entity, cacheKey) { + var allCachedData = this.getRawData(); + if (allCachedData[cacheKey] && allCachedData[cacheKey][index]) { + allCachedData[cacheKey][index] = entity; + } + this.storeRawData(allCachedData); + }; LocalStorageStrategy.prototype.removeAll = function (cacheKey) { var allCachedData = this.getRawData(); if (allCachedData[cacheKey] && allCachedData[cacheKey].length) { diff --git a/dist/esm5/common/LocalStorageStrategy.js.map b/dist/esm5/common/LocalStorageStrategy.js.map index 9d4636d..55707ee 100644 --- a/dist/esm5/common/LocalStorageStrategy.js.map +++ b/dist/esm5/common/LocalStorageStrategy.js.map @@ -1 +1 @@ -{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"LocalStorageStrategy.js","sourceRoot":"","sources":["../../../common/LocalStorageStrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAa,iBAAiB,EAAC,MAAM,GAAG,CAAC;AAChD;IAA0C,wCAAgB;IAExD;QAAA,YACE,iBAAO,SAIR;QANO,oBAAc,GAAW,iBAAiB,CAAC,cAAc,CAAC;QAGhE,IAAI,OAAO,YAAY,IAAI,WAAW,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;SAC3C;;IACH,CAAC;IAED,kCAAG,GAAH,UAAI,SAA0B,EAAE,QAAgB;QAC9C,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC5B,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SAC9B;QACD,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAAA,CAAC;IAGF,sCAAO,GAAP,UAAQ,UAA6B,EAAE,QAAgB;QACrD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAC5B,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SAC9B;QACD,aAAa,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAAA,CAAC;IAEF,qCAAM,GAAN,UAAO,QAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;IAAA,CAAC;IAEF,4CAAa,GAAb,UAAc,KAAa,EAAE,QAAgB;QAC3C,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAGD,qCAAM,GAAN,UAAO,KAAa,EAAE,MAAW,EAAE,QAAgB;QACjD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,4CAAa,GAAb,UAAc,KAAa,EAAE,MAAW,EAAE,QAAgB;QACxD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,qCAAM,GAAN,UAAO,KAAa,EAAE,MAAW,EAAE,QAAgB;QACjD,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,wCAAS,GAAT,UAAU,QAAgB;QACxB,IAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YAC7D,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAEO,yCAAU,GAAlB;QACE,IAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC;IAEO,2CAAY,GAApB,UAAqB,IAA6C;QAChE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IACH,2BAAC;AAAD,CAAC,AArFD,CAA0C,gBAAgB,GAqFzD"} \ No newline at end of file diff --git a/dist/esm5/promise.cacheable.decorator.js b/dist/esm5/promise.cacheable.decorator.js index 009f2ec..0e8422f 100644 --- a/dist/esm5/promise.cacheable.decorator.js +++ b/dist/esm5/promise.cacheable.decorator.js @@ -53,7 +53,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair /** * cache duration has expired - remove it from the cachePairs array */ - storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); + storageStrategy.remove ? storageStrategy.remove(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.removeAtIndex(cachePairs.indexOf(_foundCachePair), cacheKey); _foundCachePair = null; } else if (cacheConfig.slidingExpiration || GlobalCacheConfig.slidingExpiration) { @@ -61,7 +61,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair * renew cache duration */ _foundCachePair.created = new Date(); - storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); + storageStrategy.update ? storageStrategy.update(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey) : storageStrategy.updateAtIndex(cachePairs.indexOf(_foundCachePair), _foundCachePair, cacheKey); } } if (_foundCachePair) { @@ -85,7 +85,7 @@ var getResponse = function (oldMethod, cacheKey, cacheConfig, context, cachePair (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) === 1 || ((cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) && (cacheConfig.maxCacheCount || GlobalCacheConfig.maxCacheCount) < cachePairs.length + 1)) { - storageStrategy.removeAtIndex(0, cacheKey); + storageStrategy.remove ? storageStrategy.remove(0, cachePairs[0], cacheKey) : storageStrategy.removeAtIndex(0, cacheKey); } storageStrategy.add({ parameters: cacheParameters, diff --git a/dist/esm5/promise.cacheable.decorator.js.map b/dist/esm5/promise.cacheable.decorator.js.map index 8ddaf3d..3378029 100644 --- a/dist/esm5/promise.cacheable.decorator.js.map +++ b/dist/esm5/promise.cacheable.decorator.js.map @@ -1 +1 @@ -{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"promise.cacheable.decorator.js","sourceRoot":"","sources":["../../promise.cacheable.decorator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAC,sBAAsB,EAAc,iBAAiB,EAAoB,cAAc,EAAC,MAAM,UAAU,CAAC;AAIjH,MAAM,CAAC,IAAM,gCAAgC,GAAG,IAAI,OAAO,EAAQ,CAAC;AAGpE,IAAM,WAAW,GAAG,UAAC,SAAmB,EAAE,QAAgB,EAAE,WAAyB,EAAE,OAAY,EAAE,UAA6B,EAAE,UAAiB,EAAE,iBAA2G,EAAE,eAAyD,EAAE,qBAA0B;IACvV,IAAI,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,UAAA,EAAE;QACtC,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;IAAzD,CAAyD,CAC1D,CAAC;IACF,IAAM,sBAAsB,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAA,EAAE;QACtD,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;IAAzD,CAAyD,CAC1D,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,eAAe,IAAI,eAAe,CAAC,OAAO,EAAE;QAClG,IACE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;YAClE,CAAC,WAAW,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAChD;YACA;;eAEG;YACH,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC/L,eAAe,GAAG,IAAI,CAAC;SACxB;aAAM,IAAI,WAAW,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,iBAAiB,EAAE;YAC/E;;eAEG;YACH,eAAe,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;YACrC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;SACjN;KACF;IAED,IAAI,eAAe,EAAE;QACnB,OAAO,qBAAqB,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;KAChE;SAAM,IAAI,sBAAsB,EAAE;QACjC,OAAO,sBAAsB,CAAC,QAAQ,CAAC;KAExC;SAAM;QACL,IAAM,SAAS,GAAI,SAAS,CAAC,IAAI,OAAd,SAAS,GAAM,OAAO,SAAK,UAAU,EAAkB;aACvE,IAAI,CAAC,UAAA,QAAQ;YACZ,eAAe,CAAC,iBAAiB,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAC5D;;;;eAIG;YACH,IACE,CAAC,WAAW,CAAC,kBAAkB;gBAC/B,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EACxC;gBACA,IACE,CAAC,CAAC,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,aAAa,CAAC;oBAC/D,CAAC,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC;oBACpE,CAAC,CAAC,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,aAAa,CAAC;wBAC7D,CAAC,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EACzF;oBACA,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;iBAC1H;gBACD,eAAe,CAAC,GAAG,CAAC;oBAClB,UAAU,EAAE,eAAe;oBAC3B,QAAQ,UAAA;oBACR,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;iBAC9E,EAAE,QAAQ,CAAC,CAAC;aACd;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,KAAK;YACV,eAAe,CAAC,iBAAiB,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAC5D,OAAO,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL;;WAEG;QACH,iBAAiB,CAAC,IAAI,CAAC;YACrB,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,IAAI,IAAI,EAAE;SACpB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAA;AAED,IAAM,eAAe,GAAG,UACtB,UAAgC,EAChC,UAAe,EACf,WAAyB;IAEzB,IAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D;;OAEG;IACH,IAAM,yBAAyB,GAAG,UAAU,CAAC,IAAI,CAAC,UAAA,EAAE;QAClD,OAAA,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;IAAzD,CAAyD,CAC1D,CAAC;IACF,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,qBAAqB,WAA8B;IAA9B,4BAAA,EAAA,gBAA8B;IACvD,OAAO,UACL,OAAe,EACf,YAAoB,EACpB,kBAAqE;QAHhE,iBAqDN;QAhDC,IAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,GAAG,YAAY,CAAC;QACvF,IAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC3C,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAClD,IAAI,iBAAe,GAA6C,CAAC,WAAW,CAAC,eAAe;gBAC1F,CAAC,CAAC,IAAI,iBAAiB,CAAC,eAAe,EAAE;gBACzC,CAAC,CAAC,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;YACtC,IAAM,mBAAiB,GAAoC,EAAE,CAAC;YAC9D,IAAI,WAAW,CAAC,aAAa,EAAE;gBAC7B,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,UAAM,QAAQ;;;4BAAI,KAAA,CAAA,KAAA,iBAAe,CAAA,CAAC,OAAO,CAAA;4BAAC,KAAA,QAAQ,CAAA;4BAAC,qBAAM,iBAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAA;gCAAvE,sBAAA,cAAwB,kBAAS,SAAsC,EAAC,EAAE,QAAQ,EAAC,EAAA;;yBAAA,CAAC,CAAA;aAC3I;YACD;;;;eAIG;YACH,KAAK,CACH,gCAAgC,CAAC,YAAY,EAAE,EAC/C,WAAW,CAAC,mBAAmB;gBAC7B,CAAC,CAAC,WAAW,CAAC,mBAAmB;gBACjC,CAAC,CAAC,KAAK,EAAE,CACZ,CAAC,SAAS,CAAC,UAAA,CAAC;gBACX,iBAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpC,mBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YAEH,IAAM,aAAa,GAAG,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,aAAa,CAAC;YACnF,WAAW,CAAC,aAAa,GAAG,aAAa;gBACvC,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,sBAAsB,CAAC;YAC3B,IAAM,WAAW,GAAG,WAAW,CAAC,WAAW,IAAI,iBAAiB,CAAC,WAAW,CAAC;YAC7E,WAAW,CAAC,WAAW,GAAG,WAAW;gBACnC,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,cAAc,CAAC;YAEnB,6EAA6E;YAC5E,kBAAkB,CAAC,KAAa,GAAG;gBAAA,iBASnC;gBAT4C,oBAAyB;qBAAzB,UAAyB,EAAzB,qBAAyB,EAAzB,IAAyB;oBAAzB,+BAAyB;;gBACpE,IAAM,qBAAqB,GAAG,OAAO,iBAAiB,CAAC,qBAAqB,KAAK,UAAU,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,KAAK,OAAO,CAAC,CAAC,CAAC;oBACnJ,iBAAiB,CAAC,qBAAsD,CAAC,IAAI,CAAC,IAAI,CAAC;oBACpF,CAAC,CAAC,iBAAiB,CAAC,qBAA+C,CAAC;gBACtE,IAAI,UAAU,GAAG,iBAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClD,IAAI,CAAC,CAAC,UAAU,YAAY,qBAAqB,CAAC,EAAE;oBAClD,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;iBACxD;gBACD,OAAQ,UAAyC,CAAC,IAAI,CAAC,UAAA,UAAU,IAAI,OAAA,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAI,EAAE,UAAU,EAAE,UAAU,EAAE,mBAAiB,EAAE,iBAAe,EAAE,qBAAqB,CAAC,EAAtI,CAAsI,CAAC,CAAA;YAC9M,CAAC,CAAC;SACH;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAAA,CAAC"} \ No newline at end of file diff --git a/package.json b/package.json index e9e958a..681488e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-cacheable", - "version": "1.0.3", + "version": "1.0.4", "description": "Promise/Observable cache decorators", "main": "./dist/cjs/index.js", "module": "./dist/esm5/index.js", From e92957d1a6fbc17fe8ba9b9e880fe96c7ecf2f79 Mon Sep 17 00:00:00 2001 From: Angel Nikolov Date: Sat, 20 Feb 2021 22:43:22 +0200 Subject: [PATCH 3/4] Updated readme. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d94e9b3..a05ed45 100644 --- a/README.md +++ b/README.md @@ -186,8 +186,16 @@ It's also really easy to implement your own caching strategy, by extending the I export abstract class IStorageStrategy { abstract getAll(cacheKey: string): Array>; abstract add(entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use update instead. + */ abstract updateAtIndex(index: number, entity: ICachePair, cacheKey: string): void; + abstract update?(index: number, entity: ICachePair, cacheKey: string): void; + /** + * @deprecated Use remove instead. + */ abstract removeAtIndex(index: number, cacheKey: string): void; + abstract remove?(index: number, entity: ICachePair, cacheKey: string): void; abstract removeAll(cacheKey: string): void; } ``` From 518b1e626dee75ca08e59f0f1b26130462a794b7 Mon Sep 17 00:00:00 2001 From: Angel Nikolov Date: Sun, 21 Feb 2021 13:00:41 +0200 Subject: [PATCH 4/4] Karma single run. --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 8878c25..c1e0677 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -40,6 +40,6 @@ module.exports = function(config) { flags: ['--no-sandbox'] } }, - singleRun: false + singleRun: true }); };