Commit7f7ca0a

authored

Fix using multiple decorators on the same instance (#78)

1 parent3b1b8a7 commit7f7ca0aCopy full SHA for 7f7ca0a

File tree

+13

-8

lines changed

+13

-8

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@ import mapAgeCleaner from 'map-age-cleaner';`
`3`	`3`
`4`	`4`	`typeAnyFunction=(...arguments_:any)=>any;`
`5`	`5`
`6`		`-constdecoratorInstanceMap=newWeakMap();`
`7`		`-`
`8`	`6`	`constcacheStore=newWeakMap<AnyFunction,CacheStorage<any,any>>();`
`9`	`7`
`10`	`8`	`interfaceCacheStorageContent<ValueType>{`
`@@ -169,6 +167,8 @@ export function memDecorator<`
`169`	`167`	`>(`
`170`	`168`	`options:Options<FunctionToMemoize,CacheKeyType>={},`
`171`	`169`	`){`
	`170`	`+constinstanceMap=newWeakMap();`
	`171`	`+`
`172`	`172`	`return(`
`173`	`173`	`target:any,`
`174`	`174`	`propertyKey:string,`
`@@ -184,13 +184,13 @@ export function memDecorator<`
`184`	`184`	`deletedescriptor.writable;`
`185`	`185`
`186`	`186`	`descriptor.get=function(){`
`187`		`-if(!decoratorInstanceMap.has(this)){`
	`187`	`+if(!instanceMap.has(this)){`
`188`	`188`	`constvalue=mem(input,options)asFunctionToMemoize;`
`189`		`-decoratorInstanceMap.set(this,value);`
	`189`	`+instanceMap.set(this,value);`
`190`	`190`	`returnvalue;`
`191`	`191`	`}`
`192`	`192`
`193`		`-returndecoratorInstanceMap.get(this)asFunctionToMemoize;`
	`193`	`+returninstanceMap.get(this)asFunctionToMemoize;`
`194`	`194`	`};`
`195`	`195`	`};`
`196`	`196`	`}`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,19 +239,24 @@ test('prototype support', t => {`
`239`	`239`
`240`	`240`	`test('.decorator()',t=>{`
`241`	`241`	`letreturnValue=1;`
	`242`	`+constreturnValue2=101;`
`242`	`243`
`243`	`244`	`classTestClass{`
`244`	`245`	`@memDecorator()`
`245`	`246`	`counter(){`
`246`		`-returnreturnValue;`
	`247`	`+returnreturnValue++;`
	`248`	`+}`
	`249`	`+`
	`250`	`+@memDecorator()`
	`251`	`+counter2(){`
	`252`	`+returnreturnValue2;`
`247`	`253`	`}`
`248`	`254`	`}`
`249`	`255`
`250`	`256`	`constalpha=newTestClass();`
`251`	`257`	`t.is(alpha.counter(),1);`
`252`	`258`	`t.is(alpha.counter(),1,'The method should be memoized');`
`253`		`-`
`254`		`-returnValue++;`
	`259`	`+t.is(alpha.counter2(),101,'The method should be memoized separately from the other one');`
`255`	`260`
`256`	`261`	`constbeta=newTestClass();`
`257`	`262`	`t.is(beta.counter(),2,'The method should not be memoized across instances');`

Comments

(0)