@travetto/cache 6.0.0 → 6.0.1

package/package.json

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

package/src/decorator.ts

@@ -24,6 +24,12 @@ export function Cache<F extends string, U extends Record<F, CacheService>>(
   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));
+    // 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) {
+      return this[field].cache(this, propertyKey, handler, [...arguments]);
+    });
+    Object.defineProperty(_descriptor.value, 'name', { value: propertyKey, writable: false });
   };
   return castTo(dec);
 }
@@ -39,5 +45,11 @@ export function EvictCache<F extends string, U extends Record<F, CacheService>>(
   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));
+    // 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) {
+      return this[field].evict(this, propertyKey, handler, [...arguments]);
+    });
+    Object.defineProperty(_descriptor.value, 'name', { value: propertyKey, writable: false });
   };
 }

package/support/transformer.cache.ts

@@ -1,68 +0,0 @@
-import ts from 'typescript';
-
-import { TransformerState, DecoratorMeta, OnMethod } from '@travetto/transformer';
-
-/**
- * Transform the cache headers
- */
-export class CacheTransformer {
-
-  /**
-   * When `@Cache` and `@Evict` are present
-   */
-  @OnMethod('Cache', 'Evict')
-  static instrumentCache(state: TransformerState, node: ts.MethodDeclaration, dm?: DecoratorMeta): ts.MethodDeclaration {
-
-    const isCache = !!state.findDecorator(this, node, 'Cache');
-    const dec = dm?.dec;
-
-    // If valid function
-    if (dec && ts.isCallExpression(dec.expression)) {
-      const params = dec.expression.arguments;
-      const mainExpression = params[0];
-
-      const op = isCache ? 'cache' : 'evict';
-
-      // Create an arrow function to retain the `this` value.
-      const fn = state.factory.createArrowFunction(
-        [state.factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
-        undefined,
-        [],
-        undefined,
-        undefined,
-        node.body!
-      );
-
-      // Return new method calling evict or cache depending on decorator.
-      return state.factory.updateMethodDeclaration(
-        node,
-        node.modifiers,
-        node.asteriskToken,
-        node.name,
-        node.questionToken,
-        node.typeParameters,
-        node.parameters,
-        node.type,
-        state.factory.createBlock([
-          state.factory.createReturnStatement(
-            state.factory.createCallExpression(
-              state.factory.createPropertyAccessExpression(
-                state.factory.createElementAccessExpression(state.factory.createThis(), mainExpression), op
-              ),
-              undefined,
-              [
-                state.factory.createThis(),
-                state.factory.createStringLiteral(node.name.getText()),
-                fn,
-                state.factory.createArrayLiteralExpression([
-                  state.factory.createSpreadElement(state.createIdentifier('arguments'))
-                ])
-              ]
-            )
-          )
-        ])
-      );
-    }
-    return node;
-  }
-}