iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(di): provide two ways to create an injector, resolved and unresolved

Browse Source 
Add two factory static functions to Injector: resolveAndCreate and
fromResolvedBindings.

We want to avoid resolution and flattening every time we create a new
injector. This commit allows the user to cache resolved bindings and
reuse them.
This commit is contained in:
Yegor Jbanov
2015-04-10 17:05:31 -07:00
parent 6c8398df9b
commit 4a961f4ecb
24 changed files with 160 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/angular2/test/core/compiler/element_injector_spec.js
Vendored
+22 -22
View File
@@ -209,7 +209,7 @@ class TestNode extends TreeNode {
export function main() {
var defaultPreBuiltObjects = new PreBuiltObjects(null, null, null, null);
var appInjector = new Injector([]);
var appInjector = Injector.resolveAndCreate([]);
function humanize(tree, names:List) {
var lookupName = (item) =>
@@ -236,7 +236,7 @@ export function main() {
function parentChildInjectors(parentBindings, childBindings, parentPreBuildObjects = null) {
if (isBlank(parentPreBuildObjects)) parentPreBuildObjects = defaultPreBuiltObjects;
var inj = new Injector([]);
var inj = Injector.resolveAndCreate([]);
var protoParent = new ProtoElementInjector(null, 0, parentBindings);
var parent = protoParent.instantiate(null);
@@ -253,8 +253,8 @@ export function main() {
function hostShadowInjectors(hostBindings, shadowBindings, hostPreBuildObjects = null) {
if (isBlank(hostPreBuildObjects)) hostPreBuildObjects = defaultPreBuiltObjects;
var inj = new Injector([]);
var shadowInj = inj.createChild([]);
var inj = Injector.resolveAndCreate([]);
var shadowInj = inj.resolveAndCreateChild([]);
var protoParent = new ProtoElementInjector(null, 0, hostBindings, true);
var host = protoParent.instantiate(null);
@@ -455,7 +455,7 @@ export function main() {
});
it("should instantiate directives that depend on app services", function () {
var appInjector = new Injector([
var appInjector = Injector.resolveAndCreate([
bind("service").toValue("service")
]);
var inj = injector([NeedsService], appInjector);
@@ -487,7 +487,7 @@ export function main() {
});
it("should instantiate component directives that depend on app services in the shadow app injector", () => {
var shadowAppInjector = new Injector([
var shadowAppInjector = Injector.resolveAndCreate([
bind("service").toValue("service")
]);
var inj = injector([NeedsService], null, shadowAppInjector);
@@ -498,7 +498,7 @@ export function main() {
});
it("should not instantiate other directives that depend on app services in the shadow app injector", () => {
var shadowAppInjector = new Injector([
var shadowAppInjector = Injector.resolveAndCreate([
bind("service").toValue("service")
]);
expect(() => {
@@ -507,7 +507,7 @@ export function main() {
});
it("should return app services", function () {
var appInjector = new Injector([
var appInjector = Injector.resolveAndCreate([
bind("service").toValue("service")
]);
var inj = injector([], appInjector);
@@ -687,7 +687,7 @@ export function main() {
it("should inject services of the dynamically-loaded component", () => {
var inj = injector([]);
var appInjector = new Injector([bind("service").toValue("Service")]);
var appInjector = Injector.resolveAndCreate([bind("service").toValue("Service")]);
inj.dynamicallyCreateComponent(NeedsService, null, appInjector);
expect(inj.getDynamicallyLoadedComponent().service).toEqual("Service");
});
@@ -844,8 +844,8 @@ export function main() {
var parent = protoParent.instantiate(null);
var child = protoChild.instantiate(parent);
parent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
parent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
expectDirectives(parent.get(NeedsQuery).query, CountingDirective, [0,1]);
});
@@ -856,8 +856,8 @@ export function main() {
var parent = protoParent.instantiate(null);
var child = protoChild.instantiate(parent);
parent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
parent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child.unlink();
@@ -873,9 +873,9 @@ export function main() {
var child1 = protoChild1.instantiate(parent);
var child2 = protoChild2.instantiate(parent);
parent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child1.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child2.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
parent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child1.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child2.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child1.unlink();
child1.link(parent);
@@ -893,9 +893,9 @@ export function main() {
var child1 = protoChild1.instantiate(parent);
var child2 = protoChild2.instantiate(parent);
parent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child1.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child2.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
parent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child1.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child2.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child2.unlink();
child2.linkAfter(parent, null);
@@ -913,9 +913,9 @@ export function main() {
var parent = protoParent.instantiate(grandParent);
var child = protoChild.instantiate(parent);
grandParent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
parent.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
child.instantiateDirectives(new Injector([]), null, null, preBuildObjects);
grandParent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
parent.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
child.instantiateDirectives(Injector.resolveAndCreate([]), null, null, preBuildObjects);
var queryList1 = grandParent.get(NeedsQuery).query;
var queryList2 = parent.get(NeedsQuery).query;
modules/angular2/test/di/async_spec.js
Vendored
+13 -13
View File
@@ -41,7 +41,7 @@ export function main() {
describe("asyncGet", function () {
it('should return a promise', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers)
]);
var p = injector.asyncGet(UserList);
@@ -49,7 +49,7 @@ export function main() {
});
it('should return a promise when the binding is sync', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
SynchronousUserList
]);
var p = injector.asyncGet(SynchronousUserList);
@@ -57,7 +57,7 @@ export function main() {
});
it("should return a promise when the binding is sync (from cache)", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
UserList
]);
expect(injector.get(UserList)).toBeAnInstanceOf(UserList);
@@ -65,7 +65,7 @@ export function main() {
});
it('should return the injector', inject([AsyncTestCompleter], (async) => {
var injector = new Injector([]);
var injector = Injector.resolveAndCreate([]);
var p = injector.asyncGet(Injector);
p.then(function (injector) {
expect(injector).toBe(injector);
@@ -75,7 +75,7 @@ export function main() {
it('should return a promise when instantiating a sync binding ' +
'with an async dependency', inject([AsyncTestCompleter], (async) => {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers),
UserController
]);
@@ -88,7 +88,7 @@ export function main() {
}));
it("should create only one instance (async + async)", inject([AsyncTestCompleter], (async) => {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers)
]);
@@ -102,7 +102,7 @@ export function main() {
}));
it("should create only one instance (sync + async)", inject([AsyncTestCompleter], (async) => {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
UserList
]);
@@ -119,7 +119,7 @@ export function main() {
}));
it('should show the full path when error happens in a constructor', inject([AsyncTestCompleter], (async) => {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
UserController,
bind(UserList).toAsyncFactory(function () {
throw "Broken UserList";
@@ -136,7 +136,7 @@ export function main() {
describe("get", function () {
it('should throw when instantiating an async binding', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers)
]);
@@ -145,7 +145,7 @@ export function main() {
});
it('should throw when instantiating a sync binding with an async dependency', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers),
UserController
]);
@@ -156,7 +156,7 @@ export function main() {
it('should not throw when instantiating a sync binding with a resolved async dependency',
inject([AsyncTestCompleter], (async) => {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers),
UserController
]);
@@ -168,7 +168,7 @@ export function main() {
}));
it('should resolve synchronously when an async dependency requested as a promise', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toAsyncFactory(fetchUsers),
AsyncUserController
]);
@@ -179,7 +179,7 @@ export function main() {
});
it('should wrap sync dependencies into promises if required', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(UserList).toFactory(() => new UserList()),
AsyncUserController
]);
modules/angular2/test/di/injector_spec.js
Vendored
+36 -36
View File
@@ -75,14 +75,14 @@ class NoAnnotations {
export function main() {
describe('injector', function () {
it('should instantiate a class without dependencies', function () {
var injector = new Injector([Engine]);
var injector = Injector.resolveAndCreate([Engine]);
var engine = injector.get(Engine);
expect(engine).toBeAnInstanceOf(Engine);
});
it('should resolve dependencies based on type information', function () {
var injector = new Injector([Engine, Car]);
var injector = Injector.resolveAndCreate([Engine, Car]);
var car = injector.get(Car);
expect(car).toBeAnInstanceOf(Car);
@@ -90,7 +90,7 @@ export function main() {
});
it('should resolve dependencies based on @Inject annotation', function () {
var injector = new Injector([TurboEngine, Engine, CarWithInject]);
var injector = Injector.resolveAndCreate([TurboEngine, Engine, CarWithInject]);
var car = injector.get(CarWithInject);
expect(car).toBeAnInstanceOf(CarWithInject);
@@ -98,12 +98,12 @@ export function main() {
});
it('should throw when no type and not @Inject', function () {
expect(() => new Injector([NoAnnotations])).toThrowError(
expect(() => Injector.resolveAndCreate([NoAnnotations])).toThrowError(
'Cannot resolve all parameters for NoAnnotations');
});
it('should cache instances', function () {
var injector = new Injector([Engine]);
var injector = Injector.resolveAndCreate([Engine]);
var e1 = injector.get(Engine);
var e2 = injector.get(Engine);
@@ -112,7 +112,7 @@ export function main() {
});
it('should bind to a value', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(Engine).toValue("fake engine")
]);
@@ -125,7 +125,7 @@ export function main() {
return new SportsCar(e);
}
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Engine,
bind(Car).toFactory(sportsCarFactory)
]);
@@ -136,7 +136,7 @@ export function main() {
});
it('should bind to an alias', function() {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Engine,
bind(SportsCar).toClass(SportsCar),
bind(Car).toAlias(SportsCar)
@@ -149,14 +149,14 @@ export function main() {
});
it('should throw when the aliased binding does not exist', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind('car').toAlias(SportsCar)
]);
expect(() => injector.get('car')).toThrowError('No provider for SportsCar! (car -> SportsCar)');
});
it('should support overriding factory dependencies', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Engine,
bind(Car).toFactory((e) => new SportsCar(e), [Engine])
]);
@@ -167,7 +167,7 @@ export function main() {
});
it('should support optional dependencies', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
CarWithOptionalEngine
]);
@@ -176,7 +176,7 @@ export function main() {
});
it("should flatten passed-in bindings", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
[[Engine, Car]]
]);
@@ -186,7 +186,7 @@ export function main() {
it("should use the last binding "+
"when there are mutliple bindings for same token", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(Engine).toClass(Engine),
bind(Engine).toClass(TurboEngine)
]);
@@ -195,7 +195,7 @@ export function main() {
});
it('should use non-type tokens', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind('token').toValue('value')
]);
@@ -203,30 +203,30 @@ export function main() {
});
it('should throw when given invalid bindings', function () {
expect(() => new Injector(["blah"])).toThrowError('Invalid binding blah');
expect(() => new Injector([bind("blah")])).toThrowError('Invalid binding blah');
expect(() => Injector.resolveAndCreate(["blah"])).toThrowError('Invalid binding blah');
expect(() => Injector.resolveAndCreate([bind("blah")])).toThrowError('Invalid binding blah');
});
it('should provide itself', function () {
var parent = new Injector([]);
var child = parent.createChild([]);
var parent = Injector.resolveAndCreate([]);
var child = parent.resolveAndCreateChild([]);
expect(child.get(Injector)).toBe(child);
});
it('should throw when no provider defined', function () {
var injector = new Injector([]);
var injector = Injector.resolveAndCreate([]);
expect(() => injector.get('NonExisting')).toThrowError('No provider for NonExisting!');
});
it('should show the full path when no provider', function () {
var injector = new Injector([CarWithDashboard, Engine, Dashboard]);
var injector = Injector.resolveAndCreate([CarWithDashboard, Engine, Dashboard]);
expect(() => injector.get(CarWithDashboard)).
toThrowError('No provider for DashboardSoftware! (CarWithDashboard -> Dashboard -> DashboardSoftware)');
});
it('should throw when trying to instantiate a cyclic dependency', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Car,
bind(Engine).toClass(CyclicEngine)
]);
@@ -239,7 +239,7 @@ export function main() {
});
it('should show the full path when error happens in a constructor', function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Car,
bind(Engine).toClass(BrokenEngine)
]);
@@ -255,7 +255,7 @@ export function main() {
it('should instantiate an object after a failed attempt', function () {
var isBroken = true;
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Car,
bind(Engine).toFactory(() => isBroken ? new BrokenEngine() : new Engine())
]);
@@ -268,13 +268,13 @@ export function main() {
});
it('should support null values', () => {
var injector = new Injector([bind('null').toValue(null)]);
var injector = Injector.resolveAndCreate([bind('null').toValue(null)]);
expect(injector.get('null')).toBe(null);
});
describe("default bindings", function () {
it("should be used when no matching binding found", function () {
var injector = new Injector([], {defaultBindings: true});
var injector = Injector.resolveAndCreate([], {defaultBindings: true});
var car = injector.get(Car);
@@ -282,7 +282,7 @@ export function main() {
});
it("should use the matching binding when it is available", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
bind(Car).toClass(SportsCar)
], {defaultBindings: true});
@@ -294,8 +294,8 @@ export function main() {
describe("child", function () {
it('should load instances from parent injector', function () {
var parent = new Injector([Engine]);
var child = parent.createChild([]);
var parent = Injector.resolveAndCreate([Engine]);
var child = parent.resolveAndCreateChild([]);
var engineFromParent = parent.get(Engine);
var engineFromChild = child.get(Engine);
@@ -304,10 +304,10 @@ export function main() {
});
it("should not use the child bindings when resolving the dependencies of a parent binding", function () {
var parent = new Injector([
var parent = Injector.resolveAndCreate([
Car, Engine
]);
var child = parent.createChild([
var child = parent.resolveAndCreateChild([
bind(Engine).toClass(TurboEngine)
]);
@@ -316,8 +316,8 @@ export function main() {
});
it('should create new instance in a child injector', function () {
var parent = new Injector([Engine]);
var child = parent.createChild([
var parent = Injector.resolveAndCreate([Engine]);
var child = parent.resolveAndCreateChild([
bind(Engine).toClass(TurboEngine)
]);
@@ -329,8 +329,8 @@ export function main() {
});
it("should create child injectors without default bindings", function () {
var parent = new Injector([], {defaultBindings: true});
var child = parent.createChild([]);
var parent = Injector.resolveAndCreate([], {defaultBindings: true});
var child = parent.resolveAndCreateChild([]);
//child delegates to parent the creation of Car
var childCar = child.get(Car);
@@ -342,7 +342,7 @@ export function main() {
describe("lazy", function () {
it("should create dependencies lazily", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Engine,
CarWithLazyEngine
]);
@@ -352,7 +352,7 @@ export function main() {
});
it("should cache instance created lazily", function () {
var injector = new Injector([
var injector = Injector.resolveAndCreate([
Engine,
CarWithLazyEngine
]);