refactor(di): removed @parent

BREAKING CHANGE
    The @parent annotation has been removed. Use @ancestor instead.
    @parent was used to enforce a particular DOM structure (e.g., a pane component is a direct child of the tabs component).
    DI is not the right mechanism to do it. We should enforce it using schema instead.

Author: vsavkin

modules/angular2/di.ts

@@ -10,7 +10,6 @@ export {
   InjectableMetadata,
   VisibilityMetadata,
   SelfMetadata,
-  ParentMetadata,
   AncestorMetadata,
   UnboundedMetadata,
   DependencyMetadata,
@@ -24,12 +23,12 @@ export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/di/forward_ref'
 export {
   Injector,
   ProtoInjector,
+  BindingWithVisibility,
   DependencyProvider,
   PUBLIC_AND_PRIVATE,
   PUBLIC,
   PRIVATE,
   undefinedValue
-
 } from './src/di/injector';
 export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding';
 export {Key, KeyRegistry, TypeLiteral} from './src/di/key';

modules/angular2/docs/core/02_directives.md

@@ -262,7 +262,6 @@ There are five kinds of visibilities:
 
 * (no annotation): Inject dependent directives only if they are on the current element.
 * `@ancestor`: Inject a directive if it is at any element above the current element.
-* `@parent`: Inject a directive which is a direct parent of the current element.
 * `@child`: Inject a list of direct children which match a given type. (Used with `Query`)
 * `@descendant`: Inject a list of any children which match a given type. (Used with `Query`)
 
@@ -301,7 +300,7 @@ class FieldSet {                     |
 class Field {                        |
   constructor(                       |
     @ancestor field:Form,            |
-    @parent field:FieldSet,          |
+    @ancestor field:FieldSet,        |
   ) { ... }                          |
 }                                    |
                                      |
@@ -337,7 +336,7 @@ Shadow DOM provides an encapsulation for components, so as a general rule it doe
 })
 class Kid {
   constructor(
-    @Parent() dad:Dad,
+    @Ancestor() dad:Dad,
     @Optional() grandpa:Grandpa
   ) {
     this.name = 'Billy';
@@ -354,7 +353,7 @@ class Kid {
   directives: [Kid]
 })
 class Dad {
-  constructor(@Parent() dad:Grandpa) {
+  constructor(@Ancestor() dad:Grandpa) {
     this.name = 'Joe Jr';
     this.dad = dad.name;
   }

modules/angular2/src/core/annotations_impl/annotations.ts

@@ -58,8 +58,6 @@ import {DEFAULT} from 'angular2/change_detection';
  *    Shadow DOM root. Current element is not included in the resolution, therefore even if it could
  * resolve it, it will
  *    be ignored.
- * - `@Parent() directive:DirectiveType`: any directive that matches the type on a direct parent
- * element only.
  * - `@Query(DirectiveType) query:QueryList<DirectiveType>`: A live collection of direct child
  * directives.
  * - `@QueryDescendants(DirectiveType) query:QueryList<DirectiveType>`: A live collection of any
@@ -163,27 +161,6 @@ import {DEFAULT} from 'angular2/change_detection';
  * This directive would be instantiated with `Dependency` declared at the same element, in this case
  * `dependency="3"`.
  *
- *
- * ### Injecting a directive from a direct parent element
- *
- * Directives can inject other directives declared on a direct parent element. By definition, a
- * directive with a
- * `@Parent` annotation does not attempt to resolve dependencies for the current element, even if
- * this would satisfy
- * the dependency.
- *
- * ```
- * @Directive({ selector: '[my-directive]' })
- * class MyDirective {
- *   constructor(@Parent() dependency: Dependency) {
- *     expect(dependency.id).toEqual(2);
- *   }
- * }
- * ```
- * This directive would be instantiated with `Dependency` declared at the parent element, in this
- * case `dependency="2"`.
- *
- *
  * ### Injecting a directive from any ancestor elements
  *
  * Directives can inject other directives declared on any ancestor element (in the current Shadow
@@ -201,8 +178,8 @@ import {DEFAULT} from 'angular2/change_detection';
  * }
  * ```
  *
- * Unlike the `@Parent` which only checks the parent, `@Ancestor` checks the parent, as well as its
- * parents recursively. If `dependency="2"` didn't exist on the direct parent, this injection would
+ * `@Ancestor` checks the parent, as well as its parents recursively. If `dependency="2"` didn't
+ * exist on the direct parent, this injection would
  * have returned
  * `dependency="1"`.
  *

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

@@ -397,7 +397,7 @@ export class ProtoElementInjector {
               public directiveVariableBindings: Map<string, number>) {
     var length = bwv.length;
 
-    this.protoInjector = new ProtoInjector(bwv, distanceToParent);
+    this.protoInjector = new ProtoInjector(bwv);
 
     this.eventEmitterAccessors = ListWrapper.createFixedSize(length);
     this.hostActionAccessors = ListWrapper.createFixedSize(length);

modules/angular2/src/di/decorators.dart

@@ -31,13 +31,6 @@ class Self extends SelfMetadata {
 	const Self(): super();
 }
 
-/**
- * {@link ParentMetadata}.
- */
-class Parent extends ParentMetadata {
-	const Parent({bool self}): super(self:self);
-}
-
 /**
  * {@link AncestorMetadata}.
  */

modules/angular2/src/di/decorators.ts

@@ -4,7 +4,6 @@ import {
   InjectableMetadata,
   SelfMetadata,
   VisibilityMetadata,
-  ParentMetadata,
   AncestorMetadata,
   UnboundedMetadata
 } from './metadata';
@@ -42,14 +41,6 @@ export interface SelfFactory {
   new (): SelfMetadata;
 }
 
-/**
- * Factory for creating {@link ParentMetadata}.
- */
-export interface ParentFactory {
-  (visibility?: {self: boolean}): any;
-  new (visibility?: {self: boolean}): ParentMetadata;
-}
-
 /**
  * Factory for creating {@link AncestorMetadata}.
  */
@@ -86,11 +77,6 @@ export var Injectable: InjectableFactory = <InjectableFactory>makeDecorator(Inje
  */
 export var Self: SelfFactory = makeParamDecorator(SelfMetadata);
 
-/**
- * Factory for creating {@link ParentMetadata}.
- */
-export var Parent: ParentFactory = makeParamDecorator(ParentMetadata);
-
 /**
  * Factory for creating {@link AncestorMetadata}.
  */

modules/angular2/src/di/injector.ts

@@ -14,7 +14,7 @@ import {
 import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
 import {Key} from './key';
 import {resolveForwardRef} from './forward_ref';
-import {VisibilityMetadata, DEFAULT_VISIBILITY} from './metadata';
+import {VisibilityMetadata, DEFAULT_VISIBILITY, SelfMetadata, AncestorMetadata} from './metadata';
 
 const _constructing = CONST_EXPR(new Object());
 const _notFound = CONST_EXPR(new Object());
@@ -175,7 +175,7 @@ export class ProtoInjectorDynamicStrategy implements ProtoInjectorStrategy {
 export class ProtoInjector {
   _strategy: ProtoInjectorStrategy;
 
-  constructor(bwv: BindingWithVisibility[], public distanceToParent: number) {
+  constructor(bwv: BindingWithVisibility[]) {
     this._strategy = bwv.length > _MAX_CONSTRUCTION_COUNTER ?
                          new ProtoInjectorDynamicStrategy(this, bwv) :
                          new ProtoInjectorInlineStrategy(this, bwv);
@@ -459,7 +459,7 @@ export class Injector {
   static fromResolvedBindings(bindings: List<ResolvedBinding>,
                               depProvider: DependencyProvider = null): Injector {
     var bd = bindings.map(b => new BindingWithVisibility(b, PUBLIC));
-    var proto = new ProtoInjector(bd, 0);
+    var proto = new ProtoInjector(bd);
     var inj = new Injector(proto, null, depProvider);
     return inj;
   }
@@ -542,7 +542,7 @@ export class Injector {
   createChildFromResolved(bindings: List<ResolvedBinding>,
                           depProvider: DependencyProvider = null): Injector {
     var bd = bindings.map(b => new BindingWithVisibility(b, PUBLIC));
-    var proto = new ProtoInjector(bd, 1);
+    var proto = new ProtoInjector(bd);
     var inj = new Injector(proto, null, depProvider);
     inj._parent = this;
     return inj;
@@ -678,48 +678,78 @@ export class Injector {
       return this;
     }
 
-    var inj = this;
-    var lastInjector = false;
-    var depth = depVisibility.depth;
+    if (depVisibility instanceof SelfMetadata) {
+      return this._getByKeySelf(key, optional, bindingVisibility);
+
+    } else if (depVisibility instanceof AncestorMetadata) {
+      return this._getByKeyAncestor(key, optional, bindingVisibility, depVisibility.includeSelf);
+
+    } else {
+      return this._getByKeyUnbounded(key, optional, bindingVisibility, depVisibility.includeSelf);
+    }
+  }
+
+  _throwOrNull(key: Key, optional: boolean): any {
+    if (optional) {
+      return null;
+    } else {
+      throw new NoBindingError(key);
+    }
+  }
 
-    if (!depVisibility.includeSelf) {
-      depth -= inj._proto.distanceToParent;
+  _getByKeySelf(key: Key, optional: boolean, bindingVisibility: number): any {
+    var obj = this._strategy.getObjByKeyId(key.id, bindingVisibility);
+    return (obj !== undefinedValue) ? obj : this._throwOrNull(key, optional);
+  }
 
+  _getByKeyAncestor(key: Key, optional: boolean, bindingVisibility: number,
+                    includeSelf: boolean): any {
+    var inj = this;
+
+    if (!includeSelf) {
       if (inj._isBoundary) {
-        if (depVisibility.crossBoundaries) {
-          bindingVisibility = PUBLIC_AND_PRIVATE;
-        } else {
-          bindingVisibility = PRIVATE;
-          lastInjector = true;
-        }
+        return this._getPrivateDependency(key, optional, inj);
+      } else {
+        inj = inj._parent;
       }
-      inj = inj._parent;
     }
 
-    while (inj != null && depth >= 0) {
+    while (inj != null) {
       var obj = inj._strategy.getObjByKeyId(key.id, bindingVisibility);
       if (obj !== undefinedValue) return obj;
 
-      depth -= inj._proto.distanceToParent;
+      if (isPresent(inj._parent) && inj._isBoundary) {
+        return this._getPrivateDependency(key, optional, inj);
+      } else {
+        inj = inj._parent;
+      }
+    }
 
-      if (lastInjector) break;
+    return this._throwOrNull(key, optional);
+  }
 
-      if (inj._isBoundary) {
-        if (depVisibility.crossBoundaries) {
-          bindingVisibility = PUBLIC_AND_PRIVATE;
-        } else {
-          bindingVisibility = PRIVATE;
-          lastInjector = true;
-        }
-      }
+  _getPrivateDependency(key: Key, optional: boolean, inj: Injector): any {
+    var obj = inj._parent._strategy.getObjByKeyId(key.id, PRIVATE);
+    return (obj !== undefinedValue) ? obj : this._throwOrNull(key, optional);
+  }
+
+  _getByKeyUnbounded(key: Key, optional: boolean, bindingVisibility: number,
+                     includeSelf: boolean): any {
+    var inj = this;
+    if (!includeSelf) {
+      bindingVisibility = inj._isBoundary ? PUBLIC_AND_PRIVATE : PUBLIC;
       inj = inj._parent;
     }
 
-    if (optional) {
-      return null;
-    } else {
-      throw new NoBindingError(key);
+    while (inj != null) {
+      var obj = inj._strategy.getObjByKeyId(key.id, bindingVisibility);
+      if (obj !== undefinedValue) return obj;
+
+      bindingVisibility = inj._isBoundary ? PUBLIC_AND_PRIVATE : PUBLIC;
+      inj = inj._parent;
     }
+
+    return this._throwOrNull(key, optional);
   }
 }