feat(di): rename Binding into Provider

Closes angular#4416

Closes angular#4654

Author: vsavkin

docs/typescript-definition-package/index.js

@@ -72,7 +72,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
     {
       id: 'angular2/test_lib',
       references: ['./angular2.d.ts'],
-      remapTypes: { Type: 'ng.Type', Binding: 'ng.Binding', ViewMetadata: 'ng.ViewMetadata', Injector: 'ng.Injector',
+      remapTypes: { Type: 'ng.Type', Binding: 'ng.Binding', Provider: 'ng.Provider', ViewMetadata: 'ng.ViewMetadata', Injector: 'ng.Injector',
                     Predicate: 'ng.Predicate', ElementRef: 'ng.ElementRef', DebugElement: 'ng.DebugElement',
                     InjectableReference: 'ng.InjectableReference', ComponentRef: 'ng.ComponentRef' },
       modules: {'angular2/test_lib': {namespace: 'ngTestLib', id: 'angular2/test_lib'}}

modules/angular2/angular2.dart

@@ -8,5 +8,5 @@ library angular2;
 export 'package:angular2/core.dart' hide forwardRef, resolveForwardRef, ForwardRefFn;
 export 'package:angular2/profile.dart';
 export 'package:angular2/lifecycle_hooks.dart';
-export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_BINDING;
+export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_PROVIDER;
 export 'package:angular2/src/core/render/dom/dom_tokens.dart';

modules/angular2/docs/di/di.md

@@ -108,7 +108,7 @@ while (inj) {
     inj = inj.parent;
   }
 }
-throw new NoBindingError(requestedKey);
+throw new NoProviderError(requestedKey);
 ```
 
 So in the following example
@@ -160,7 +160,7 @@ var child = parent.resolveAndCreateChild([
   bind(Engine).toClass(TurboEngine)
 ]);
 
-parent.get(Car); // will throw NoBindingError
+parent.get(Car); // will throw NoProviderError
 ```
 
 

modules/angular2/http.ts

@@ -4,7 +4,7 @@
  * The http module provides services to perform http requests. To get started, see the {@link Http}
  * class.
  */
-import {bind, Binding} from 'angular2/core';
+import {provide, Provider} from 'angular2/core';
 import {Http, Jsonp} from './src/http/http';
 import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
 import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend';
@@ -40,18 +40,18 @@ export {URLSearchParams} from './src/http/url_search_params';
 /**
  * Provides a basic set of injectables to use the {@link Http} service in any application.
  *
- * The `HTTP_BINDINGS` should be included either in a component's injector,
+ * The `HTTP_PROVIDERS` should be included either in a component's injector,
  * or in the root injector when bootstrapping an application.
  *
  * ### Example ([live demo](http://plnkr.co/edit/snj7Nv?p=preview))
  *
  * ```
  * import {bootstrap, Component, NgFor, View} from 'angular2/angular2';
- * import {HTTP_BINDINGS, Http} from 'angular2/http';
+ * import {HTTP_PROVIDERS, Http} from 'angular2/http';
  *
  * @Component({
  *   selector: 'app',
- *   bindings: [HTTP_BINDINGS]
+ *   providers: [HTTP_PROVIDERS]
  * })
  * @View({
  *   template: `
@@ -83,11 +83,11 @@ export {URLSearchParams} from './src/http/url_search_params';
  *   .catch(err => console.error(err));
  * ```
  *
- * The primary public API included in `HTTP_BINDINGS` is the {@link Http} class.
- * However, other bindings required by `Http` are included,
+ * The primary public API included in `HTTP_PROVIDERS` is the {@link Http} class.
+ * However, other providers required by `Http` are included,
  * which may be beneficial to override in certain cases.
  *
- * The bindings included in `HTTP_BINDINGS` include:
+ * The providers included in `HTTP_PROVIDERS` include:
  *  * {@link Http}
  *  * {@link XHRBackend}
  *  * `BrowserXHR` - Private factory to create `XMLHttpRequest` instances
@@ -96,38 +96,38 @@ export {URLSearchParams} from './src/http/url_search_params';
  *
  * There may be cases where it makes sense to extend the base request options,
  * such as to add a search string to be appended to all URLs.
- * To accomplish this, a new binding for {@link RequestOptions} should
- * be added in the same injector as `HTTP_BINDINGS`.
+ * To accomplish this, a new provider for {@link RequestOptions} should
+ * be added in the same injector as `HTTP_PROVIDERS`.
  *
  * ### Example ([live demo](http://plnkr.co/edit/aCMEXi?p=preview))
  *
  * ```
- * import {bind, bootstrap} from 'angular2/angular2';
- * import {HTTP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+ * import {provide, bootstrap} from 'angular2/angular2';
+ * import {HTTP_PROVIDERS, BaseRequestOptions, RequestOptions} from 'angular2/http';
  *
  * class MyOptions extends BaseRequestOptions {
  *   search: string = 'coreTeam=true';
  * }
  *
- * bootstrap(App, [HTTP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+ * bootstrap(App, [HTTP_PROVIDERS, provide(RequestOptions, {asClass: MyOptions})])
  *   .catch(err => console.error(err));
  * ```
  *
  * Likewise, to use a mock backend for unit tests, the {@link XHRBackend}
- * binding should be bound to {@link MockBackend}.
+ * provider should be bound to {@link MockBackend}.
  *
  * ### Example ([live demo](http://plnkr.co/edit/7LWALD?p=preview))
  *
  * ```
- * import {bind, Injector} from 'angular2/angular2';
- * import {HTTP_BINDINGS, Http, Response, XHRBackend, MockBackend} from 'angular2/http';
+ * import {provide, Injector} from 'angular2/angular2';
+ * import {HTTP_PROVIDERS, Http, Response, XHRBackend, MockBackend} from 'angular2/http';
  *
  * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
  *
  * var injector = Injector.resolveAndCreate([
- *   HTTP_BINDINGS,
+ *   HTTP_PROVIDERS,
  *   MockBackend,
- *   bind(XHRBackend).toAlias(MockBackend)
+ *   provide(XHRBackend, {asAlias: MockBackend})
  * ]);
  * var http = injector.get(Http);
  * var backend = injector.get(MockBackend);
@@ -150,34 +150,40 @@ export {URLSearchParams} from './src/http/url_search_params';
  * });
  * ```
  */
-export const HTTP_BINDINGS: any[] = [
+export const HTTP_PROVIDERS: any[] = [
   // TODO(pascal): use factory type annotations once supported in DI
   // issue: https://github.com/angular/angular/issues/3183
-  bind(Http)
-      .toFactory((xhrBackend, requestOptions) => { return new Http(xhrBackend, requestOptions);},
-                 [XHRBackend, RequestOptions]),
+  provide(Http,
+          {
+            asFactory: (xhrBackend, requestOptions) => new Http(xhrBackend, requestOptions),
+            deps: [XHRBackend, RequestOptions]
+          }),
   BrowserXhr,
-  bind(RequestOptions).toClass(BaseRequestOptions),
-  bind(ResponseOptions).toClass(BaseResponseOptions),
+  provide(RequestOptions, {asClass: BaseRequestOptions}),
+  provide(ResponseOptions, {asClass: BaseResponseOptions}),
   XHRBackend
 ];
 
+/**
+ * @deprecated
+ */
+export const HTTP_BINDINGS = HTTP_PROVIDERS;
 
 /**
- * Provides a basic set of bindings to use the {@link Jsonp} service in any application.
+ * Provides a basic set of providers to use the {@link Jsonp} service in any application.
  *
- * The `JSONP_BINDINGS` should be included either in a component's injector,
+ * The `JSONP_PROVIDERS` should be included either in a component's injector,
  * or in the root injector when bootstrapping an application.
  *
  * ### Example ([live demo](http://plnkr.co/edit/vmeN4F?p=preview))
  *
  * ```
  * import {Component, NgFor, View} from 'angular2/angular2';
- * import {JSONP_BINDINGS, Jsonp} from 'angular2/http';
+ * import {JSONP_PROVIDERS, Jsonp} from 'angular2/http';
  *
  * @Component({
  *   selector: 'app',
- *   bindings: [JSONP_BINDINGS]
+ *   providers: [JSONP_PROVIDERS]
  * })
  * @View({
  *   template: `
@@ -202,11 +208,11 @@ export const HTTP_BINDINGS: any[] = [
  * }
  * ```
  *
- * The primary public API included in `JSONP_BINDINGS` is the {@link Jsonp} class.
- * However, other bindings required by `Jsonp` are included,
+ * The primary public API included in `JSONP_PROVIDERS` is the {@link Jsonp} class.
+ * However, other providers required by `Jsonp` are included,
  * which may be beneficial to override in certain cases.
  *
- * The bindings included in `JSONP_BINDINGS` include:
+ * The providers included in `JSONP_PROVIDERS` include:
  *  * {@link Jsonp}
  *  * {@link JSONPBackend}
  *  * `BrowserJsonp` - Private factory
@@ -215,37 +221,37 @@ export const HTTP_BINDINGS: any[] = [
  *
  * There may be cases where it makes sense to extend the base request options,
  * such as to add a search string to be appended to all URLs.
- * To accomplish this, a new binding for {@link RequestOptions} should
- * be added in the same injector as `JSONP_BINDINGS`.
+ * To accomplish this, a new provider for {@link RequestOptions} should
+ * be added in the same injector as `JSONP_PROVIDERS`.
  *
  * ### Example ([live demo](http://plnkr.co/edit/TFug7x?p=preview))
  *
  * ```
- * import {bind, bootstrap} from 'angular2/angular2';
- * import {JSONP_BINDINGS, BaseRequestOptions, RequestOptions} from 'angular2/http';
+ * import {provide, bootstrap} from 'angular2/angular2';
+ * import {JSONP_PROVIDERS, BaseRequestOptions, RequestOptions} from 'angular2/http';
  *
  * class MyOptions extends BaseRequestOptions {
  *   search: string = 'coreTeam=true';
  * }
  *
- * bootstrap(App, [JSONP_BINDINGS, bind(RequestOptions).toClass(MyOptions)])
+ * bootstrap(App, [JSONP_PROVIDERS, provide(RequestOptions, {asClass: MyOptions})])
  *   .catch(err => console.error(err));
  * ```
  *
  * Likewise, to use a mock backend for unit tests, the {@link JSONPBackend}
- * binding should be bound to {@link MockBackend}.
+ * provider should be bound to {@link MockBackend}.
  *
  * ### Example ([live demo](http://plnkr.co/edit/HDqZWL?p=preview))
  *
  * ```
- * import {bind, Injector} from 'angular2/angular2';
- * import {JSONP_BINDINGS, Jsonp, Response, JSONPBackend, MockBackend} from 'angular2/http';
+ * import {provide, Injector} from 'angular2/angular2';
+ * import {JSONP_PROVIDERS, Jsonp, Response, JSONPBackend, MockBackend} from 'angular2/http';
  *
  * var people = [{name: 'Jeff'}, {name: 'Tobias'}];
  * var injector = Injector.resolveAndCreate([
- *   JSONP_BINDINGS,
+ *   JSONP_PROVIDERS,
  *   MockBackend,
- *   bind(JSONPBackend).toAlias(MockBackend)
+ *   provide(JSONPBackend, {asAlias: MockBackend})
  * ]);
  * var jsonp = injector.get(Jsonp);
  * var backend = injector.get(MockBackend);
@@ -268,15 +274,21 @@ export const HTTP_BINDINGS: any[] = [
  * });
  * ```
  */
-export const JSONP_BINDINGS: any[] = [
+export const JSONP_PROVIDERS: any[] = [
   // TODO(pascal): use factory type annotations once supported in DI
   // issue: https://github.com/angular/angular/issues/3183
-  bind(Jsonp)
-      .toFactory(
-          (jsonpBackend, requestOptions) => { return new Jsonp(jsonpBackend, requestOptions);},
-          [JSONPBackend, RequestOptions]),
+  provide(Jsonp,
+          {
+            asFactory: (jsonpBackend, requestOptions) => new Jsonp(jsonpBackend, requestOptions),
+            deps: [JSONPBackend, RequestOptions]
+          }),
   BrowserJsonp,
-  bind(RequestOptions).toClass(BaseRequestOptions),
-  bind(ResponseOptions).toClass(BaseResponseOptions),
-  bind(JSONPBackend).toClass(JSONPBackend_)
+  provide(RequestOptions, {asClass: BaseRequestOptions}),
+  provide(ResponseOptions, {asClass: BaseResponseOptions}),
+  provide(JSONPBackend, {asClass: JSONPBackend_})
 ];
+
+/**
+ * @deprecated
+ */
+export const JSON_BINDINGS = JSONP_PROVIDERS;

modules/angular2/router.ts

@@ -28,7 +28,7 @@ import {RouterOutlet} from './src/router/router_outlet';
 import {RouterLink} from './src/router/router_link';
 import {RouteRegistry} from './src/router/route_registry';
 import {Location} from './src/router/location';
-import {bind, OpaqueToken, Binding} from './core';
+import {provide, OpaqueToken, Provider} from './core';
 import {CONST_EXPR} from './src/core/facade/lang';
 import {ApplicationRef} from './src/core/application_ref';
 import {BaseException} from 'angular2/src/core/facade/exceptions';
@@ -44,7 +44,7 @@ import {BaseException} from 'angular2/src/core/facade/exceptions';
  * import {Component, View} from 'angular2/angular2';
  * import {
  *   ROUTER_DIRECTIVES,
- *   ROUTER_BINDINGS,
+ *   ROUTER_PROVIDERS,
  *   RouteConfig
  * } from 'angular2/router';
  *
@@ -57,7 +57,7 @@ import {BaseException} from 'angular2/src/core/facade/exceptions';
  *   // ...
  * }
  *
- * bootstrap(AppCmp, [ROUTER_BINDINGS]);
+ * bootstrap(AppCmp, [ROUTER_PROVIDERS]);
  * ```
  */
 export const ROUTER_PRIMARY_COMPONENT: OpaqueToken =
@@ -72,7 +72,7 @@ export const ROUTER_PRIMARY_COMPONENT: OpaqueToken =
  *
  * ```
  * import {Component, View} from 'angular2/angular2';
- * import {ROUTER_DIRECTIVES, ROUTER_BINDINGS, RouteConfig} from 'angular2/router';
+ * import {ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouteConfig} from 'angular2/router';
  *
  * @Component({...})
  * @View({directives: [ROUTER_DIRECTIVES]})
@@ -83,21 +83,21 @@ export const ROUTER_PRIMARY_COMPONENT: OpaqueToken =
  *    // ...
  * }
  *
- * bootstrap(AppCmp, ROUTER_BINDINGS);
+ * bootstrap(AppCmp, [ROUTER_PROVIDERS]);
  * ```
  */
 export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
 
 /**
- * A list of {@link Binding}s. To use the router, you must add this to your application.
+ * A list of {@link Provider}s. To use the router, you must add this to your application.
  *
  * ## Example ([live demo](http://plnkr.co/edit/iRUP8B5OUbxCWQ3AcIDm))
  *
  * ```
  * import {Component, View} from 'angular2/angular2';
  * import {
  *   ROUTER_DIRECTIVES,
- *   ROUTER_BINDINGS,
+ *   ROUTER_PROVIDERS,
  *   RouteConfig
  * } from 'angular2/router';
  *
@@ -110,23 +110,29 @@ export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
  *   // ...
  * }
  *
