11library angular.core.annotation_src;
22
3- import "package:di/di.dart" show Injector, Visibility;
3+ import "package:di/di.dart" show Injector, Visibility, Factory ;
44
55abstract class DirectiveBinder {
6- bind (key, {Function toFactory, inject,
7- Visibility visibility: Directive .CHILDREN_VISIBILITY });
6+ bind (key, {Function toFactory, inject, Visibility visibility: Visibility .CHILDREN });
87}
98
109typedef void DirectiveBinderFn (DirectiveBinder module);
1110
1211RegExp _ATTR_NAME = new RegExp (r'\[([^\]]+)\]$' );
1312
14- const String SHADOW_DOM_INJECTOR_NAME = 'SHADOW_INJECTOR' ;
15-
16- skipShadow (Injector injector)
17- => injector.name == SHADOW_DOM_INJECTOR_NAME ? injector.parent : injector;
18-
19- localVisibility (Injector requesting, Injector defining)
20- => identical (skipShadow (requesting), defining);
21-
22- directChildrenVisibility (Injector requesting, Injector defining) {
23- requesting = skipShadow (requesting);
24- return identical (requesting.parent, defining) || localVisibility (requesting, defining);
25- }
26-
2713Directive cloneWithNewMap (Directive annotation, map)
2814 => annotation._cloneWithNewMap (map);
2915
3016String mappingSpec (DirectiveAnnotation annotation) => annotation._mappingSpec;
3117
18+ class Visibility {
19+ static const LOCAL = const Visibility ._('LOCAL' );
20+ static const CHILDREN = const Visibility ._('CHILDREN' );
21+ static const DIRECT_CHILD = const Visibility ._('DIRECT_CHILD' );
3222
33- /**
34- * An annotation when applied to a class indicates that the class (service) will
35- * be instantiated by di injector. This annotation is also used to designate which
36- * classes need to have a static factory generated when using static angular, and
37- * therefore is required on any injectable class.
38- */
39- class Injectable {
40- const Injectable ();
23+ final String name;
24+ const Visibility ._(this .name);
25+ toString () => 'Visibility: $name ' ;
4126}
4227
4328/**
@@ -46,16 +31,19 @@ class Injectable {
4631abstract class Directive {
4732
4833 /// The directive can only be injected to other directives on the same element.
49- static const Visibility LOCAL_VISIBILITY = localVisibility;
34+ @deprecated // ('Use Visibility.LOCAL instead')
35+ static const Visibility LOCAL_VISIBILITY = Visibility .LOCAL ;
5036
5137 /// The directive can be injected to other directives on the same or child elements.
52- static const Visibility CHILDREN_VISIBILITY = null ;
38+ @deprecated // ('Use Visibility.CHILDREN instead')
39+ static const Visibility CHILDREN_VISIBILITY = Visibility .CHILDREN ;
5340
5441 /**
5542 * The directive on this element can only be injected to other directives
5643 * declared on elements which are direct children of the current element.
5744 */
58- static const Visibility DIRECT_CHILDREN_VISIBILITY = directChildrenVisibility;
45+ @deprecated // ('Use Visibility.DIRECT_CHILD instead')
46+ static const Visibility DIRECT_CHILDREN_VISIBILITY = Visibility .DIRECT_CHILD ;
5947
6048 /**
6149 * CSS selector which will trigger this component/directive.
@@ -129,8 +117,8 @@ abstract class Directive {
129117 * selector: '[foo]',
130118 * module: Foo.moduleFactory)
131119 * class Foo {
132- * static moduleFactory() => new Module()
133- * . .bind(SomeTypeA, visibility: Directive.LOCAL_VISIBILITY);
120+ * static moduleFactory(DirectiveBinder binder ) =>
121+ * binder .bind(SomeTypeA, visibility: Directive.LOCAL_VISIBILITY);
134122 * }
135123 *
136124 * When specifying types, factories or values in the module, notice that
@@ -139,7 +127,7 @@ abstract class Directive {
139127 * * [Directive.CHILDREN_VISIBILITY]
140128 * * [Directive.DIRECT_CHILDREN_VISIBILITY]
141129 */
142- final Function module;
130+ final DirectiveBinderFn module;
143131
144132 /**
145133 * Use map to define the mapping of DOM attributes to fields.
@@ -222,19 +210,15 @@ abstract class Directive {
222210
223211 const Directive ({
224212 this .selector,
225- this .children: Directive . COMPILE_CHILDREN ,
226- this .visibility: Directive . LOCAL_VISIBILITY ,
213+ this .children,
214+ this .visibility,
227215 this .module,
228216 this .map: const {},
229217 this .exportExpressions: const [],
230218 this .exportExpressionAttrs: const []
231219 });
232220
233221 toString () => selector;
234- get hashCode => selector.hashCode;
235- operator == (other) =>
236- other is Directive && selector == other.selector;
237-
238222 Directive _cloneWithNewMap (newMap);
239223}
240224
@@ -335,7 +319,7 @@ class Component extends Directive {
335319 applyAuthorStyles,
336320 resetStyleInheritance,
337321 this .publishAs,
338- module,
322+ DirectiveBinderFn module,
339323 map,
340324 selector,
341325 visibility,
@@ -393,7 +377,7 @@ class Decorator extends Directive {
393377 const Decorator ({children: Directive .COMPILE_CHILDREN ,
394378 map,
395379 selector,
396- module,
380+ DirectiveBinderFn module,
397381 visibility,
398382 exportExpressions,
399383 exportExpressionAttrs})
@@ -446,7 +430,7 @@ class Controller extends Decorator {
446430 children: Directive .COMPILE_CHILDREN ,
447431 this .publishAs,
448432 map,
449- module,
433+ DirectiveBinderFn module,
450434 selector,
451435 visibility,
452436 exportExpressions,
@@ -595,8 +579,5 @@ class Formatter {
595579
596580 const Formatter ({this .name});
597581
598- int get hashCode => name.hashCode;
599- bool operator == (other) => name == other.name;
600-
601582 toString () => 'Formatter: $name ' ;
602583}
0 commit comments