Move factory functions into exported constants, fixes AoT

Author: jelbourn

src/lib/core/a11y/live-announcer.ts

@@ -64,14 +64,16 @@ export class LiveAnnouncer {
 
 }
 
+export function LIVE_ANNOUNCER_PROVIDER_FACTORY(parentDispatcher: LiveAnnouncer, liveElement: any) {
+  return parentDispatcher || new LiveAnnouncer(liveElement);
+};
+
 export const LIVE_ANNOUNCER_PROVIDER = {
-  // If there is already an LiveAnnouncer available, use that. Otherwise, provide a new one.
+  // If there is already a LiveAnnouncer available, use that. Otherwise, provide a new one.
   provide: LiveAnnouncer,
   deps: [
     [new Optional(), new SkipSelf(), LiveAnnouncer],
     [new Optional(), new Inject(LIVE_ANNOUNCER_ELEMENT_TOKEN)]
   ],
-  useFactory: (parentDispatcher: LiveAnnouncer, ariaLiveElement: any) => {
-    return parentDispatcher || new LiveAnnouncer(ariaLiveElement);
-  }
+  useFactory: LIVE_ANNOUNCER_PROVIDER_FACTORY
 };

src/lib/core/coordination/unique-selection-dispatcher.ts

@@ -34,10 +34,14 @@ export class UniqueSelectionDispatcher {
   }
 }
 
+export function UNIQUE_SELECTION_DISPATCHER_PROVIDER_FACTORY(
+    parentDispatcher: UniqueSelectionDispatcher) {
+  return parentDispatcher || new UniqueSelectionDispatcher();
+}
+
 export const UNIQUE_SELECTION_DISPATCHER_PROVIDER = {
+  // If there is already a dispatcher available, use that. Otherwise, provide a new one.
   provide: UniqueSelectionDispatcher,
   deps: [[new Optional(), new SkipSelf(), UniqueSelectionDispatcher]],
-  useFactory: (parentDispatcher: UniqueSelectionDispatcher) => {
-    return parentDispatcher || new UniqueSelectionDispatcher();
-  }
+  useFactory: UNIQUE_SELECTION_DISPATCHER_PROVIDER_FACTORY
 };

src/lib/core/overlay/overlay-container.ts

@@ -32,11 +32,13 @@ export class OverlayContainer {
   }
 }
 
+export function OVERLAY_CONTAINER_PROVIDER_FACTORY(parentContainer: OverlayContainer) {
+  return parentContainer || new OverlayContainer();
+};
+
 export const OVERLAY_CONTAINER_PROVIDER = {
   // If there is already an OverlayContainer available, use that. Otherwise, provide a new one.
   provide: OverlayContainer,
   deps: [[new Optional(), new SkipSelf(), OverlayContainer]],
-  useFactory: (parentContainer: OverlayContainer) => {
-    return parentContainer || new OverlayContainer();
-  }
+  useFactory: OVERLAY_CONTAINER_PROVIDER_FACTORY
 };

src/lib/core/overlay/position/viewport-ruler.ts

@@ -56,11 +56,13 @@ export class ViewportRuler {
   }
 }
 
+export function VIEWPORT_RULER_PROVIDER_FACTORY(parentDispatcher: ViewportRuler) {
+  return parentDispatcher || new ViewportRuler();
+};
+
 export const VIEWPORT_RULER_PROVIDER = {
-  // If there is already an ViewportRuler available, use that. Otherwise, provide a new one.
+  // If there is already a ViewportRuler available, use that. Otherwise, provide a new one.
   provide: ViewportRuler,
   deps: [[new Optional(), new SkipSelf(), ViewportRuler]],
-  useFactory: (parentDispatcher: ViewportRuler) => {
-    return parentDispatcher || new ViewportRuler();
-  }
+  useFactory: VIEWPORT_RULER_PROVIDER_FACTORY
 };

src/lib/core/overlay/scroll/scroll-dispatcher.ts

@@ -88,11 +88,13 @@ export class ScrollDispatcher {
   }
 }
 
+export function SCROLL_DISPATCHER_PROVIDER_FACTORY(parentDispatcher: ScrollDispatcher) {
+  return parentDispatcher || new ScrollDispatcher();
+};
+
 export const SCROLL_DISPATCHER_PROVIDER = {
-  // If there is already an ScrollDispatcher available, use that. Otherwise, provide a new one.
+  // If there is already a ScrollDispatcher available, use that. Otherwise, provide a new one.
   provide: ScrollDispatcher,
   deps: [[new Optional(), new SkipSelf(), ScrollDispatcher]],
-  useFactory: (parentDispatcher: ScrollDispatcher) => {
-    return parentDispatcher || new ScrollDispatcher();
-  }
+  useFactory: SCROLL_DISPATCHER_PROVIDER_FACTORY
 };

src/lib/icon/icon.ts

@@ -247,20 +247,23 @@ export class MdIcon implements OnChanges, OnInit, AfterViewChecked {
   }
 }
 
+export function ICON_REGISTRY_PROVIDER_FACTORY(
+    parentRegistry: MdIconRegistry, http: Http, sanitizer: DomSanitizer) {
+  return parentRegistry || new MdIconRegistry(http, sanitizer);
+};
+
+export const ICON_REGISTRY_PROVIDER = {
+  // If there is already an MdIconRegistry available, use that. Otherwise, provide a new one.
+  provide: MdIconRegistry,
+  deps: [[new Optional(), new SkipSelf(), MdIconRegistry], Http, DomSanitizer],
+  useFactory: ICON_REGISTRY_PROVIDER_FACTORY,
+};
 
 @NgModule({
   imports: [HttpModule, DefaultStyleCompatibilityModeModule],
   exports: [MdIcon, DefaultStyleCompatibilityModeModule],
   declarations: [MdIcon],
-  providers: [{
-      // If there is already an MdIconRegistry available, use that. Otherwise, provide a new one.
-      provide: MdIconRegistry,
-      deps: [[new Optional(), new SkipSelf(), MdIconRegistry], Http, DomSanitizer],
-      useFactory: (parentRegistry: MdIconRegistry, http: Http, sanitizer: DomSanitizer) => {
-        return parentRegistry || new MdIconRegistry(http, sanitizer);
-      },
-    }
-  ]
+  providers: [ICON_REGISTRY_PROVIDER],
 })
 export class MdIconModule {
   /** @deprecated */