@travetto/di 3.1.0-rc.4 → 3.1.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/di",
-  "version": "3.1.0-rc.4",
+  "version": "3.1.0-rc.5",
   "description": "Dependency registration/management and injection support.",
   "keywords": [
     "ast-transformations",
@@ -30,7 +30,7 @@
     "@travetto/registry": "^3.1.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^3.1.0-rc.4"
+    "@travetto/transformer": "^3.1.0-rc.5"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/support/transformer.injectable.ts

@@ -3,7 +3,6 @@ import ts from 'typescript';
 import {
   TransformerState, DecoratorMeta, OnClass, OnProperty, OnStaticMethod, DecoratorUtil, LiteralUtil, OnSetter
 } from '@travetto/transformer';
-import { ForeignType } from '@travetto/transformer/src/resolver/types';
 
 const INJECTABLE_MOD = '@travetto/di/src/decorator';
 
@@ -12,12 +11,6 @@ const INJECTABLE_MOD = '@travetto/di/src/decorator';
  */
 export class InjectableTransformer {
 
-  static foreignTarget(state: TransformerState, ret: ForeignType): ts.Expression {
-    return state.fromLiteral({
-      Ⲑid: `${ret.source.split('node_modules')[1]}+${ret.name}`
-    });
-  }
-
   /**
    * Handle a specific declaration param/property
    */
@@ -44,7 +37,7 @@ export class InjectableTransformer {
     if (type.key === 'managed') {
       payload.target = state.getOrImport(type);
     } else if (type.key === 'foreign') {
-      payload.target = this.foreignTarget(state, type);
+      payload.target = state.getForeignTarget(state, type);
     } else {
       const file = param.getSourceFile().fileName;
       const src = state.getFileImportName(file);
@@ -158,11 +151,14 @@ export class InjectableTransformer {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       src: (node.parent as ts.ClassDeclaration).name,
     };
-    const ret = state.resolveReturnType(node);
+    let ret = state.resolveReturnType(node);
+    if (ret.key === 'literal' && ret.ctor === Promise && ret.typeArguments) {
+      ret = ret.typeArguments![0];
+    }
     if (ret.key === 'managed') {
       config.target = state.getOrImport(ret);
     } else if (ret.key === 'foreign') {
-      config.target = this.foreignTarget(state, ret);
+      config.target = state.getForeignTarget(state, ret);
     }
 
     // Build decl