@travetto/di
Advanced tools
Comparing version 3.1.0-rc.4 to 3.1.0-rc.5
{ | ||
"name": "@travetto/di", | ||
"version": "3.1.0-rc.4", | ||
"version": "3.1.0-rc.5", | ||
"description": "Dependency registration/management and injection support.", | ||
@@ -33,3 +33,3 @@ "keywords": [ | ||
"peerDependencies": { | ||
"@travetto/transformer": "^3.1.0-rc.4" | ||
"@travetto/transformer": "^3.1.0-rc.5" | ||
}, | ||
@@ -36,0 +36,0 @@ "peerDependenciesMeta": { |
@@ -6,3 +6,2 @@ import ts from 'typescript'; | ||
} from '@travetto/transformer'; | ||
import { ForeignType } from '@travetto/transformer/src/resolver/types'; | ||
@@ -16,8 +15,2 @@ const INJECTABLE_MOD = '@travetto/di/src/decorator'; | ||
static foreignTarget(state: TransformerState, ret: ForeignType): ts.Expression { | ||
return state.fromLiteral({ | ||
Ⲑid: `${ret.source.split('node_modules')[1]}+${ret.name}` | ||
}); | ||
} | ||
/** | ||
@@ -49,3 +42,3 @@ * Handle a specific declaration param/property | ||
} else if (type.key === 'foreign') { | ||
payload.target = this.foreignTarget(state, type); | ||
payload.target = state.getForeignTarget(state, type); | ||
} else { | ||
@@ -164,7 +157,10 @@ const file = param.getSourceFile().fileName; | ||
}; | ||
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); | ||
} | ||
@@ -171,0 +167,0 @@ |
47579
919