refactor(material/legacy-chips): rename ts symbols

wagnermaciel · wagnermaciel · commit 66a87f216511 · 2022-09-03T15:35:26.000Z
diff --git a/src/material/legacy-chips/chip-default-options.ts b/src/material/legacy-chips/chip-default-options.ts
@@ -15,6 +15,6 @@ export interface MatLegacyChipsDefaultOptions {
 }
 
 /** Injection token to be used to override the default options for the chips module. */
-export const MAT_CHIPS_DEFAULT_OPTIONS = new InjectionToken<MatLegacyChipsDefaultOptions>(
+export const MAT_LEGACY_CHIPS_DEFAULT_OPTIONS = new InjectionToken<MatLegacyChipsDefaultOptions>(
   'mat-chips-default-options',
 );
diff --git a/src/material/legacy-chips/chip-input.spec.ts b/src/material/legacy-chips/chip-input.spec.ts
@@ -8,7 +8,10 @@ import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
-import {MAT_CHIPS_DEFAULT_OPTIONS, MatLegacyChipsDefaultOptions} from './chip-default-options';
+import {
+  MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
+  MatLegacyChipsDefaultOptions,
+} from './chip-default-options';
 import {MatLegacyChipInput, MatLegacyChipInputEvent} from './chip-input';
 import {MatLegacyChipList} from './chip-list';
 import {MatLegacyChipsModule} from './index';
@@ -225,7 +228,7 @@ describe('MatChipInput', () => {
           declarations: [TestChipInput],
           providers: [
             {
-              provide: MAT_CHIPS_DEFAULT_OPTIONS,
+              provide: MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
               useValue: {separatorKeyCodes: [COMMA]} as MatLegacyChipsDefaultOptions,
             },
           ],
diff --git a/src/material/legacy-chips/chip-input.ts b/src/material/legacy-chips/chip-input.ts
@@ -19,7 +19,10 @@ import {
   OnDestroy,
   Output,
 } from '@angular/core';
-import {MatLegacyChipsDefaultOptions, MAT_CHIPS_DEFAULT_OPTIONS} from './chip-default-options';
+import {
+  MatLegacyChipsDefaultOptions,
+  MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
+} from './chip-default-options';
 import {MatLegacyChipList} from './chip-list';
 import {MatLegacyChipTextControl} from './chip-text-control';
 
@@ -132,7 +135,7 @@ export class MatLegacyChipInput
 
   constructor(
     protected _elementRef: ElementRef<HTMLInputElement>,
-    @Inject(MAT_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatLegacyChipsDefaultOptions,
+    @Inject(MAT_LEGACY_CHIPS_DEFAULT_OPTIONS) private _defaultOptions: MatLegacyChipsDefaultOptions,
   ) {
     this.inputElement = this._elementRef.nativeElement as HTMLInputElement;
   }
diff --git a/src/material/legacy-chips/chip.ts b/src/material/legacy-chips/chip.ts
@@ -67,21 +67,21 @@ export class MatLegacyChipSelectionChange {
  * alternative token to the actual `MatChipRemove` class which could cause unnecessary
  * retention of the class and its directive metadata.
  */
-export const MAT_CHIP_REMOVE = new InjectionToken<MatLegacyChipRemove>('MatChipRemove');
+export const MAT_LEGACY_CHIP_REMOVE = new InjectionToken<MatLegacyChipRemove>('MatChipRemove');
 
 /**
  * Injection token that can be used to reference instances of `MatChipAvatar`. It serves as
  * alternative token to the actual `MatChipAvatar` class which could cause unnecessary
  * retention of the class and its directive metadata.
  */
-export const MAT_CHIP_AVATAR = new InjectionToken<MatLegacyChipAvatar>('MatChipAvatar');
+export const MAT_LEGACY_CHIP_AVATAR = new InjectionToken<MatLegacyChipAvatar>('MatChipAvatar');
 
 /**
  * Injection token that can be used to reference instances of `MatChipTrailingIcon`. It serves as
  * alternative token to the actual `MatChipTrailingIcon` class which could cause unnecessary
  * retention of the class and its directive metadata.
  */
-export const MAT_CHIP_TRAILING_ICON = new InjectionToken<MatLegacyChipTrailingIcon>(
+export const MAT_LEGACY_CHIP_TRAILING_ICON = new InjectionToken<MatLegacyChipTrailingIcon>(
   'MatChipTrailingIcon',
 );
 
@@ -101,7 +101,7 @@ const _MatChipMixinBase = mixinTabIndex(mixinColor(mixinDisableRipple(MatChipBas
 @Directive({
   selector: 'mat-chip-avatar, [matChipAvatar]',
   host: {'class': 'mat-chip-avatar'},
-  providers: [{provide: MAT_CHIP_AVATAR, useExisting: MatLegacyChipAvatar}],
+  providers: [{provide: MAT_LEGACY_CHIP_AVATAR, useExisting: MatLegacyChipAvatar}],
 })
 export class MatLegacyChipAvatar {}
 
@@ -112,7 +112,7 @@ export class MatLegacyChipAvatar {}
 @Directive({
   selector: 'mat-chip-trailing-icon, [matChipTrailingIcon]',
   host: {'class': 'mat-chip-trailing-icon'},
-  providers: [{provide: MAT_CHIP_TRAILING_ICON, useExisting: MatLegacyChipTrailingIcon}],
+  providers: [{provide: MAT_LEGACY_CHIP_TRAILING_ICON, useExisting: MatLegacyChipTrailingIcon}],
 })
 export class MatLegacyChipTrailingIcon {}
 
@@ -197,13 +197,13 @@ export class MatLegacyChip
   _chipListDisabled: boolean = false;
 
   /** The chip avatar */
-  @ContentChild(MAT_CHIP_AVATAR) avatar: MatLegacyChipAvatar;
+  @ContentChild(MAT_LEGACY_CHIP_AVATAR) avatar: MatLegacyChipAvatar;
 
   /** The chip's trailing icon. */
-  @ContentChild(MAT_CHIP_TRAILING_ICON) trailingIcon: MatLegacyChipTrailingIcon;
+  @ContentChild(MAT_LEGACY_CHIP_TRAILING_ICON) trailingIcon: MatLegacyChipTrailingIcon;
 
   /** The chip's remove toggler. */
-  @ContentChild(MAT_CHIP_REMOVE) removeIcon: MatLegacyChipRemove;
+  @ContentChild(MAT_LEGACY_CHIP_REMOVE) removeIcon: MatLegacyChipRemove;
 
   /** ARIA role that should be applied to the chip. */
   @Input() role: string = 'option';
@@ -477,7 +477,7 @@ export class MatLegacyChip
     'class': 'mat-chip-remove mat-chip-trailing-icon',
     '(click)': '_handleClick($event)',
   },
-  providers: [{provide: MAT_CHIP_REMOVE, useExisting: MatLegacyChipRemove}],
+  providers: [{provide: MAT_LEGACY_CHIP_REMOVE, useExisting: MatLegacyChipRemove}],
 })
 export class MatLegacyChipRemove {
   constructor(protected _parentChip: MatLegacyChip, elementRef: ElementRef<HTMLElement>) {
diff --git a/src/material/legacy-chips/chips-module.ts b/src/material/legacy-chips/chips-module.ts
@@ -15,7 +15,10 @@ import {
   MatLegacyChipRemove,
   MatLegacyChipTrailingIcon,
 } from './chip';
-import {MAT_CHIPS_DEFAULT_OPTIONS, MatLegacyChipsDefaultOptions} from './chip-default-options';
+import {
+  MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
+  MatLegacyChipsDefaultOptions,
+} from './chip-default-options';
 import {MatLegacyChipInput} from './chip-input';
 import {MatLegacyChipList} from './chip-list';
 
@@ -35,7 +38,7 @@ const CHIP_DECLARATIONS = [
   providers: [
     ErrorStateMatcher,
     {
-      provide: MAT_CHIPS_DEFAULT_OPTIONS,
+      provide: MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
       useValue: {
         separatorKeyCodes: [ENTER],
       } as MatLegacyChipsDefaultOptions,
diff --git a/src/material/legacy-chips/public-api.ts b/src/material/legacy-chips/public-api.ts
@@ -6,8 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './chips-module';
-export * from './chip-list';
-export * from './chip';
-export * from './chip-input';
-export * from './chip-default-options';
+export {MatLegacyChipsModule} from './chips-module';
+export {MatLegacyChipListChange, MatLegacyChipList} from './chip-list';
+export {
+  MatLegacyChipEvent,
+  MatLegacyChipSelectionChange,
+  MAT_LEGACY_CHIP_REMOVE,
+  MAT_LEGACY_CHIP_AVATAR,
+  MAT_LEGACY_CHIP_TRAILING_ICON,
+  MatLegacyChipAvatar,
+  MatLegacyChipTrailingIcon,
+  MatLegacyChip,
+  MatLegacyChipRemove,
+} from './chip';
+export {MatLegacyChipInputEvent, MatLegacyChipInput} from './chip-input';
+export {
+  MatLegacyChipsDefaultOptions,
+  MAT_LEGACY_CHIPS_DEFAULT_OPTIONS,
+} from './chip-default-options';
diff --git a/src/material/legacy-chips/testing/chip-avatar-harness.ts b/src/material/legacy-chips/testing/chip-avatar-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {HarnessPredicate, ComponentHarness} from '@angular/cdk/testing';
-import {ChipAvatarHarnessFilters} from './chip-harness-filters';
+import {LegacyChipAvatarHarnessFilters} from './chip-harness-filters';
 
 /** Harness for interacting with a standard Material chip avatar in tests. */
 export class MatLegacyChipAvatarHarness extends ComponentHarness {
@@ -20,7 +20,7 @@ export class MatLegacyChipAvatarHarness extends ComponentHarness {
    * @return a `HarnessPredicate` configured with the given options.
    */
   static with(
-    options: ChipAvatarHarnessFilters = {},
+    options: LegacyChipAvatarHarnessFilters = {},
   ): HarnessPredicate<MatLegacyChipAvatarHarness> {
     return new HarnessPredicate(MatLegacyChipAvatarHarness, options);
   }
diff --git a/src/material/legacy-chips/testing/chip-harness-filters.ts b/src/material/legacy-chips/testing/chip-harness-filters.ts
@@ -8,39 +8,39 @@
 import {BaseHarnessFilters} from '@angular/cdk/testing';
 
 /** A set of criteria that can be used to filter a list of chip instances. */
-export interface ChipHarnessFilters extends BaseHarnessFilters {
+export interface LegacyChipHarnessFilters extends BaseHarnessFilters {
   /** Only find instances whose text matches the given value. */
   text?: string | RegExp;
   /**
    * Only find chip instances whose selected state matches the given value.
-   * @deprecated Use `MatChipOptionHarness` together with `ChipOptionHarnessFilters`.
+   * @deprecated Use Legacy Chip Option Harness together with Legacy Chip Option Harness Filters.
    * @breaking-change 12.0.0
    */
   selected?: boolean;
 }
 
 /** A set of criteria that can be used to filter a list of selectable chip instances. */
-export interface ChipOptionHarnessFilters extends ChipHarnessFilters {
+export interface LegacyChipOptionHarnessFilters extends LegacyChipHarnessFilters {
   /** Only find chip instances whose selected state matches the given value. */
   selected?: boolean;
 }
 
 /** A set of criteria that can be used to filter chip list instances. */
-export interface ChipListHarnessFilters extends BaseHarnessFilters {}
+export interface LegacyChipListHarnessFilters extends BaseHarnessFilters {}
 
 /** A set of criteria that can be used to filter selectable chip list instances. */
-export interface ChipListboxHarnessFilters extends BaseHarnessFilters {}
+export interface LegacyChipListboxHarnessFilters extends BaseHarnessFilters {}
 
 /** A set of criteria that can be used to filter a list of `MatChipListInputHarness` instances. */
-export interface ChipInputHarnessFilters extends BaseHarnessFilters {
+export interface LegacyChipInputHarnessFilters extends BaseHarnessFilters {
   /** Filters based on the value of the input. */
   value?: string | RegExp;
   /** Filters based on the placeholder text of the input. */
   placeholder?: string | RegExp;
 }
 
 /** A set of criteria that can be used to filter a list of `MatChipRemoveHarness` instances. */
-export interface ChipRemoveHarnessFilters extends BaseHarnessFilters {}
+export interface LegacyChipRemoveHarnessFilters extends BaseHarnessFilters {}
 
 /** A set of criteria that can be used to filter a list of `MatChipAvatarHarness` instances. */
-export interface ChipAvatarHarnessFilters extends BaseHarnessFilters {}
+export interface LegacyChipAvatarHarnessFilters extends BaseHarnessFilters {}
diff --git a/src/material/legacy-chips/testing/chip-harness.ts b/src/material/legacy-chips/testing/chip-harness.ts
@@ -9,9 +9,9 @@
 import {ContentContainerComponentHarness, HarnessPredicate, TestKey} from '@angular/cdk/testing';
 import {MatLegacyChipAvatarHarness} from './chip-avatar-harness';
 import {
-  ChipAvatarHarnessFilters,
-  ChipHarnessFilters,
-  ChipRemoveHarnessFilters,
+  LegacyChipAvatarHarnessFilters,
+  LegacyChipHarnessFilters,
+  LegacyChipRemoveHarnessFilters,
 } from './chip-harness-filters';
 import {MatLegacyChipRemoveHarness} from './chip-remove-harness';
 
@@ -26,7 +26,7 @@ export class MatLegacyChipHarness extends ContentContainerComponentHarness {
    * @param options Options for filtering which chip instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: ChipHarnessFilters = {}): HarnessPredicate<MatLegacyChipHarness> {
+  static with(options: LegacyChipHarnessFilters = {}): HarnessPredicate<MatLegacyChipHarness> {
     return new HarnessPredicate(MatLegacyChipHarness, options)
       .addOption('text', options.text, (harness, label) =>
         HarnessPredicate.stringMatches(harness.getText(), label),
@@ -100,7 +100,7 @@ export class MatLegacyChipHarness extends ContentContainerComponentHarness {
    * @param filter Optionally filters which remove buttons are included.
    */
   async getRemoveButton(
-    filter: ChipRemoveHarnessFilters = {},
+    filter: LegacyChipRemoveHarnessFilters = {},
   ): Promise<MatLegacyChipRemoveHarness> {
     return this.locatorFor(MatLegacyChipRemoveHarness.with(filter))();
   }
@@ -110,7 +110,7 @@ export class MatLegacyChipHarness extends ContentContainerComponentHarness {
    * @param filter Optionally filters which avatars are included.
    */
   async getAvatar(
-    filter: ChipAvatarHarnessFilters = {},
+    filter: LegacyChipAvatarHarnessFilters = {},
   ): Promise<MatLegacyChipAvatarHarness | null> {
     return this.locatorForOptional(MatLegacyChipAvatarHarness.with(filter))();
   }
diff --git a/src/material/legacy-chips/testing/chip-input-harness.ts b/src/material/legacy-chips/testing/chip-input-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {HarnessPredicate, ComponentHarness, TestKey} from '@angular/cdk/testing';
-import {ChipInputHarnessFilters} from './chip-harness-filters';
+import {LegacyChipInputHarnessFilters} from './chip-harness-filters';
 
 /** Harness for interacting with a standard Material chip inputs in tests. */
 export class MatLegacyChipInputHarness extends ComponentHarness {
@@ -19,7 +19,9 @@ export class MatLegacyChipInputHarness extends ComponentHarness {
    * @param options Options for filtering which input instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: ChipInputHarnessFilters = {}): HarnessPredicate<MatLegacyChipInputHarness> {
+  static with(
+    options: LegacyChipInputHarnessFilters = {},
+  ): HarnessPredicate<MatLegacyChipInputHarness> {
     return new HarnessPredicate(MatLegacyChipInputHarness, options)
       .addOption('value', options.value, async (harness, value) => {
         return (await harness.getValue()) === value;
diff --git a/src/material/legacy-chips/testing/chip-list-harness.ts b/src/material/legacy-chips/testing/chip-list-harness.ts
@@ -10,9 +10,9 @@ import {ComponentHarness, HarnessPredicate, parallel} from '@angular/cdk/testing
 import {MatLegacyChipHarness} from './chip-harness';
 import {MatLegacyChipInputHarness} from './chip-input-harness';
 import {
-  ChipListHarnessFilters,
-  ChipHarnessFilters,
-  ChipInputHarnessFilters,
+  LegacyChipListHarnessFilters,
+  LegacyChipHarnessFilters,
+  LegacyChipInputHarnessFilters,
 } from './chip-harness-filters';
 
 /** Base class for chip list harnesses. */
@@ -55,15 +55,17 @@ export class MatLegacyChipListHarness extends _MatChipListHarnessBase {
    * @param options Options for filtering which chip list instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: ChipListHarnessFilters = {}): HarnessPredicate<MatLegacyChipListHarness> {
+  static with(
+    options: LegacyChipListHarnessFilters = {},
+  ): HarnessPredicate<MatLegacyChipListHarness> {
     return new HarnessPredicate(MatLegacyChipListHarness, options);
   }
 
   /**
    * Gets the list of chips inside the chip list.
    * @param filter Optionally filters which chips are included.
    */
-  async getChips(filter: ChipHarnessFilters = {}): Promise<MatLegacyChipHarness[]> {
+  async getChips(filter: LegacyChipHarnessFilters = {}): Promise<MatLegacyChipHarness[]> {
     return this.locatorForAll(MatLegacyChipHarness.with(filter))();
   }
 
@@ -74,7 +76,7 @@ export class MatLegacyChipListHarness extends _MatChipListHarnessBase {
    * @deprecated Use `MatChipListboxHarness.selectChips` instead.
    * @breaking-change 12.0.0
    */
-  async selectChips(filter: ChipHarnessFilters = {}): Promise<void> {
+  async selectChips(filter: LegacyChipHarnessFilters = {}): Promise<void> {
     const chips = await this.getChips(filter);
     if (!chips.length) {
       throw Error(`Cannot find chip matching filter ${JSON.stringify(filter)}`);
@@ -86,7 +88,7 @@ export class MatLegacyChipListHarness extends _MatChipListHarnessBase {
    * Gets the `MatChipInput` inside the chip list.
    * @param filter Optionally filters which chip input is included.
    */
-  async getInput(filter: ChipInputHarnessFilters = {}): Promise<MatLegacyChipInputHarness> {
+  async getInput(filter: LegacyChipInputHarnessFilters = {}): Promise<MatLegacyChipInputHarness> {
     // The input isn't required to be a descendant of the chip list so we have to look it up by id.
     const inputId = await (await this.host()).getAttribute('data-mat-chip-input');
 
diff --git a/src/material/legacy-chips/testing/chip-listbox-harness.ts b/src/material/legacy-chips/testing/chip-listbox-harness.ts
@@ -8,7 +8,10 @@
 
 import {HarnessPredicate, parallel} from '@angular/cdk/testing';
 import {MatLegacyChipOptionHarness} from './chip-option-harness';
-import {ChipListboxHarnessFilters, ChipOptionHarnessFilters} from './chip-harness-filters';
+import {
+  LegacyChipListboxHarnessFilters,
+  LegacyChipOptionHarnessFilters,
+} from './chip-harness-filters';
 import {_MatChipListHarnessBase} from './chip-list-harness';
 
 /** Harness for interacting with a standard selectable chip list in tests. */
@@ -23,7 +26,7 @@ export class MatLegacyChipListboxHarness extends _MatChipListHarnessBase {
    * @return a `HarnessPredicate` configured with the given options.
    */
   static with(
-    options: ChipListboxHarnessFilters = {},
+    options: LegacyChipListboxHarnessFilters = {},
   ): HarnessPredicate<MatLegacyChipListboxHarness> {
     return new HarnessPredicate(MatLegacyChipListboxHarness, options);
   }
@@ -32,7 +35,9 @@ export class MatLegacyChipListboxHarness extends _MatChipListHarnessBase {
    * Gets the list of chips inside the chip list.
    * @param filter Optionally filters which chips are included.
    */
-  async getChips(filter: ChipOptionHarnessFilters = {}): Promise<MatLegacyChipOptionHarness[]> {
+  async getChips(
+    filter: LegacyChipOptionHarnessFilters = {},
+  ): Promise<MatLegacyChipOptionHarness[]> {
     return this.locatorForAll(MatLegacyChipOptionHarness.with(filter))();
   }
 
@@ -41,7 +46,7 @@ export class MatLegacyChipListboxHarness extends _MatChipListHarnessBase {
    * @param filter An optional filter to apply to the child chips.
    *    All the chips matching the filter will be selected.
    */
-  async selectChips(filter: ChipOptionHarnessFilters = {}): Promise<void> {
+  async selectChips(filter: LegacyChipOptionHarnessFilters = {}): Promise<void> {
     const chips = await this.getChips(filter);
     if (!chips.length) {
       throw Error(`Cannot find chip matching filter ${JSON.stringify(filter)}`);
diff --git a/src/material/legacy-chips/testing/chip-option-harness.ts b/src/material/legacy-chips/testing/chip-option-harness.ts
diff --git a/src/material/legacy-chips/testing/chip-remove-harness.ts b/src/material/legacy-chips/testing/chip-remove-harness.ts
diff --git a/src/material/legacy-chips/testing/public-api.ts b/src/material/legacy-chips/testing/public-api.ts
diff --git a/tools/public_api_guard/material/legacy-chips-testing.md b/tools/public_api_guard/material/legacy-chips-testing.md
diff --git a/tools/public_api_guard/material/legacy-chips.md b/tools/public_api_guard/material/legacy-chips.md

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ export interface MatLegacyChipsDefaultOptions {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/** Injection token to be used to override the default options for the chips module. */`
`18`		`-export const MAT_CHIPS_DEFAULT_OPTIONS = new InjectionToken<MatLegacyChipsDefaultOptions>(`
	`18`	`+export const MAT_LEGACY_CHIPS_DEFAULT_OPTIONS = new InjectionToken<MatLegacyChipsDefaultOptions>(`
`19`	`19`	`'mat-chips-default-options',`
`20`	`20`	`);`