refactor: privately expose types needed for mixins to avoid broken type definitions

Since we updated the TypeScript module and target to ES2020/ESNext for
both devmode and prodmode output, tbe type definition files will no
longer get the AMD naming patches from `@bazel/typescript`.

These previously ensured that with `module: "umd"`, TypeScript never
can generate relatie imports, but rather uses AMD module names. The
removal of this logic now breaks the type definition output because
there is code in `@angular/material-experimental` which imports from
Angular Material core in a way where TypeScript would try to write an
inferred type into the `d.ts` out. This results in a deep import right
now because some of the symbols used for the inferred type are not
publicly exposed. This commit exposes them privately so that TS can
avoid deep imports.

The goldens have been updated accordingly. The deep imports can be
observed there as well.

Author: devversion

scripts/check-mdc-exports.ts

@@ -86,16 +86,11 @@ function getExports(name: string): string[] {
   const typeChecker = program.getTypeChecker();
   const mainSymbol = typeChecker.getSymbolAtLocation(sourceFile);
 
-  return (mainSymbol ? (typeChecker.getExportsOfModule(mainSymbol) || []) : []).map(symbol => {
-    // tslint:disable-next-line:no-bitwise
-    if (symbol.flags & ts.SymbolFlags.Alias) {
-      const resolvedSymbol = typeChecker.getAliasedSymbol(symbol);
-      return (!resolvedSymbol.valueDeclaration && !resolvedSymbol.declarations) ?
-        symbol : resolvedSymbol;
-    } else {
-      return symbol;
-    }
-  }).map(symbol => symbol.name);
+  if (mainSymbol === undefined) {
+    return [];
+  }
+
+  return typeChecker.getExportsOfModule(mainSymbol).map(symbol => symbol.name);
 }
 
 /** Checks whether a particular Material package has an MDC-based equivalent. */

src/material-experimental/mdc-core/public-api.ts

@@ -56,5 +56,11 @@ export {
   setLines,
   ShowOnDirtyErrorStateMatcher,
   ThemePalette,
-  VERSION
+  VERSION,
+  // Note: These need to be exposed privately for cross-package type inference. e.g. if the
+  // experimental package uses a mixin, TS will try to write an explicit type reference that
+  // is equivalent to e.g. `CanColorCtor`. For this it needs these two helpers as otherwise it
+  // would generate a deep cross-package import that breaks in the NPM package output.
+  _AbstractConstructor,
+  _Constructor,
 } from '@angular/material/core';

src/material/core/common-behaviors/index.ts

@@ -12,6 +12,16 @@ export {
   SanityChecks,
   GranularSanityChecks,
 } from './common-module';
+
+// Note: These need to be exposed privately for cross-package type inference. e.g. if the
+// experimental package uses a mixin, TS will try to write an explicit type reference that
+// is equivalent to e.g. `CanColorCtor`. For this it needs these two helpers as otherwise it
+// would generate a deep cross-package import that breaks in the NPM package output.
+export {
+  Constructor as _Constructor,
+  AbstractConstructor as _AbstractConstructor
+} from './constructor';
+
 export {CanDisable, mixinDisabled} from './disabled';
 export {CanColor, mixinColor, ThemePalette} from './color';
 export {CanDisableRipple, mixinDisableRipple} from './disable-ripple';

tools/public_api_guard/material/autocomplete.md

@@ -4,14 +4,14 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
 import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { CanDisableRipple } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { Directionality } from '@angular/cdk/bidi';
 import { ElementRef } from '@angular/core';

tools/public_api_guard/material/badge.md

@@ -4,11 +4,11 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { AriaDescriber } from '@angular/cdk/a11y';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { CanDisable } from '@angular/material/core';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
 import * as i2 from '@angular/cdk/a11y';

tools/public_api_guard/material/button-toggle.md

@@ -4,13 +4,13 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { CanDisableRipple } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';

tools/public_api_guard/material/button.md

@@ -4,13 +4,13 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { CanColor } from '@angular/material/core';
 import { CanDisable } from '@angular/material/core';
 import { CanDisableRipple } from '@angular/material/core';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ElementRef } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
 import { FocusMonitor } from '@angular/cdk/a11y';

