#3 make cache decorators work on getters as well

Author: PierreDuc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-method-cache",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "license": "Apache-2.0",
   "author": {
     "name": "Poul Kruijt",

src/core/decorator/base-cache.decorator.spec.ts

@@ -7,6 +7,14 @@ class TestCache {
 
   public called: number = 0;
 
+  public getterCalled: number = 0;
+
+  @baseCacheDecorator(CacheType.Memory)
+  get testGetter(): string {
+    this.getterCalled++;
+    return 'testGetter';
+  }
+
   @baseCacheDecorator(CacheType.Memory)
   public testMethod(test: number = 0, decrement: number = 0): number {
     this.called++;
@@ -31,6 +39,13 @@ describe('Cache decorator is properly set', () => {
     expect(testCache.called).toEqual(3);
   });
 
+  it("should work for a getter", () => {
+    testCache.testGetter;
+    testCache.testGetter;
+
+    expect(testCache.getterCalled).toEqual(1);
+  });
+
   it("should return the right value for the right argument(s)", () => {
     const value1: number = 5;
     const value2: number = 10;

src/core/decorator/base-cache.decorator.ts

@@ -8,7 +8,11 @@ export function baseCacheDecorator<T extends BaseCacheOptions>(cacheType: CacheT
 
   return (target: object, method: string | symbol, descriptor: PropertyDescriptor): PropertyDescriptor => {
 
-    descriptor.value = createCacheDecorator(cacheType, target, descriptor.value!, options as T);
+    if (descriptor.hasOwnProperty('get')) {
+      descriptor.get = createCacheDecorator(cacheType, target, descriptor.get!, options as T);
+    } else if (!descriptor.hasOwnProperty('set')) {
+      descriptor.value = createCacheDecorator(cacheType, target, descriptor.value!, options as T);
+    }
 
     return descriptor;
 

src/core/util/decorator.util.ts

@@ -7,7 +7,7 @@ import {getCacheContainer, getMethodCacheProvider, setCacheContainer} from '../r
 
 import {createGUID} from './string.util';
 
-export function createCacheDecorator(type: CacheType, target: Object, method: Function, options: BaseCacheOptions): Function {
+export function createCacheDecorator(type: CacheType, target: Object, method: Function, options: BaseCacheOptions): () => any {
 
   const provider: BaseCacheProvider<BaseCacheObject<BaseCacheOptions>, BaseCacheOptions> = getMethodCacheProvider(type);
   const cacheObject: BaseCacheObject<BaseCacheOptions> = provider.getCacheObject(options.key!) || provider.createCacheObject(options);