- * bootstrap(AppCmp, [ROUTER_BINDINGS]);
+ * bootstrap(AppCmp, [ROUTER_PROVIDERS]);
  * ```
  */
-export const ROUTER_BINDINGS: any[] = CONST_EXPR([
+export const ROUTER_PROVIDERS: any[] = CONST_EXPR([
   RouteRegistry,
-  CONST_EXPR(new Binding(LocationStrategy, {toClass: PathLocationStrategy})),
+  CONST_EXPR(new Provider(LocationStrategy, {toClass: PathLocationStrategy})),
   Location,
-  CONST_EXPR(new Binding(Router,
-                         {
-                           toFactory: routerFactory,
-                           deps: CONST_EXPR([RouteRegistry, Location, ROUTER_PRIMARY_COMPONENT])
-                         })),
-  CONST_EXPR(new Binding(
+  CONST_EXPR(
+      new Provider(Router,
+                   {
+                     toFactory: routerFactory,
+                     deps: CONST_EXPR([RouteRegistry, Location, ROUTER_PRIMARY_COMPONENT])
+                   })),
+  CONST_EXPR(new Provider(
       ROUTER_PRIMARY_COMPONENT,
       {toFactory: routerPrimaryComponentFactory, deps: CONST_EXPR([ApplicationRef])}))
 ]);
 
+/**
+ * @deprecated
+ */
+export const ROUTER_BINDINGS = ROUTER_PROVIDERS;
+
 function routerFactory(registry, location, primaryComponent) {
   return new RootRouter(registry, location, primaryComponent);
 }

modules/angular2/src/core/application.dart

@@ -18,11 +18,11 @@ export 'package:angular2/src/core/linker/dynamic_component_loader.dart' show Com
 ///
 /// See [commonBootstrap] for detailed documentation.
 Future<ComponentRef> bootstrap(Type appComponentType,
-    [List componentInjectableBindings]) {
+    [List componentInjectableProviders]) {
   reflector.reflectionCapabilities = new ReflectionCapabilities();
-  var bindings = [compilerBindings()];
-  if (componentInjectableBindings != null) {
-    bindings.add(componentInjectableBindings);
+  var providers = [compilerProviders()];
+  if (componentInjectableProviders != null) {
+    providers.add(componentInjectableProviders);
   }
-  return commonBootstrap(appComponentType, bindings);
+  return commonBootstrap(appComponentType, providers);
 }