build: secondary entry points

src/lib/autocomplete/autocomplete-trigger.ts

@@ -13,17 +13,17 @@ import {
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {DOCUMENT} from '@angular/platform-browser';
-import {Overlay, OverlayRef, OverlayState, TemplatePortal} from '../core';
 import {MdAutocomplete} from './autocomplete';
-import {PositionStrategy} from '../core/overlay/position/position-strategy';
-import {ConnectedPositionStrategy} from '../core/overlay/position/connected-position-strategy';
 import {Observable} from 'rxjs/Observable';
-import {MdOptionSelectionChange, MdOption} from '../core/option/option';
-import {ENTER, UP_ARROW, DOWN_ARROW} from '../core/keyboard/keycodes';
 import {Dir} from '../core/rtl/dir';
-import {MdInputContainer} from '../input/input-container';
-import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
 import {Subscription} from 'rxjs/Subscription';
+
+import {MdInputContainer} from '@angular/material/input';
+import {
+  ScrollDispatcher, PositionStrategy, MdOption, MdOptionSelectionChange, ConnectedPositionStrategy,
+  ENTER, UP_ARROW, DOWN_ARROW, Overlay, OverlayRef, OverlayState, TemplatePortal
+} from '@angular/material/core';
+
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/observable/fromEvent';
 import 'rxjs/add/operator/filter';

src/lib/autocomplete/autocomplete.ts

@@ -10,8 +10,7 @@ import {
   ViewEncapsulation,
   ChangeDetectorRef,
 } from '@angular/core';
-import {MdOption} from '../core';
-import {ActiveDescendantKeyManager} from '../core/a11y/activedescendant-key-manager';
+import {MdOption, _ActiveDescendantKeyManager} from '@angular/material/core';
 
 /**
  * Autocomplete IDs need to be unique across components, so this counter exists outside of
@@ -35,7 +34,7 @@ export type AutocompletePositionY = 'above' | 'below';
 export class MdAutocomplete implements AfterContentInit {
 
   /** Manages active item in option list based on key events. */
-  _keyManager: ActiveDescendantKeyManager;
+  _keyManager: _ActiveDescendantKeyManager;
 
   /** Whether the autocomplete panel displays above or below its trigger. */
   positionY: AutocompletePositionY = 'below';
@@ -56,7 +55,7 @@ export class MdAutocomplete implements AfterContentInit {
   constructor(private _changeDetectorRef: ChangeDetectorRef) { }
 
   ngAfterContentInit() {
-    this._keyManager = new ActiveDescendantKeyManager(this.options).withWrap();
+    this._keyManager = new _ActiveDescendantKeyManager(this.options).withWrap();
   }
 
   /**

src/lib/autocomplete/index.ts

@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {MdOptionModule, OverlayModule, MdCommonModule} from '../core';
+import {MdOptionModule, OverlayModule, MdCommonModule} from '@angular/material/core';
 import {CommonModule} from '@angular/common';
 import {MdAutocomplete} from './autocomplete';
 import {MdAutocompleteTrigger} from './autocomplete-trigger';

src/lib/button-toggle/button-toggle.ts

@@ -17,8 +17,9 @@ import {
   AfterViewInit,
 } from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
-import {Observable} from 'rxjs/Observable';
-import {UniqueSelectionDispatcher, coerceBooleanProperty, FocusOriginMonitor} from '../core';
+import {
+  UniqueSelectionDispatcher, coerceBooleanProperty, FocusOriginMonitor
+} from '@angular/material/core';
 
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';

src/lib/button-toggle/index.ts

@@ -5,7 +5,7 @@ import {
   UNIQUE_SELECTION_DISPATCHER_PROVIDER,
   MdCommonModule,
   FocusOriginMonitor,
-} from '../core';
+} from '@angular/material/core';
 
 
 @NgModule({

src/lib/button/button.ts

@@ -9,8 +9,9 @@ import {
   Renderer2,
   ViewEncapsulation
 } from '@angular/core';
-import {coerceBooleanProperty, FocusOriginMonitor} from '../core';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
+import {
+  _mixinDisabled, _CanDisable, coerceBooleanProperty, FocusOriginMonitor
+} from '@angular/material/core';
 
 
 // TODO(kara): Convert attribute selectors to classes when attr maps become available
@@ -82,7 +83,7 @@ export class MdMiniFabCssMatStyler {}
 
 // Boilerplate for applying mixins to MdButton.
 export class MdButtonBase { }
-export const _MdButtonMixinBase = mixinDisabled(MdButtonBase);
+export const _MdButtonMixinBase = _mixinDisabled(MdButtonBase);
 
 
 /**
@@ -103,7 +104,7 @@ export const _MdButtonMixinBase = mixinDisabled(MdButtonBase);
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdButton extends _MdButtonMixinBase implements OnDestroy, CanDisable {
+export class MdButton extends _MdButtonMixinBase implements OnDestroy, _CanDisable {
   private _color: string;
 
   /** Whether the button is round. */

src/lib/button/index.ts

@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule, MdRippleModule, StyleModule} from '../core';
+import {MdCommonModule, MdRippleModule, StyleModule} from '@angular/material/core';
 import {
   MdAnchor,
   MdButton,

src/lib/card/index.ts

@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '../core';
+import {MdCommonModule} from '@angular/material/core';
 import {
   MdCard,
   MdCardHeader,

src/lib/checkbox/checkbox.ts

@@ -14,9 +14,10 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {coerceBooleanProperty} from '../core/coercion/boolean-property';
-import {FocusOrigin, FocusOriginMonitor, MdRipple, RippleRef} from '../core';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
+import {
+  FocusOrigin, FocusOriginMonitor, MdRipple, RippleRef, coerceBooleanProperty,
+  _mixinDisabled, _CanDisable
+} from '@angular/material/core';
 
 
 /** Monotonically increasing integer used to auto-generate unique ids for checkbox components. */
@@ -58,7 +59,7 @@ export class MdCheckboxChange {
 
 // Boilerplate for applying mixins to MdCheckbox.
 export class MdCheckboxBase { }
-export const _MdCheckboxMixinBase = mixinDisabled(MdCheckboxBase);
+export const _MdCheckboxMixinBase = _mixinDisabled(MdCheckboxBase);
 
 
 /**
@@ -87,7 +88,7 @@ export const _MdCheckboxMixinBase = mixinDisabled(MdCheckboxBase);
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdCheckbox extends _MdCheckboxMixinBase
-    implements ControlValueAccessor, AfterViewInit, OnDestroy, CanDisable {
+    implements ControlValueAccessor, AfterViewInit, OnDestroy, _CanDisable {
   /**
    * Attached to the aria-label attribute of the host element. In most cases, arial-labelledby will
    * take precedence so this may be omitted.

src/lib/checkbox/index.ts

@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core';
+import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '@angular/material/core';
 import {MdCheckbox} from './checkbox';
 
 

src/lib/chips/chip-list.ts

@@ -10,9 +10,9 @@ import {
 } from '@angular/core';
 
 import {MdChip} from './chip';
-import {FocusKeyManager} from '../core/a11y/focus-key-manager';
-import {coerceBooleanProperty} from '../core/coercion/boolean-property';
-import {SPACE, LEFT_ARROW, RIGHT_ARROW} from '../core/keyboard/keycodes';
+import {
+  _FocusKeyManager, coerceBooleanProperty, SPACE, LEFT_ARROW, RIGHT_ARROW
+} from '@angular/material/core';
 
 /**
  * A material design chips component (named ChipList for it's similarity to the List component).
@@ -54,15 +54,15 @@ export class MdChipList implements AfterContentInit {
   protected _selectable: boolean = true;
 
   /** The FocusKeyManager which handles focus. */
-  _keyManager: FocusKeyManager;
+  _keyManager: _FocusKeyManager;
 
   /** The chip components contained within this chip list. */
   chips: QueryList<MdChip>;
 
   constructor(private _elementRef: ElementRef) { }
 
   ngAfterContentInit(): void {
-    this._keyManager = new FocusKeyManager(this.chips).withWrap();
+    this._keyManager = new _FocusKeyManager(this.chips).withWrap();
 
     // Go ahead and subscribe all of the initial chips
     this._subscribeChips(this.chips);

src/lib/chips/chip.ts

@@ -9,8 +9,7 @@ import {
   Renderer2,
 } from '@angular/core';
 
-import {Focusable} from '../core/a11y/focus-key-manager';
-import {coerceBooleanProperty} from '../core/coercion/boolean-property';
+import {_Focusable, coerceBooleanProperty} from '@angular/material/core';
 
 export interface MdChipEvent {
   chip: MdChip;
@@ -35,7 +34,7 @@ export interface MdChipEvent {
     '(click)': '_handleClick($event)'
   }
 })
-export class MdChip implements Focusable, OnInit, OnDestroy {
+export class MdChip implements _Focusable, OnInit, OnDestroy {
 
   /** Whether or not the chip is disabled. Disabled chips cannot be focused. */
   protected _disabled: boolean = null;

src/lib/core/a11y/activedescendant-key-manager.ts

@@ -1,4 +1,3 @@
-import {QueryList} from '@angular/core';
 import {ListKeyManager, CanDisable} from './list-key-manager';
 
 /**

src/lib/core/core.ts

@@ -47,6 +47,7 @@ export {
   OverlayOrigin,
   OverlayModule,
 } from './overlay/overlay-directives';
+export * from './overlay/position/position-strategy';
 export * from './overlay/position/global-position-strategy';
 export * from './overlay/position/connected-position-strategy';
 export * from './overlay/position/connected-position';

src/lib/core/core_private_exports.ts

@@ -0,0 +1,16 @@
+// tslint:disable max-line-length
+
+/**
+ * This file contains exports that are used by other packages of Material. Exports are re-exported
+ * with another name. In angular/angular those exports will be prefixed with Ɵ.
+ */
+
+// TODO(paul): currently we use a normal underscore instead of Ɵ. (Due to TSLint)
+
+export {ActiveDescendantKeyManager as _ActiveDescendantKeyManager} from './a11y/activedescendant-key-manager';
+export {CanDisable as _CanDisable, mixinDisabled as _mixinDisabled} from './common-behaviors/index';
+export {Focusable as _Focusable, FocusKeyManager as _FocusKeyManager} from './a11y/focus-key-manager';
+export {extendObject as _extendObject} from './util/object-extend';
+export {VIEWPORT_RULER_PROVIDER as _VIEWPORT_RULER_PROVIDER, ViewportRuler as _ViewportRuler} from './overlay/position/viewport-ruler';
+export {LIVE_ANNOUNCER_PROVIDER as _LIVE_ANNOUNCER_PROVIDER} from './a11y/live-announcer';
+export {SCROLL_DISPATCHER_PROVIDER as _SCROLL_DISPATCHER_PROVIDER} from './overlay/scroll/scroll-dispatcher';

src/lib/core/index.ts

@@ -1 +1,2 @@
+export * from './core_private_exports';
 export * from './core';

src/lib/dialog/dialog-container.ts

@@ -4,7 +4,6 @@ import {
   ViewChild,
   ViewEncapsulation,
   NgZone,
-  OnDestroy,
   ElementRef,
   EventEmitter,
   Inject,
@@ -19,10 +18,11 @@ import {
   AnimationEvent,
 } from '@angular/animations';
 import {DOCUMENT} from '@angular/platform-browser';
-import {BasePortalHost, ComponentPortal, PortalHostDirective, TemplatePortal} from '../core';
 import {MdDialogConfig} from './dialog-config';
 import {MdDialogContentAlreadyAttachedError} from './dialog-errors';
-import {FocusTrapFactory, FocusTrap} from '../core/a11y/focus-trap';
+import {
+  FocusTrapFactory, FocusTrap, BasePortalHost, ComponentPortal, PortalHostDirective, TemplatePortal
+} from '@angular/material/core';
 
 
 /**

src/lib/dialog/dialog-errors.ts

@@ -1,4 +1,4 @@
-import {MdError} from '../core';
+import {MdError} from '@angular/material/core';
 
 /**
  * Exception thrown when a ComponentPortal is attached to a DomPortalHost without an origin.

src/lib/dialog/dialog-ref.ts

@@ -1,9 +1,10 @@
-import {OverlayRef, GlobalPositionStrategy} from '../core';
 import {AnimationEvent} from '@angular/animations';
 import {DialogPosition} from './dialog-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {MdDialogContainer} from './dialog-container';
+import {OverlayRef, GlobalPositionStrategy} from '@angular/material/core';
+
 import 'rxjs/add/operator/filter';
 
 

src/lib/dialog/dialog.ts

@@ -2,14 +2,16 @@ import {Injector, ComponentRef, Injectable, Optional, SkipSelf, TemplateRef} fro
 import {Location} from '@angular/common';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {Overlay, OverlayRef, ComponentType, OverlayState, ComponentPortal} from '../core';
-import {extendObject} from '../core/util/object-extend';
-import {ESCAPE} from '../core/keyboard/keycodes';
 import {DialogInjector} from './dialog-injector';
 import {MdDialogConfig} from './dialog-config';
 import {MdDialogRef} from './dialog-ref';
 import {MdDialogContainer} from './dialog-container';
-import {TemplatePortal} from '../core/portal/portal';
+
+import {
+  TemplatePortal, ESCAPE, Overlay, OverlayRef, ComponentType, OverlayState, ComponentPortal,
+  _extendObject
+} from '@angular/material/core';
+
 import 'rxjs/add/operator/first';
 
 
@@ -226,5 +228,5 @@ export class MdDialog {
  * @returns The new configuration object.
  */
 function _applyConfigDefaults(config: MdDialogConfig): MdDialogConfig {
-  return extendObject(new MdDialogConfig(), config);
+  return _extendObject(new MdDialogConfig(), config);
 }

src/lib/dialog/index.ts

@@ -5,7 +5,7 @@ import {
   PortalModule,
   A11yModule,
   MdCommonModule,
-} from '../core';
+} from '@angular/material/core';
 import {MdDialog} from './dialog';
 import {MdDialogContainer} from './dialog-container';
 import {

src/lib/grid-list/grid-list-errors.ts

@@ -1,4 +1,4 @@
-import {MdError} from '../core';
+import {MdError} from '@angular/material/core';
 
 /**
  * Exception thrown when cols property is missing from grid-list

src/lib/grid-list/grid-list.ts

@@ -14,11 +14,8 @@ import {MdGridTile} from './grid-tile';
 import {TileCoordinator} from './tile-coordinator';
 import {TileStyler, FitTileStyler, RatioTileStyler, FixedTileStyler} from './tile-styler';
 import {MdGridListColsError} from './grid-list-errors';
-import {Dir} from '../core';
-import {
-  coerceToString,
-  coerceToNumber,
-} from './grid-list-measure';
+import {coerceToString, coerceToNumber} from './grid-list-measure';
+import {Dir} from '@angular/material/core';
 
 
 // TODO(kara): Conditional (responsive) column count / row size.

src/lib/grid-list/grid-tile.ts

@@ -8,7 +8,7 @@ import {
   QueryList,
   AfterContentInit, Directive
 } from '@angular/core';
-import {MdLine, MdLineSetter} from '../core';
+import {MdLine, MdLineSetter} from '@angular/material/core';
 import {coerceToNumber} from './grid-list-measure';
 
 @Component({

src/lib/grid-list/index.ts

@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {MdLineModule, MdCommonModule} from '../core';
+import {MdLineModule, MdCommonModule} from '@angular/material/core';
 import {
   MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
   MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler

src/lib/icon/icon-registry.ts

@@ -1,7 +1,7 @@
 import {Injectable, SecurityContext} from '@angular/core';
 import {SafeResourceUrl, DomSanitizer} from '@angular/platform-browser';
 import {Http} from '@angular/http';
-import {MdError} from '../core';
+import {MdError} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/observable/forkJoin';
 import 'rxjs/add/observable/of';

src/lib/icon/icon.ts

@@ -14,7 +14,7 @@ import {
 } from '@angular/core';
 import {Http} from '@angular/http';
 import {DomSanitizer} from '@angular/platform-browser';
-import {MdError} from '../core';
+import {MdError} from '@angular/material/core';
 import {MdIconRegistry, MdIconNameNotFoundError} from './icon-registry';
 
 /** Exception thrown when an invalid icon name is passed to an md-icon component. */

src/lib/icon/index.ts

@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {HttpModule} from '@angular/http';
-import {MdCommonModule} from '../core';
+import {MdCommonModule} from '@angular/material/core';
 import {MdIcon, ICON_REGISTRY_PROVIDER} from './icon';