@travetto/cache 6.0.1 → 7.0.0-rc.1

package/README.md

@@ -83,7 +83,7 @@ The [@Cache](https://github.com/travetto/travetto/tree/main/module/cache/src/dec
       *  `reinstate` the function to execute on return of a cached value.  This allows for any necessary operations to conform to expected output (e.g. re-establishing class instances, etc.).  This method should not be used often, as the return values of the methods should naturally serialize to/from `JSON` and the values should be usable either way.
 
 ### EvictCache
-Additionally, there is support for planned eviction via the [@EvictCache](https://github.com/travetto/travetto/tree/main/module/cache/src/decorator.ts#L38) decorator.  On successful execution of a method with this decorator, the matching keySpace/key value will be evicted from the cache.  This requires coordination between multiple methods, to use the same `keySpace` and `key` to compute the expected key.
+Additionally, there is support for planned eviction via the [@EvictCache](https://github.com/travetto/travetto/tree/main/module/cache/src/decorator.ts#L44) decorator.  On successful execution of a method with this decorator, the matching keySpace/key value will be evicted from the cache.  This requires coordination between multiple methods, to use the same `keySpace` and `key` to compute the expected key.
 
 **Code: Using decorators to cache/evict user access**
 ```typescript

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cache",
-  "version": "6.0.1",
+  "version": "7.0.0-rc.1",
   "description": "Caching functionality with decorators for declarative use.",
   "keywords": [
     "typescript",
@@ -25,12 +25,12 @@
     "directory": "module/cache"
   },
   "dependencies": {
-    "@travetto/di": "^6.0.1",
-    "@travetto/model": "^6.0.1"
+    "@travetto/di": "^7.0.0-rc.0",
+    "@travetto/model": "^7.0.0-rc.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^6.0.2",
-    "@travetto/transformer": "^6.0.1"
+    "@travetto/test": "^7.0.0-rc.0",
+    "@travetto/transformer": "^7.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/decorator.ts

@@ -7,7 +7,7 @@ import { CoreCacheConfig, CacheConfig, CacheAware, CacheConfigSymbol, EvictConfi
  * Indicates a method is intended to cache.  The return type must be properly serializable
  * @param field The field of the cache source
  * @param config The additional cache configuration
- * @augments `@travetto/cache:Cache`
+ * @kind decorator
  */
 export function Cache<F extends string, U extends Record<F, CacheService>>(field: F, maxAge: number | TimeSpan, config?: Omit<CacheConfig, 'maxAge'>): MethodDecorator;
 export function Cache<F extends string, U extends Record<F, CacheService>>(field: F, cfg?: CacheConfig): MethodDecorator;
@@ -21,15 +21,15 @@ export function Cache<F extends string, U extends Record<F, CacheService>>(
       config = cfg;
     }
   }
-  const dec = function <R extends Promise<unknown>>(target: U & CacheAware, propertyKey: string, _descriptor: MethodDescriptor<R>): void {
+  const dec = function <R extends Promise<unknown>>(target: U & CacheAware, propertyKey: string, descriptor: MethodDescriptor<R>): void {
     config.keySpace ??= `${target.constructor.name}.${propertyKey}`;
     (target[CacheConfigSymbol] ??= {})[propertyKey] = config;
-    const handler = _descriptor.value!.bind(castTo(target));
+    const handler = descriptor.value!;
     // Allows for DI to run, as the service will not be bound until after the decorator is run
-    _descriptor.value = castTo(function (this: typeof target) {
+    descriptor.value = castTo(function (this: typeof target) {
       return this[field].cache(this, propertyKey, handler, [...arguments]);
     });
-    Object.defineProperty(_descriptor.value, 'name', { value: propertyKey, writable: false });
+    Object.defineProperty(descriptor.value, 'name', { value: propertyKey, writable: false });
   };
   return castTo(dec);
 }
@@ -39,17 +39,17 @@ export function Cache<F extends string, U extends Record<F, CacheService>>(
  * freshest data will be collected
  * @param field The field of the cache source
  * @param config The additional cache configuration
- * @augments `@travetto/cache:Evict`
+ * @kind decorator
  */
 export function EvictCache<F extends string, U extends Record<F, CacheService>>(field: F, config: CoreCacheConfig = {}) {
-  return function <R extends Promise<unknown>>(target: U & CacheAware, propertyKey: string, _descriptor: MethodDescriptor<R>): void {
+  return function <R extends Promise<unknown>>(target: U & CacheAware, propertyKey: string, descriptor: MethodDescriptor<R>): void {
     config.keySpace ??= `${target.constructor.name}.${propertyKey}`;
     (target[EvictConfigSymbol] ??= {})[propertyKey] = config;
-    const handler = _descriptor.value!.bind(castTo(target));
+    const handler = descriptor.value!;
     // Allows for DI to run, as the service will not be bound until after the decorator is run
-    _descriptor.value = castTo(function (this: typeof target) {
+    descriptor.value = castTo(function (this: typeof target) {
       return this[field].evict(this, propertyKey, handler, [...arguments]);
     });
-    Object.defineProperty(_descriptor.value, 'name', { value: propertyKey, writable: false });
+    Object.defineProperty(descriptor.value, 'name', { value: propertyKey, writable: false });
   };
 }

package/src/service.ts

@@ -33,7 +33,7 @@ export class CacheService {
 
   #modelService: ModelExpirySupport;
 
-  constructor(@Inject(CacheModelSymbol, { resolution: 'loose' }) modelService: ModelExpirySupport) {
+  constructor(@Inject({ qualifier: CacheModelSymbol, resolution: 'loose' }) modelService: ModelExpirySupport) {
     this.#modelService = modelService;
   }