feat(element_injector): allow @optional for ProtoViewRef

Author: jelbourn

modules/angular2/src/core/compiler/element_injector.js

@@ -851,6 +851,10 @@ export class ElementInjector extends TreeNode {
  }
  if (dep.key.id === StaticKeys.instance().protoViewId) {
  if (isBlank(this._preBuiltObjects.protoView)) {
+ if (dep.optional) {
+ return null;
+ }
+
  throw new NoBindingError(dep.key);
  }
  return new ProtoViewRef(this._preBuiltObjects.protoView);

modules/angular2/test/core/compiler/element_injector_spec.js

@@ -150,6 +150,13 @@ class NeedsProtoViewRef {
  }
 }
 
+class OptionallyInjectsProtoViewRef {
+ protoViewRef;
+ constructor(@Optional() ref:ProtoViewRef) {
+ this.protoViewRef = ref;
+ }
+}
+
 class NeedsChangeDetectorRef {
  changeDetectorRef;
  constructor(cdr:ChangeDetectorRef) {
@@ -811,6 +818,12 @@ export function main() {
  () => injector([NeedsProtoViewRef])
  ).toThrowError('No provider for ProtoViewRef! (NeedsProtoViewRef -> ProtoViewRef)');
  });
+
+ it('should inject null if there is no ProtoViewRef when the dependency is optional', () => {
+ var inj = injector([OptionallyInjectsProtoViewRef]);
+ var instance = inj.get(OptionallyInjectsProtoViewRef);
+ expect(instance.protoViewRef).toBeNull();
+ });
  });
 
  describe('directive queries', () => {