Skip to content

Commit 0375bfd

Browse files
josephperrottjosephperrott
committed
fixup! refactor(cdk/schematics): change usages of whitelist in selector interfaces to fileTypeFilter
1 parent 5a2029f commit 0375bfd

File tree

13 files changed

+100
-109
lines changed

13 files changed

+100
-109
lines changed

‎src/cdk/schematics/ng-update/data/css-selectors.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ export interface CssSelectorUpgradeData {
1818
* Controls which file types in which this replacement is made. If omitted, it is made in all
1919
* files.
2020
*/
21-
fileTypeFilter?: {
21+
replaceIn?: {
2222
/** Replace this name in stylesheet files. */
2323
stylesheet?: boolean,
2424
/** Replace this name in HTML files. */
2525
html?: boolean,
2626
/** Replace this name in TypeScript strings. */
27-
strings?: boolean
27+
tsStringLiterals?: boolean
2828
};
2929
}
3030

‎src/cdk/schematics/ng-update/data/input-names.ts

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ export interface InputNameUpgradeData {
1414
replace: string;
1515
/** The new name for the @Input(). */
1616
replaceWith: string;
17-
/**
18-
* Controls which file types in which this replacement is made. If omitted, it is made in all
19-
* files.
20-
*/
21-
fileTypeFilter: {
17+
/** Controls which elements and attributes in which this replacement is made. */
18+
limitedTo: {
2219
/** Limit to elements with any of these element tags. */
2320
elements?: string[],
2421
/** Limit to elements with any of these attributes. */
@@ -34,73 +31,73 @@ export const inputNames: VersionChanges<InputNameUpgradeData> = {
3431
{
3532
replace: 'origin',
3633
replaceWith: 'cdkConnectedOverlayOrigin',
37-
fileTypeFilter:
34+
limitedTo:
3835
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
3936
},
4037
{
4138
replace: 'positions',
4239
replaceWith: 'cdkConnectedOverlayPositions',
43-
fileTypeFilter:
40+
limitedTo:
4441
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
4542
},
4643
{
4744
replace: 'offsetX',
4845
replaceWith: 'cdkConnectedOverlayOffsetX',
49-
fileTypeFilter:
46+
limitedTo:
5047
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
5148
},
5249
{
5350
replace: 'offsetY',
5451
replaceWith: 'cdkConnectedOverlayOffsetY',
55-
fileTypeFilter:
52+
limitedTo:
5653
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
5754
},
5855
{
5956
replace: 'width',
6057
replaceWith: 'cdkConnectedOverlayWidth',
61-
fileTypeFilter:
58+
limitedTo:
6259
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
6360
},
6461
{
6562
replace: 'height',
6663
replaceWith: 'cdkConnectedOverlayHeight',
67-
fileTypeFilter:
64+
limitedTo:
6865
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
6966
},
7067
{
7168
replace: 'minWidth',
7269
replaceWith: 'cdkConnectedOverlayMinWidth',
73-
fileTypeFilter:
70+
limitedTo:
7471
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
7572
},
7673
{
7774
replace: 'minHeight',
7875
replaceWith: 'cdkConnectedOverlayMinHeight',
79-
fileTypeFilter:
76+
limitedTo:
8077
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
8178
},
8279
{
8380
replace: 'backdropClass',
8481
replaceWith: 'cdkConnectedOverlayBackdropClass',
85-
fileTypeFilter:
82+
limitedTo:
8683
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
8784
},
8885
{
8986
replace: 'scrollStrategy',
9087
replaceWith: 'cdkConnectedOverlayScrollStrategy',
91-
fileTypeFilter:
88+
limitedTo:
9289
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
9390
},
9491
{
9592
replace: 'open',
9693
replaceWith: 'cdkConnectedOverlayOpen',
97-
fileTypeFilter:
94+
limitedTo:
9895
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
9996
},
10097
{
10198
replace: 'hasBackdrop',
10299
replaceWith: 'cdkConnectedOverlayHasBackdrop',
103-
fileTypeFilter:
100+
limitedTo:
104101
{attributes: ['cdk-connected-overlay', 'connected-overlay', 'cdkConnectedOverlay']}
105102
}
106103
]

‎src/cdk/schematics/ng-update/data/output-names.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ export interface OutputNameUpgradeData {
1414
replace: string;
1515
/** The new name for the @Output(). */
1616
replaceWith: string;
17-
/**
18-
* Controls which file types in which this replacement is made. If omitted, it is made in all
19-
* files.
20-
*/
21-
fileTypeFilter: {
17+
/** Controls which elements and attributes in which this replacement is made. */
18+
limitedTo: {
2219
/** Limit to elements with any of these element tags. */
2320
elements?: string[],
2421
/** Limit to elements with any of these attributes. */
@@ -33,7 +30,7 @@ export const outputNames: VersionChanges<OutputNameUpgradeData> = {
3330
changes: [{
3431
replace: 'copied',
3532
replaceWith: 'cdkCopyToClipboardCopied',
36-
fileTypeFilter: {
33+
limitedTo: {
3734
attributes: ['cdkCopyToClipboard']
3835
}
3936
}]

‎src/cdk/schematics/ng-update/data/property-names.ts

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ export interface PropertyNameUpgradeData {
1414
replace: string;
1515
/** The new name for the property. */
1616
replaceWith: string;
17-
/**
18-
* Controls which file types in which this replacement is made. If omitted, it is made in all
19-
* files.
20-
*/
21-
fileTypeFilter: {
17+
/** Controls which classes in which this replacement is made. */
18+
limitedTo: {
2219
/** Replace the property only when its type is one of the given Classes. */
2320
classes: string[];
2421
};
@@ -31,15 +28,15 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
3128
changes: [{
3229
replace: 'boundaryElementSelector',
3330
replaceWith: 'boundaryElement',
34-
fileTypeFilter: {classes: ['CdkDrag']}
31+
limitedTo: {classes: ['CdkDrag']}
3532
}]
3633
},
3734
{
3835
pr: 'https://github.com/angular/components/pull/17302',
3936
changes: [{
4037
replace: 'onChange',
4138
replaceWith: 'changed',
42-
fileTypeFilter: {classes: ['SelectionModel']}
39+
limitedTo: {classes: ['SelectionModel']}
4340
}]
4441
}
4542
],
@@ -48,15 +45,15 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
4845
{
4946
pr: 'https://github.com/angular/components/pull/8286',
5047
changes:
51-
[{replace: 'onChange', replaceWith: 'changed', fileTypeFilter: {classes: ['SelectionModel']}}]
48+
[{replace: 'onChange', replaceWith: 'changed', limitedTo: {classes: ['SelectionModel']}}]
5249
},
5350

5451
{
5552
pr: 'https://github.com/angular/components/pull/12927',
5653
changes: [{
5754
replace: 'flexibleDiemsions',
5855
replaceWith: 'flexibleDimensions',
59-
fileTypeFilter: {classes: ['CdkConnectedOverlay']}
56+
limitedTo: {classes: ['CdkConnectedOverlay']}
6057
}]
6158
}
6259
],
@@ -68,62 +65,62 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
6865
{
6966
replace: '_deprecatedOrigin',
7067
replaceWith: 'origin',
71-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
68+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
7269
},
7370
{
7471
replace: '_deprecatedPositions',
7572
replaceWith: 'positions',
76-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
73+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
7774
},
7875
{
7976
replace: '_deprecatedOffsetX',
8077
replaceWith: 'offsetX',
81-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
78+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
8279
},
8380
{
8481
replace: '_deprecatedOffsetY',
8582
replaceWith: 'offsetY',
86-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
83+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
8784
},
8885
{
8986
replace: '_deprecatedWidth',
9087
replaceWith: 'width',
91-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
88+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
9289
},
9390
{
9491
replace: '_deprecatedHeight',
9592
replaceWith: 'height',
96-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
93+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
9794
},
9895
{
9996
replace: '_deprecatedMinWidth',
10097
replaceWith: 'minWidth',
101-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
98+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
10299
},
103100
{
104101
replace: '_deprecatedMinHeight',
105102
replaceWith: 'minHeight',
106-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
103+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
107104
},
108105
{
109106
replace: '_deprecatedBackdropClass',
110107
replaceWith: 'backdropClass',
111-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
108+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
112109
},
113110
{
114111
replace: '_deprecatedScrollStrategy',
115112
replaceWith: 'scrollStrategy',
116-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
113+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
117114
},
118115
{
119116
replace: '_deprecatedOpen',
120117
replaceWith: 'open',
121-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
118+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
122119
},
123120
{
124121
replace: '_deprecatedHasBackdrop',
125122
replaceWith: 'hasBackdrop',
126-
fileTypeFilter: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
123+
limitedTo: {classes: ['CdkConnectedOverlay', 'ConnectedOverlayDirective']}
127124
}
128125
]
129126
},
@@ -134,12 +131,12 @@ export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
134131
{
135132
replace: '_deprecatedPortal',
136133
replaceWith: 'portal',
137-
fileTypeFilter: {classes: ['CdkPortalOutlet']}
134+
limitedTo: {classes: ['CdkPortalOutlet']}
138135
},
139136
{
140137
replace: '_deprecatedPortalHost',
141138
replaceWith: 'portal',
142-
fileTypeFilter: {classes: ['CdkPortalOutlet']}
139+
limitedTo: {classes: ['CdkPortalOutlet']}
143140
}
144141
]
145142
},

‎src/cdk/schematics/ng-update/migrations/class-inheritance.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export class ClassInheritanceMigration extends Migration<UpgradeData> {
2828

2929
init(): void {
3030
getVersionUpgradeData(this, 'propertyNames')
31-
.filter(data => data.fileTypeFilter && data.fileTypeFilter.classes)
31+
.filter(data => data.limitedTo && data.limitedTo.classes)
3232
.forEach(
33-
data => data.fileTypeFilter.classes.forEach(name => this.propertyNames.set(name, data)));
33+
data => data.limitedTo.classes.forEach(name => this.propertyNames.set(name, data)));
3434
}
3535

3636
visitNode(node: ts.Node): void {

‎src/cdk/schematics/ng-update/migrations/css-selectors.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CssSelectorsMigration extends Migration<UpgradeData> {
3333

3434
visitTemplate(template: ResolvedResource): void {
3535
this.data.forEach(data => {
36-
if (data.fileTypeFilter && !data.fileTypeFilter.html) {
36+
if (data.replaceIn && !data.replaceIn.html) {
3737
return;
3838
}
3939

@@ -45,7 +45,7 @@ export class CssSelectorsMigration extends Migration<UpgradeData> {
4545

4646
visitStylesheet(stylesheet: ResolvedResource): void {
4747
this.data.forEach(data => {
48-
if (data.fileTypeFilter && !data.fileTypeFilter.stylesheet) {
48+
if (data.replaceIn && !data.replaceIn.stylesheet) {
4949
return;
5050
}
5151

@@ -64,7 +64,7 @@ export class CssSelectorsMigration extends Migration<UpgradeData> {
6464
const filePath = this.fileSystem.resolve(node.getSourceFile().fileName);
6565

6666
this.data.forEach(data => {
67-
if (data.fileTypeFilter && !data.fileTypeFilter.strings) {
67+
if (data.replaceIn && !data.replaceIn.tsStringLiterals) {
6868
return;
6969
}
7070

‎src/cdk/schematics/ng-update/migrations/input-names.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ export class InputNamesMigration extends Migration<UpgradeData> {
4444

4545
visitTemplate(template: ResolvedResource): void {
4646
this.data.forEach(name => {
47-
const fileTypeFilter = name.fileTypeFilter;
47+
const limitedTo = name.limitedTo;
4848
const relativeOffsets: number[] = [];
4949

50-
if (fileTypeFilter.attributes) {
50+
if (limitedTo.attributes) {
5151
relativeOffsets.push(
52-
...findInputsOnElementWithAttr(template.content, name.replace, fileTypeFilter.attributes));
52+
...findInputsOnElementWithAttr(template.content, name.replace, limitedTo.attributes));
5353
}
5454

55-
if (fileTypeFilter.elements) {
55+
if (limitedTo.elements) {
5656
relativeOffsets.push(
57-
...findInputsOnElementWithTag(template.content, name.replace, fileTypeFilter.elements));
57+
...findInputsOnElementWithTag(template.content, name.replace, limitedTo.elements));
5858
}
5959

6060
relativeOffsets.map(offset => template.start + offset)

‎src/cdk/schematics/ng-update/migrations/output-names.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ export class OutputNamesMigration extends Migration<UpgradeData> {
3030

3131
visitTemplate(template: ResolvedResource): void {
3232
this.data.forEach(name => {
33-
const fileTypeFilter = name.fileTypeFilter;
33+
const limitedTo = name.limitedTo;
3434
const relativeOffsets: number[] = [];
3535

36-
if (fileTypeFilter.attributes) {
36+
if (limitedTo.attributes) {
3737
relativeOffsets.push(
38-
...findOutputsOnElementWithAttr(template.content, name.replace, fileTypeFilter.attributes));
38+
...findOutputsOnElementWithAttr(template.content, name.replace, limitedTo.attributes));
3939
}
4040

41-
if (fileTypeFilter.elements) {
41+
if (limitedTo.elements) {
4242
relativeOffsets.push(
43-
...findOutputsOnElementWithTag(template.content, name.replace, fileTypeFilter.elements));
43+
...findOutputsOnElementWithTag(template.content, name.replace, limitedTo.elements));
4444
}
4545

4646
relativeOffsets.map(offset => template.start + offset)

‎src/cdk/schematics/ng-update/migrations/property-names.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class PropertyNamesMigration extends Migration<UpgradeData> {
3838
return;
3939
}
4040

41-
if (!data.fileTypeFilter || data.fileTypeFilter.classes.includes(typeName)) {
41+
if (!data.limitedTo || data.limitedTo.classes.includes(typeName)) {
4242
this.fileSystem.edit(this.fileSystem.resolve(node.getSourceFile().fileName))
4343
.remove(node.name.getStart(), node.name.getWidth())
4444
.insertRight(node.name.getStart(), data.replaceWith);

‎src/material/schematics/ng-update/data/css-selectors.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ export interface MaterialCssSelectorData {
1717
* Controls which file types in which this replacement is made. If omitted, it is made in all
1818
* files.
1919
*/
20-
fileTypeFilter?: {
20+
replaceIn?: {
2121
/** Replace this name in stylesheet files. */
2222
stylesheet?: boolean,
2323
/** Replace this name in HTML files. */
2424
html?: boolean,
2525
/** Replace this name in TypeScript strings. */
26-
strings?: boolean
26+
tsStringLiterals?: boolean
2727
};
2828
}
2929

@@ -57,7 +57,7 @@ export const cssSelectors: VersionChanges<MaterialCssSelectorData> = {
5757
changes: [{
5858
replace: '$mat-font-family',
5959
replaceWith: 'Roboto, \'Helvetica Neue\', sans-serif',
60-
fileTypeFilter: {stylesheet: true}
60+
replaceIn: {stylesheet: true}
6161
}]
6262
}
6363
]

0 commit comments

Comments
 (0)