refactor(datepicker): remove circular dependencies

Adjusts a couple of types in order to avoid circular dependencies.

Author: crisbeto

goldens/ts-circular-deps.json

@@ -53,14 +53,6 @@
     "src/material/core/ripple/ripple-ref.ts",
     "src/material/core/ripple/ripple-renderer.ts"
   ],
-  [
-    "src/material/datepicker/date-range-input.ts",
-    "src/material/datepicker/date-range-picker.ts"
-  ],
-  [
-    "src/material/datepicker/datepicker-input.ts",
-    "src/material/datepicker/datepicker.ts"
-  ],
   [
     "src/material/grid-list/grid-list.ts",
     "src/material/grid-list/tile-styler.ts"

src/material/datepicker/date-range-picker.ts

@@ -7,8 +7,7 @@
  */
 
 import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
-import {MatDatepickerBase, MatDatepickerContent} from './datepicker-base';
-import {MatDateRangeInput} from './date-range-input';
+import {MatDatepickerBase, MatDatepickerContent, MatDatepickerControl} from './datepicker-base';
 import {MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selection-model';
 
 // TODO(mmalerba): We use a component instead of a directive here so the user can use implicit
@@ -23,8 +22,9 @@ import {MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selecti
   encapsulation: ViewEncapsulation.None,
   providers: [MAT_RANGE_DATE_SELECTION_MODEL_PROVIDER]
 })
-export class MatDateRangePicker<D>
-  extends MatDatepickerBase<MatDateRangeInput<D>, DateRange<D>, D> {
+export class MatDateRangePicker<D> extends
+  MatDatepickerBase<MatDatepickerControl<D> & {comparisonStart: D|null, comparisonEnd: D|null},
+  DateRange<D>, D> {
 
   protected _forwardContentValues(instance: MatDatepickerContent<DateRange<D>, D>) {
     super._forwardContentValues(instance);

src/material/datepicker/datepicker.ts

@@ -7,8 +7,7 @@
  */
 
 import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
-import {MatDatepickerBase} from './datepicker-base';
-import {MatDatepickerInput} from './datepicker-input';
+import {MatDatepickerBase, MatDatepickerControl} from './datepicker-base';
 import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER} from './date-selection-model';
 
 // TODO(mmalerba): We use a component instead of a directive here so the user can use implicit
@@ -23,5 +22,5 @@ import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER} from './date-selection-model';
   encapsulation: ViewEncapsulation.None,
   providers: [MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER]
 })
-export class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerInput<D>, D | null, D> {
+export class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerControl<D>, D | null, D> {
 }

tools/public_api_guard/material/datepicker.d.ts

@@ -174,7 +174,7 @@ export interface MatCalendarUserEvent<D> {
 
 export declare type MatCalendarView = 'month' | 'year' | 'multi-year';
 
-export declare class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerInput<D>, D | null, D> {
+export declare class MatDatepicker<D> extends MatDatepickerBase<MatDatepickerControl<D>, D | null, D> {
     static ɵcmp: i0.ɵɵComponentDefWithMeta<MatDatepicker<any>, "mat-datepicker", ["matDatepicker"], {}, {}, never, never>;
     static ɵfac: i0.ɵɵFactoryDef<MatDatepicker<any>, never>;
 }
@@ -336,7 +336,10 @@ export declare class MatDateRangeInput<D> implements MatFormFieldControl<DateRan
     static ɵfac: i0.ɵɵFactoryDef<MatDateRangeInput<any>, [null, null, { optional: true; self: true; }, { optional: true; }, { optional: true; }]>;
 }
 
-export declare class MatDateRangePicker<D> extends MatDatepickerBase<MatDateRangeInput<D>, DateRange<D>, D> {
+export declare class MatDateRangePicker<D> extends MatDatepickerBase<MatDatepickerControl<D> & {
+    comparisonStart: D | null;
+    comparisonEnd: D | null;
+}, DateRange<D>, D> {
     protected _forwardContentValues(instance: MatDatepickerContent<DateRange<D>, D>): void;
     static ɵcmp: i0.ɵɵComponentDefWithMeta<MatDateRangePicker<any>, "mat-date-range-picker", ["matDateRangePicker"], {}, {}, never, never>;
     static ɵfac: i0.ɵɵFactoryDef<MatDateRangePicker<any>, never>;