tools/public_api_guard/material/checkbox.md

@@ -4,7 +4,7 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { AfterViewChecked } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
@@ -13,7 +13,7 @@ import { CanDisable } from '@angular/material/core';
 import { CanDisableRipple } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
 import { CheckboxRequiredValidator } from '@angular/forms';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';

tools/public_api_guard/material/chips.md

@@ -4,15 +4,15 @@
 
 ```ts
 
-import { AbstractConstructor } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor } from '@angular/material/core';
 import { AfterContentInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { CanColor } from '@angular/material/core';
 import { CanDisable } from '@angular/material/core';
 import { CanDisableRipple } from '@angular/material/core';
 import { CanUpdateErrorState } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
-import { Constructor } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor } from '@angular/material/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { Directionality } from '@angular/cdk/bidi';
 import { DoCheck } from '@angular/core';

tools/public_api_guard/material/core.md

@@ -4,11 +4,11 @@
 
 ```ts
 
-import { AbstractConstructor as AbstractConstructor_2 } from '@angular/material/core/common-behaviors/constructor';
+import { _AbstractConstructor as _AbstractConstructor_2 } from '@angular/material/core';
 import { AfterViewChecked } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { ChangeDetectorRef } from '@angular/core';
-import { Constructor as Constructor_2 } from '@angular/material/core/common-behaviors/constructor';
+import { _Constructor as _Constructor_2 } from '@angular/material/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
@@ -33,6 +33,9 @@ import { QueryList } from '@angular/core';
 import { Subject } from 'rxjs';
 import { Version } from '@angular/core';
 
+// @public
+export type _AbstractConstructor<T = object> = abstract new (...args: any[]) => T;
+
 // @public
 export class AnimationCurves {
     // (undocumented)
@@ -79,6 +82,9 @@ export interface CanUpdateErrorState {
     updateErrorState(): void;
 }
 
+// @public
+export type _Constructor<T> = new (...args: any[]) => T;
+
 // @public
 export function _countGroupLabelsBeforeOption(optionIndex: number, options: QueryList<MatOption>, optionGroups: QueryList<MatOptgroup>): number;
 
@@ -404,22 +410,22 @@ export class MatRippleModule {
 }
 
 // @public
-export function mixinColor<T extends AbstractConstructor<HasElementRef>>(base: T, defaultColor?: ThemePalette): CanColorCtor & T;
+export function mixinColor<T extends _AbstractConstructor<HasElementRef>>(base: T, defaultColor?: ThemePalette): CanColorCtor & T;
 
 // @public
-export function mixinDisabled<T extends AbstractConstructor<{}>>(base: T): CanDisableCtor & T;
+export function mixinDisabled<T extends _AbstractConstructor<{}>>(base: T): CanDisableCtor & T;
 
 // @public
-export function mixinDisableRipple<T extends AbstractConstructor<{}>>(base: T): CanDisableRippleCtor & T;
+export function mixinDisableRipple<T extends _AbstractConstructor<{}>>(base: T): CanDisableRippleCtor & T;
 
 // @public
-export function mixinErrorState<T extends AbstractConstructor<HasErrorState>>(base: T): CanUpdateErrorStateCtor & T;
+export function mixinErrorState<T extends _AbstractConstructor<HasErrorState>>(base: T): CanUpdateErrorStateCtor & T;
 
 // @public
-export function mixinInitialized<T extends Constructor<{}>>(base: T): HasInitializedCtor & T;
+export function mixinInitialized<T extends _Constructor<{}>>(base: T): HasInitializedCtor & T;
 
 // @public
-export function mixinTabIndex<T extends AbstractConstructor<CanDisable>>(base: T, defaultTabIndex?: number): HasTabIndexCtor & T;
+export function mixinTabIndex<T extends _AbstractConstructor<CanDisable>>(base: T, defaultTabIndex?: number): HasTabIndexCtor & T;
 
 // @public
 export class NativeDateAdapter extends DateAdapter<Date> {