@angular/cdk 12.0.0 → 12.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/a11y/_index.scss +9 -7
- package/a11y/focus-trap/focus-trap.d.ts +6 -2
- package/a11y/index.metadata.json +1 -1
- package/bundles/cdk-a11y.umd.js +7 -8
- package/bundles/cdk-a11y.umd.js.map +1 -1
- package/bundles/cdk-platform.umd.js +19 -0
- package/bundles/cdk-platform.umd.js.map +1 -1
- package/bundles/cdk-scrolling.umd.js +1 -0
- package/bundles/cdk-scrolling.umd.js.map +1 -1
- package/bundles/cdk-testing.umd.js +7 -0
- package/bundles/cdk-testing.umd.js.map +1 -1
- package/bundles/cdk.umd.js +1 -1
- package/bundles/cdk.umd.js.map +1 -1
- package/esm2015/a11y/focus-trap/focus-trap.js +9 -9
- package/esm2015/platform/features/shadow-dom.js +19 -1
- package/esm2015/scrolling/viewport-ruler.js +2 -1
- package/esm2015/testing/change-detection.js +8 -1
- package/esm2015/version.js +1 -1
- package/fesm2015/a11y.js +8 -9
- package/fesm2015/a11y.js.map +1 -1
- package/fesm2015/cdk.js +1 -1
- package/fesm2015/cdk.js.map +1 -1
- package/fesm2015/platform.js +19 -1
- package/fesm2015/platform.js.map +1 -1
- package/fesm2015/scrolling.js +1 -0
- package/fesm2015/scrolling.js.map +1 -1
- package/fesm2015/testing.js +7 -0
- package/fesm2015/testing.js.map +1 -1
- package/overlay/_index.scss +1 -1
- package/package.json +1 -1
- package/platform/features/shadow-dom.d.ts +5 -0
- package/platform/index.metadata.json +1 -1
- package/schematics/index.mjs +33 -0
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-add/index.mjs +39 -0
- package/schematics/ng-add/package-config.mjs +47 -0
- package/schematics/ng-add/schema.mjs +10 -0
- package/schematics/ng-generate/drag-drop/index.mjs +39 -0
- package/schematics/ng-generate/drag-drop/schema.mjs +10 -0
- package/schematics/ng-update/data/attribute-selectors.mjs +21 -0
- package/schematics/ng-update/data/class-names.mjs +40 -0
- package/schematics/ng-update/data/constructor-checks.mjs +66 -0
- package/schematics/ng-update/data/css-selectors.mjs +15 -0
- package/schematics/ng-update/data/element-selectors.mjs +15 -0
- package/schematics/ng-update/data/index.mjs +29 -0
- package/schematics/ng-update/data/input-names.mjs +81 -0
- package/schematics/ng-update/data/method-call-checks.mjs +43 -0
- package/schematics/ng-update/data/output-names.mjs +27 -0
- package/schematics/ng-update/data/property-names.mjs +129 -0
- package/schematics/ng-update/devkit-file-system.mjs +81 -0
- package/schematics/ng-update/devkit-migration-rule.mjs +136 -0
- package/schematics/ng-update/devkit-migration.mjs +20 -0
- package/schematics/ng-update/find-stylesheets.mjs +42 -0
- package/schematics/ng-update/html-parsing/angular.mjs +52 -0
- package/schematics/ng-update/html-parsing/elements.mjs +62 -0
- package/schematics/ng-update/index.mjs +59 -0
- package/schematics/ng-update/migrations/attribute-selectors.mjs +67 -0
- package/schematics/ng-update/migrations/class-inheritance.mjs +58 -0
- package/schematics/ng-update/migrations/class-names.mjs +90 -0
- package/schematics/ng-update/migrations/constructor-signature.js +4 -3
- package/schematics/ng-update/migrations/constructor-signature.mjs +136 -0
- package/schematics/ng-update/migrations/css-selectors.mjs +74 -0
- package/schematics/ng-update/migrations/element-selectors.mjs +65 -0
- package/schematics/ng-update/migrations/input-names.mjs +60 -0
- package/schematics/ng-update/migrations/method-call-arguments.mjs +61 -0
- package/schematics/ng-update/migrations/misc-template.mjs +38 -0
- package/schematics/ng-update/migrations/output-names.mjs +47 -0
- package/schematics/ng-update/migrations/property-names.mjs +59 -0
- package/schematics/ng-update/public-api.mjs +30 -0
- package/schematics/ng-update/typescript/base-types.mjs +24 -0
- package/schematics/ng-update/typescript/imports.mjs +54 -0
- package/schematics/ng-update/typescript/literal.mjs +33 -0
- package/schematics/ng-update/typescript/module-specifiers.mjs +35 -0
- package/schematics/ng-update/upgrade-data.mjs +35 -0
- package/schematics/paths.mjs +16 -0
- package/schematics/schematics.externs.js +0 -0
- package/schematics/update-tool/component-resource-collector.mjs +147 -0
- package/schematics/update-tool/file-system.mjs +18 -0
- package/schematics/update-tool/index.mjs +158 -0
- package/schematics/update-tool/logger.mjs +18 -0
- package/schematics/update-tool/migration.mjs +67 -0
- package/schematics/update-tool/public-api.mjs +28 -0
- package/schematics/update-tool/target-version.mjs +34 -0
- package/schematics/update-tool/update-recorder.mjs +10 -0
- package/schematics/update-tool/update-tool.externs.js +0 -0
- package/schematics/update-tool/utils/decorators.mjs +38 -0
- package/schematics/update-tool/utils/functions.mjs +21 -0
- package/schematics/update-tool/utils/imports.mjs +111 -0
- package/schematics/update-tool/utils/line-mappings.mjs +76 -0
- package/schematics/update-tool/utils/parse-tsconfig.mjs +19 -0
- package/schematics/update-tool/utils/property-name.mjs +28 -0
- package/schematics/update-tool/utils/virtual-host.mjs +62 -0
- package/schematics/update-tool/version-changes.mjs +39 -0
- package/schematics/utils/ast/ng-module-imports.mjs +81 -0
- package/schematics/utils/ast.mjs +79 -0
- package/schematics/utils/build-component.mjs +193 -0
- package/schematics/utils/get-project.mjs +24 -0
- package/schematics/utils/html-manipulation.mjs +89 -0
- package/schematics/utils/index.mjs +31 -0
- package/schematics/utils/parse5-element.mjs +32 -0
- package/schematics/utils/project-index-file.mjs +21 -0
- package/schematics/utils/project-main-file.mjs +23 -0
- package/schematics/utils/project-style-file.mjs +44 -0
- package/schematics/utils/project-targets.mjs +34 -0
- package/schematics/utils/project-tsconfig-paths.mjs +50 -0
- package/schematics/utils/schematic-options.mjs +55 -0
- package/schematics/utils/vendored-ast-utils/index.mjs +480 -0
- package/scrolling/viewport-ruler.d.ts +1 -0
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.ClassInheritanceMigration = void 0;
|
|
11
|
+
const ts = require("typescript");
|
|
12
|
+
const migration_1 = require("../../update-tool/migration");
|
|
13
|
+
const base_types_1 = require("../typescript/base-types");
|
|
14
|
+
const upgrade_data_1 = require("../upgrade-data");
|
|
15
|
+
/**
|
|
16
|
+
* Migration that identifies class declarations that extend CDK or Material classes
|
|
17
|
+
* which had a public property change.
|
|
18
|
+
*/
|
|
19
|
+
class ClassInheritanceMigration extends migration_1.Migration {
|
|
20
|
+
constructor() {
|
|
21
|
+
super(...arguments);
|
|
22
|
+
/**
|
|
23
|
+
* Map of classes that have been updated. Each class name maps to the according property
|
|
24
|
+
* change data.
|
|
25
|
+
*/
|
|
26
|
+
this.propertyNames = new Map();
|
|
27
|
+
// Only enable the migration rule if there is upgrade data.
|
|
28
|
+
this.enabled = this.propertyNames.size !== 0;
|
|
29
|
+
}
|
|
30
|
+
init() {
|
|
31
|
+
upgrade_data_1.getVersionUpgradeData(this, 'propertyNames')
|
|
32
|
+
.filter(data => data.limitedTo && data.limitedTo.classes)
|
|
33
|
+
.forEach(data => data.limitedTo.classes.forEach(name => this.propertyNames.set(name, data)));
|
|
34
|
+
}
|
|
35
|
+
visitNode(node) {
|
|
36
|
+
if (ts.isClassDeclaration(node)) {
|
|
37
|
+
this._visitClassDeclaration(node);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
_visitClassDeclaration(node) {
|
|
41
|
+
const baseTypes = base_types_1.determineBaseTypes(node);
|
|
42
|
+
const className = node.name ? node.name.text : '{unknown-name}';
|
|
43
|
+
if (!baseTypes) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
baseTypes.forEach(typeName => {
|
|
47
|
+
const data = this.propertyNames.get(typeName);
|
|
48
|
+
if (data) {
|
|
49
|
+
this.createFailureAtNode(node, `Found class "${className}" which extends class ` +
|
|
50
|
+
`"${typeName}". Please note that the base class property ` +
|
|
51
|
+
`"${data.replace}" has changed to "${data.replaceWith}". ` +
|
|
52
|
+
`You may need to update your class as well.`);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
exports.ClassInheritanceMigration = ClassInheritanceMigration;
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3MtaW5oZXJpdGFuY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvY2RrL3NjaGVtYXRpY3MvbmctdXBkYXRlL21pZ3JhdGlvbnMvY2xhc3MtaW5oZXJpdGFuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7R0FNRzs7O0FBRUgsaUNBQWlDO0FBQ2pDLDJEQUFzRDtBQUV0RCx5REFBNEQ7QUFDNUQsa0RBQW1FO0FBRW5FOzs7R0FHRztBQUNILE1BQWEseUJBQTBCLFNBQVEscUJBQXNCO0lBQXJFOztRQUNFOzs7V0FHRztRQUNILGtCQUFhLEdBQUcsSUFBSSxHQUFHLEVBQW1DLENBQUM7UUFFM0QsMkRBQTJEO1FBQzNELFlBQU8sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksS0FBSyxDQUFDLENBQUM7SUFvQzFDLENBQUM7SUFsQ0MsSUFBSTtRQUNGLG9DQUFxQixDQUFDLElBQUksRUFBRSxlQUFlLENBQUM7YUFDdkMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQzthQUN4RCxPQUFPLENBQ0osSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxTQUFTLENBQUMsSUFBYTtRQUNyQixJQUFJLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMvQixJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbkM7SUFDSCxDQUFDO0lBRU8sc0JBQXNCLENBQUMsSUFBeUI7UUFDdEQsTUFBTSxTQUFTLEdBQUcsK0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDO1FBRWhFLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDZCxPQUFPO1NBQ1I7UUFFRCxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQzNCLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRTlDLElBQUksSUFBSSxFQUFFO2dCQUNSLElBQUksQ0FBQyxtQkFBbUIsQ0FDcEIsSUFBSSxFQUNKLGdCQUFnQixTQUFTLHdCQUF3QjtvQkFDN0MsSUFBSSxRQUFRLDhDQUE4QztvQkFDMUQsSUFBSSxJQUFJLENBQUMsT0FBTyxxQkFBcUIsSUFBSSxDQUFDLFdBQVcsS0FBSztvQkFDMUQsNENBQTRDLENBQUMsQ0FBQzthQUN2RDtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBNUNELDhEQTRDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7TWlncmF0aW9ufSBmcm9tICcuLi8uLi91cGRhdGUtdG9vbC9taWdyYXRpb24nO1xuaW1wb3J0IHtQcm9wZXJ0eU5hbWVVcGdyYWRlRGF0YX0gZnJvbSAnLi4vZGF0YS9wcm9wZXJ0eS1uYW1lcyc7XG5pbXBvcnQge2RldGVybWluZUJhc2VUeXBlc30gZnJvbSAnLi4vdHlwZXNjcmlwdC9iYXNlLXR5cGVzJztcbmltcG9ydCB7Z2V0VmVyc2lvblVwZ3JhZGVEYXRhLCBVcGdyYWRlRGF0YX0gZnJvbSAnLi4vdXBncmFkZS1kYXRhJztcblxuLyoqXG4gKiBNaWdyYXRpb24gdGhhdCBpZGVudGlmaWVzIGNsYXNzIGRlY2xhcmF0aW9ucyB0aGF0IGV4dGVuZCBDREsgb3IgTWF0ZXJpYWwgY2xhc3Nlc1xuICogd2hpY2ggaGFkIGEgcHVibGljIHByb3BlcnR5IGNoYW5nZS5cbiAqL1xuZXhwb3J0IGNsYXNzIENsYXNzSW5oZXJpdGFuY2VNaWdyYXRpb24gZXh0ZW5kcyBNaWdyYXRpb248VXBncmFkZURhdGE+IHtcbiAgLyoqXG4gICAqIE1hcCBvZiBjbGFzc2VzIHRoYXQgaGF2ZSBiZWVuIHVwZGF0ZWQuIEVhY2ggY2xhc3MgbmFtZSBtYXBzIHRvIHRoZSBhY2NvcmRpbmcgcHJvcGVydHlcbiAgICogY2hhbmdlIGRhdGEuXG4gICAqL1xuICBwcm9wZXJ0eU5hbWVzID0gbmV3IE1hcDxzdHJpbmcsIFByb3BlcnR5TmFtZVVwZ3JhZGVEYXRhPigpO1xuXG4gIC8vIE9ubHkgZW5hYmxlIHRoZSBtaWdyYXRpb24gcnVsZSBpZiB0aGVyZSBpcyB1cGdyYWRlIGRhdGEuXG4gIGVuYWJsZWQgPSB0aGlzLnByb3BlcnR5TmFtZXMuc2l6ZSAhPT0gMDtcblxuICBpbml0KCk6IHZvaWQge1xuICAgIGdldFZlcnNpb25VcGdyYWRlRGF0YSh0aGlzLCAncHJvcGVydHlOYW1lcycpXG4gICAgICAgIC5maWx0ZXIoZGF0YSA9PiBkYXRhLmxpbWl0ZWRUbyAmJiBkYXRhLmxpbWl0ZWRUby5jbGFzc2VzKVxuICAgICAgICAuZm9yRWFjaChcbiAgICAgICAgICAgIGRhdGEgPT4gZGF0YS5saW1pdGVkVG8uY2xhc3Nlcy5mb3JFYWNoKG5hbWUgPT4gdGhpcy5wcm9wZXJ0eU5hbWVzLnNldChuYW1lLCBkYXRhKSkpO1xuICB9XG5cbiAgdmlzaXROb2RlKG5vZGU6IHRzLk5vZGUpOiB2b2lkIHtcbiAgICBpZiAodHMuaXNDbGFzc0RlY2xhcmF0aW9uKG5vZGUpKSB7XG4gICAgICB0aGlzLl92aXNpdENsYXNzRGVjbGFyYXRpb24obm9kZSk7XG4gICAgfVxuICB9XG5cbiAgcHJpdmF0ZSBfdmlzaXRDbGFzc0RlY2xhcmF0aW9uKG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb24pIHtcbiAgICBjb25zdCBiYXNlVHlwZXMgPSBkZXRlcm1pbmVCYXNlVHlwZXMobm9kZSk7XG4gICAgY29uc3QgY2xhc3NOYW1lID0gbm9kZS5uYW1lID8gbm9kZS5uYW1lLnRleHQgOiAne3Vua25vd24tbmFtZX0nO1xuXG4gICAgaWYgKCFiYXNlVHlwZXMpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBiYXNlVHlwZXMuZm9yRWFjaCh0eXBlTmFtZSA9PiB7XG4gICAgICBjb25zdCBkYXRhID0gdGhpcy5wcm9wZXJ0eU5hbWVzLmdldCh0eXBlTmFtZSk7XG5cbiAgICAgIGlmIChkYXRhKSB7XG4gICAgICAgIHRoaXMuY3JlYXRlRmFpbHVyZUF0Tm9kZShcbiAgICAgICAgICAgIG5vZGUsXG4gICAgICAgICAgICBgRm91bmQgY2xhc3MgXCIke2NsYXNzTmFtZX1cIiB3aGljaCBleHRlbmRzIGNsYXNzIGAgK1xuICAgICAgICAgICAgICAgIGBcIiR7dHlwZU5hbWV9XCIuIFBsZWFzZSBub3RlIHRoYXQgdGhlIGJhc2UgY2xhc3MgcHJvcGVydHkgYCArXG4gICAgICAgICAgICAgICAgYFwiJHtkYXRhLnJlcGxhY2V9XCIgaGFzIGNoYW5nZWQgdG8gXCIke2RhdGEucmVwbGFjZVdpdGh9XCIuIGAgK1xuICAgICAgICAgICAgICAgIGBZb3UgbWF5IG5lZWQgdG8gdXBkYXRlIHlvdXIgY2xhc3MgYXMgd2VsbC5gKTtcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.ClassNamesMigration = void 0;
|
|
11
|
+
const ts = require("typescript");
|
|
12
|
+
const migration_1 = require("../../update-tool/migration");
|
|
13
|
+
const imports_1 = require("../typescript/imports");
|
|
14
|
+
const module_specifiers_1 = require("../typescript/module-specifiers");
|
|
15
|
+
const upgrade_data_1 = require("../upgrade-data");
|
|
16
|
+
/**
|
|
17
|
+
* Migration that walks through every identifier that is part of Angular Material or thr CDK
|
|
18
|
+
* and replaces the outdated name with the new one if specified in the upgrade data.
|
|
19
|
+
*/
|
|
20
|
+
// TODO: rework this rule to identify symbols using the import identifier resolver. This
|
|
21
|
+
// makes it more robust, less AST convoluted and is more TypeScript AST idiomatic. COMP-300.
|
|
22
|
+
class ClassNamesMigration extends migration_1.Migration {
|
|
23
|
+
constructor() {
|
|
24
|
+
super(...arguments);
|
|
25
|
+
/** Change data that upgrades to the specified target version. */
|
|
26
|
+
this.data = upgrade_data_1.getVersionUpgradeData(this, 'classNames');
|
|
27
|
+
/**
|
|
28
|
+
* List of identifier names that have been imported from `@angular/material` or `@angular/cdk`
|
|
29
|
+
* in the current source file and therefore can be considered trusted.
|
|
30
|
+
*/
|
|
31
|
+
this.trustedIdentifiers = new Set();
|
|
32
|
+
/** List of namespaces that have been imported from `@angular/material` or `@angular/cdk`. */
|
|
33
|
+
this.trustedNamespaces = new Set();
|
|
34
|
+
// Only enable the migration rule if there is upgrade data.
|
|
35
|
+
this.enabled = this.data.length !== 0;
|
|
36
|
+
}
|
|
37
|
+
visitNode(node) {
|
|
38
|
+
if (ts.isIdentifier(node)) {
|
|
39
|
+
this._visitIdentifier(node);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/** Method that is called for every identifier inside of the specified project. */
|
|
43
|
+
_visitIdentifier(identifier) {
|
|
44
|
+
// For identifiers that aren't listed in the className data, the whole check can be
|
|
45
|
+
// skipped safely.
|
|
46
|
+
if (!this.data.some(data => data.replace === identifier.text)) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
// For namespace imports that are referring to Angular Material or the CDK, we store the
|
|
50
|
+
// namespace name in order to be able to safely find identifiers that don't belong to the
|
|
51
|
+
// developer's application.
|
|
52
|
+
if (imports_1.isNamespaceImportNode(identifier) && module_specifiers_1.isMaterialImportDeclaration(identifier)) {
|
|
53
|
+
this.trustedNamespaces.add(identifier.text);
|
|
54
|
+
return this._createFailureWithReplacement(identifier);
|
|
55
|
+
}
|
|
56
|
+
// For export declarations that are referring to Angular Material or the CDK, the identifier
|
|
57
|
+
// can be immediately updated to the new name.
|
|
58
|
+
if (imports_1.isExportSpecifierNode(identifier) && module_specifiers_1.isMaterialExportDeclaration(identifier)) {
|
|
59
|
+
return this._createFailureWithReplacement(identifier);
|
|
60
|
+
}
|
|
61
|
+
// For import declarations that are referring to Angular Material or the CDK, the name of
|
|
62
|
+
// the import identifiers. This allows us to identify identifiers that belong to Material and
|
|
63
|
+
// the CDK, and we won't accidentally touch a developer's identifier.
|
|
64
|
+
if (imports_1.isImportSpecifierNode(identifier) && module_specifiers_1.isMaterialImportDeclaration(identifier)) {
|
|
65
|
+
this.trustedIdentifiers.add(identifier.text);
|
|
66
|
+
return this._createFailureWithReplacement(identifier);
|
|
67
|
+
}
|
|
68
|
+
// In case the identifier is part of a property access expression, we need to verify that the
|
|
69
|
+
// property access originates from a namespace that has been imported from Material or the CDK.
|
|
70
|
+
if (ts.isPropertyAccessExpression(identifier.parent)) {
|
|
71
|
+
const expression = identifier.parent.expression;
|
|
72
|
+
if (ts.isIdentifier(expression) && this.trustedNamespaces.has(expression.text)) {
|
|
73
|
+
return this._createFailureWithReplacement(identifier);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (this.trustedIdentifiers.has(identifier.text)) {
|
|
77
|
+
return this._createFailureWithReplacement(identifier);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
/** Creates a failure and replacement for the specified identifier. */
|
|
81
|
+
_createFailureWithReplacement(identifier) {
|
|
82
|
+
const classData = this.data.find(data => data.replace === identifier.text);
|
|
83
|
+
const filePath = this.fileSystem.resolve(identifier.getSourceFile().fileName);
|
|
84
|
+
this.fileSystem.edit(filePath)
|
|
85
|
+
.remove(identifier.getStart(), identifier.getWidth())
|
|
86
|
+
.insertRight(identifier.getStart(), classData.replaceWith);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
exports.ClassNamesMigration = ClassNamesMigration;
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"class-names.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/ng-update/migrations/class-names.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\nimport {Migration} from '../../update-tool/migration';\n\nimport {ClassNameUpgradeData} from '../data';\nimport {\n  isExportSpecifierNode,\n  isImportSpecifierNode,\n  isNamespaceImportNode,\n} from '../typescript/imports';\nimport {\n  isMaterialExportDeclaration,\n  isMaterialImportDeclaration,\n} from '../typescript/module-specifiers';\nimport {getVersionUpgradeData, UpgradeData} from '../upgrade-data';\n\n/**\n * Migration that walks through every identifier that is part of Angular Material or thr CDK\n * and replaces the outdated name with the new one if specified in the upgrade data.\n */\n// TODO: rework this rule to identify symbols using the import identifier resolver. This\n// makes it more robust, less AST convoluted and is more TypeScript AST idiomatic. COMP-300.\nexport class ClassNamesMigration extends Migration<UpgradeData> {\n  /** Change data that upgrades to the specified target version. */\n  data: ClassNameUpgradeData[] = getVersionUpgradeData(this, 'classNames');\n\n  /**\n   * List of identifier names that have been imported from `@angular/material` or `@angular/cdk`\n   * in the current source file and therefore can be considered trusted.\n   */\n  trustedIdentifiers: Set<string> = new Set();\n\n  /** List of namespaces that have been imported from `@angular/material` or `@angular/cdk`. */\n  trustedNamespaces: Set<string> = new Set();\n\n  // Only enable the migration rule if there is upgrade data.\n  enabled = this.data.length !== 0;\n\n  visitNode(node: ts.Node): void {\n    if (ts.isIdentifier(node)) {\n      this._visitIdentifier(node);\n    }\n  }\n\n  /** Method that is called for every identifier inside of the specified project. */\n  private _visitIdentifier(identifier: ts.Identifier) {\n    // For identifiers that aren't listed in the className data, the whole check can be\n    // skipped safely.\n    if (!this.data.some(data => data.replace === identifier.text)) {\n      return;\n    }\n\n    // For namespace imports that are referring to Angular Material or the CDK, we store the\n    // namespace name in order to be able to safely find identifiers that don't belong to the\n    // developer's application.\n    if (isNamespaceImportNode(identifier) && isMaterialImportDeclaration(identifier)) {\n      this.trustedNamespaces.add(identifier.text);\n\n      return this._createFailureWithReplacement(identifier);\n    }\n\n    // For export declarations that are referring to Angular Material or the CDK, the identifier\n    // can be immediately updated to the new name.\n    if (isExportSpecifierNode(identifier) && isMaterialExportDeclaration(identifier)) {\n      return this._createFailureWithReplacement(identifier);\n    }\n\n    // For import declarations that are referring to Angular Material or the CDK, the name of\n    // the import identifiers. This allows us to identify identifiers that belong to Material and\n    // the CDK, and we won't accidentally touch a developer's identifier.\n    if (isImportSpecifierNode(identifier) && isMaterialImportDeclaration(identifier)) {\n      this.trustedIdentifiers.add(identifier.text);\n\n      return this._createFailureWithReplacement(identifier);\n    }\n\n    // In case the identifier is part of a property access expression, we need to verify that the\n    // property access originates from a namespace that has been imported from Material or the CDK.\n    if (ts.isPropertyAccessExpression(identifier.parent)) {\n      const expression = identifier.parent.expression;\n\n      if (ts.isIdentifier(expression) && this.trustedNamespaces.has(expression.text)) {\n        return this._createFailureWithReplacement(identifier);\n      }\n    } else if (this.trustedIdentifiers.has(identifier.text)) {\n      return this._createFailureWithReplacement(identifier);\n    }\n  }\n\n  /** Creates a failure and replacement for the specified identifier. */\n  private _createFailureWithReplacement(identifier: ts.Identifier) {\n    const classData = this.data.find(data => data.replace === identifier.text)!;\n    const filePath = this.fileSystem.resolve(identifier.getSourceFile().fileName);\n\n    this.fileSystem.edit(filePath)\n      .remove(identifier.getStart(), identifier.getWidth())\n      .insertRight(identifier.getStart(), classData.replaceWith);\n  }\n}\n"]}
|
|
@@ -83,7 +83,8 @@ class ConstructorSignatureMigration extends migration_1.Migration {
|
|
|
83
83
|
}
|
|
84
84
|
const classSignatures = classType.getConstructSignatures().map(signature => getParameterTypesFromSignature(signature, this.typeChecker));
|
|
85
85
|
const expressionName = isNewExpression ? `new ${className}` : 'super';
|
|
86
|
-
const signatures = classSignatures
|
|
86
|
+
const signatures = classSignatures
|
|
87
|
+
.map(signature => signature.map(t => t === null ? 'any' : this.typeChecker.typeToString(t)))
|
|
87
88
|
.map(signature => `${expressionName}(${signature.join(', ')})`)
|
|
88
89
|
.join(' or ');
|
|
89
90
|
this.createFailureAtNode(node, `Found "${className}" constructed with ` +
|
|
@@ -95,7 +96,7 @@ class ConstructorSignatureMigration extends migration_1.Migration {
|
|
|
95
96
|
exports.ConstructorSignatureMigration = ConstructorSignatureMigration;
|
|
96
97
|
/** Resolves the type for each parameter in the specified signature. */
|
|
97
98
|
function getParameterTypesFromSignature(signature, typeChecker) {
|
|
98
|
-
return signature.getParameters().map(param => typeChecker.getTypeAtLocation(param.declarations[0]));
|
|
99
|
+
return signature.getParameters().map(param => param.declarations ? typeChecker.getTypeAtLocation(param.declarations[0]) : null);
|
|
99
100
|
}
|
|
100
101
|
/**
|
|
101
102
|
* Walks through each node of a source file in order to find a new-expression node or super-call
|
|
@@ -132,4 +133,4 @@ function getClassDeclarationOfSignature(signature) {
|
|
|
132
133
|
}
|
|
133
134
|
return null;
|
|
134
135
|
}
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"constructor-signature.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/ng-update/migrations/constructor-signature.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\nimport {Migration} from '../../update-tool/migration';\nimport {getAllChanges} from '../../update-tool/version-changes';\nimport {UpgradeData} from '../upgrade-data';\n\n/**\n * List of diagnostic codes that refer to pre-emit diagnostics which indicate invalid\n * new expression or super call signatures. See the list of diagnostics here:\n *\n * https://github.com/Microsoft/TypeScript/blob/master/src/compiler/diagnosticMessages.json\n */\nconst signatureErrorDiagnostics = [\n  // Type not assignable error diagnostic.\n  2345,\n  // Constructor argument length invalid diagnostics\n  2554,\n  2555,\n  2556,\n  2557,\n];\n\n/**\n * Migration that visits every TypeScript new expression or super call and checks if\n * the parameter type signature is invalid and needs to be updated manually.\n */\nexport class ConstructorSignatureMigration extends Migration<UpgradeData> {\n  // Note that the data for this rule is not distinguished based on the target version because\n  // we don't keep track of the new signature and don't want to update incrementally.\n  // See: https://github.com/angular/components/pull/12970#issuecomment-418337566\n  data = getAllChanges(this.upgradeData.constructorChecks);\n\n  // Only enable the migration rule if there is upgrade data.\n  enabled = this.data.length !== 0;\n\n  visitNode(node: ts.Node): void {\n    if (ts.isSourceFile(node)) {\n      this._visitSourceFile(node);\n    }\n  }\n\n  /**\n   * Method that will be called for each source file of the upgrade project. In order to\n   * properly determine invalid constructor signatures, we take advantage of the pre-emit\n   * diagnostics from TypeScript.\n   *\n   * By using the diagnostics, the migration can handle type assignability. Not using\n   * diagnostics would mean that we need to use simple type equality checking which is\n   * too strict. See related issue: https://github.com/Microsoft/TypeScript/issues/9879\n   */\n  private _visitSourceFile(sourceFile: ts.SourceFile) {\n    // List of classes of which the constructor signature has changed.\n    const diagnostics =\n        ts.getPreEmitDiagnostics(this.program, sourceFile)\n            .filter(diagnostic => signatureErrorDiagnostics.includes(diagnostic.code))\n            .filter(diagnostic => diagnostic.start !== undefined);\n\n    for (const diagnostic of diagnostics) {\n      const node = findConstructorNode(diagnostic, sourceFile);\n\n      if (!node) {\n        continue;\n      }\n\n      const classType = this.typeChecker.getTypeAtLocation(node.expression);\n      const className = classType.symbol && classType.symbol.name;\n      const isNewExpression = ts.isNewExpression(node);\n\n      // Determine the class names of the actual construct signatures because we cannot assume that\n      // the diagnostic refers to a constructor of the actual expression. In case the constructor\n      // is inherited, we need to detect that the owner-class of the constructor is added to the\n      // constructor checks upgrade data. e.g. `class CustomCalendar extends MatCalendar {}`.\n      const signatureClassNames =\n          classType.getConstructSignatures()\n              .map(signature => getClassDeclarationOfSignature(signature))\n              .map(declaration => declaration && declaration.name ? declaration.name.text : null)\n              .filter(Boolean);\n\n      // Besides checking the signature class names, we need to check the actual class name because\n      // there can be classes without an explicit constructor.\n      if (!this.data.includes(className) &&\n          !signatureClassNames.some(name => this.data.includes(name!))) {\n        continue;\n      }\n\n      const classSignatures = classType.getConstructSignatures().map(\n          signature => getParameterTypesFromSignature(signature, this.typeChecker));\n\n      const expressionName = isNewExpression ? `new ${className}` : 'super';\n      const signatures =\n          classSignatures.map(signature => signature.map(t => this.typeChecker.typeToString(t)))\n              .map(signature => `${expressionName}(${signature.join(', ')})`)\n              .join(' or ');\n\n      this.createFailureAtNode(\n          node,\n          `Found \"${className}\" constructed with ` +\n              `an invalid signature. Please manually update the ${expressionName} expression to ` +\n              `match the new signature${classSignatures.length > 1 ? 's' : ''}: ${signatures}`);\n    }\n  }\n}\n\n\n/** Resolves the type for each parameter in the specified signature. */\nfunction getParameterTypesFromSignature(\n    signature: ts.Signature, typeChecker: ts.TypeChecker): ts.Type[] {\n  return signature.getParameters().map(\n      param => typeChecker.getTypeAtLocation(param.declarations[0]));\n}\n\n/**\n * Walks through each node of a source file in order to find a new-expression node or super-call\n * expression node that is captured by the specified diagnostic.\n */\nfunction findConstructorNode(\n    diagnostic: ts.Diagnostic, sourceFile: ts.SourceFile): ts.CallExpression|ts.NewExpression|null {\n  let resolvedNode: ts.Node|null = null;\n\n  const _visitNode = (node: ts.Node) => {\n    // Check whether the current node contains the diagnostic. If the node contains the diagnostic,\n    // walk deeper in order to find all constructor expression nodes.\n    if (node.getStart() <= diagnostic.start! && node.getEnd() >= diagnostic.start!) {\n      if (ts.isNewExpression(node) ||\n          (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.SuperKeyword)) {\n        resolvedNode = node;\n      }\n\n      ts.forEachChild(node, _visitNode);\n    }\n  };\n\n  ts.forEachChild(sourceFile, _visitNode);\n\n  return resolvedNode;\n}\n\n/** Determines the class declaration of the specified construct signature. */\nfunction getClassDeclarationOfSignature(signature: ts.Signature): ts.ClassDeclaration|null {\n  let node: ts.Node = signature.getDeclaration();\n  // Handle signatures which don't have an actual declaration. This happens if a class\n  // does not have an explicitly written constructor.\n  if (!node) {\n    return null;\n  }\n  while (!ts.isSourceFile(node = node.parent)) {\n    if (ts.isClassDeclaration(node)) {\n      return node;\n    }\n  }\n  return null;\n}\n"]}
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"constructor-signature.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/ng-update/migrations/constructor-signature.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\nimport {Migration} from '../../update-tool/migration';\nimport {getAllChanges} from '../../update-tool/version-changes';\nimport {UpgradeData} from '../upgrade-data';\n\n/**\n * List of diagnostic codes that refer to pre-emit diagnostics which indicate invalid\n * new expression or super call signatures. See the list of diagnostics here:\n *\n * https://github.com/Microsoft/TypeScript/blob/master/src/compiler/diagnosticMessages.json\n */\nconst signatureErrorDiagnostics = [\n  // Type not assignable error diagnostic.\n  2345,\n  // Constructor argument length invalid diagnostics\n  2554,\n  2555,\n  2556,\n  2557,\n];\n\n/**\n * Migration that visits every TypeScript new expression or super call and checks if\n * the parameter type signature is invalid and needs to be updated manually.\n */\nexport class ConstructorSignatureMigration extends Migration<UpgradeData> {\n  // Note that the data for this rule is not distinguished based on the target version because\n  // we don't keep track of the new signature and don't want to update incrementally.\n  // See: https://github.com/angular/components/pull/12970#issuecomment-418337566\n  data = getAllChanges(this.upgradeData.constructorChecks);\n\n  // Only enable the migration rule if there is upgrade data.\n  enabled = this.data.length !== 0;\n\n  visitNode(node: ts.Node): void {\n    if (ts.isSourceFile(node)) {\n      this._visitSourceFile(node);\n    }\n  }\n\n  /**\n   * Method that will be called for each source file of the upgrade project. In order to\n   * properly determine invalid constructor signatures, we take advantage of the pre-emit\n   * diagnostics from TypeScript.\n   *\n   * By using the diagnostics, the migration can handle type assignability. Not using\n   * diagnostics would mean that we need to use simple type equality checking which is\n   * too strict. See related issue: https://github.com/Microsoft/TypeScript/issues/9879\n   */\n  private _visitSourceFile(sourceFile: ts.SourceFile) {\n    // List of classes of which the constructor signature has changed.\n    const diagnostics =\n        ts.getPreEmitDiagnostics(this.program, sourceFile)\n            .filter(diagnostic => signatureErrorDiagnostics.includes(diagnostic.code))\n            .filter(diagnostic => diagnostic.start !== undefined);\n\n    for (const diagnostic of diagnostics) {\n      const node = findConstructorNode(diagnostic, sourceFile);\n\n      if (!node) {\n        continue;\n      }\n\n      const classType = this.typeChecker.getTypeAtLocation(node.expression);\n      const className = classType.symbol && classType.symbol.name;\n      const isNewExpression = ts.isNewExpression(node);\n\n      // Determine the class names of the actual construct signatures because we cannot assume that\n      // the diagnostic refers to a constructor of the actual expression. In case the constructor\n      // is inherited, we need to detect that the owner-class of the constructor is added to the\n      // constructor checks upgrade data. e.g. `class CustomCalendar extends MatCalendar {}`.\n      const signatureClassNames =\n          classType.getConstructSignatures()\n              .map(signature => getClassDeclarationOfSignature(signature))\n              .map(declaration => declaration && declaration.name ? declaration.name.text : null)\n              .filter(Boolean);\n\n      // Besides checking the signature class names, we need to check the actual class name because\n      // there can be classes without an explicit constructor.\n      if (!this.data.includes(className) &&\n          !signatureClassNames.some(name => this.data.includes(name!))) {\n        continue;\n      }\n\n      const classSignatures = classType.getConstructSignatures().map(\n          signature => getParameterTypesFromSignature(signature, this.typeChecker));\n\n      const expressionName = isNewExpression ? `new ${className}` : 'super';\n      const signatures = classSignatures\n          .map(signature =>\n              signature.map(t => t === null ? 'any' : this.typeChecker.typeToString(t)))\n          .map(signature => `${expressionName}(${signature.join(', ')})`)\n          .join(' or ');\n\n      this.createFailureAtNode(\n          node,\n          `Found \"${className}\" constructed with ` +\n              `an invalid signature. Please manually update the ${expressionName} expression to ` +\n              `match the new signature${classSignatures.length > 1 ? 's' : ''}: ${signatures}`);\n    }\n  }\n}\n\n\n/** Resolves the type for each parameter in the specified signature. */\nfunction getParameterTypesFromSignature(\n    signature: ts.Signature, typeChecker: ts.TypeChecker): (ts.Type|null)[] {\n  return signature.getParameters().map(\n      param => param.declarations ? typeChecker.getTypeAtLocation(param.declarations[0]) : null);\n}\n\n/**\n * Walks through each node of a source file in order to find a new-expression node or super-call\n * expression node that is captured by the specified diagnostic.\n */\nfunction findConstructorNode(\n    diagnostic: ts.Diagnostic, sourceFile: ts.SourceFile): ts.CallExpression|ts.NewExpression|null {\n  let resolvedNode: ts.Node|null = null;\n\n  const _visitNode = (node: ts.Node) => {\n    // Check whether the current node contains the diagnostic. If the node contains the diagnostic,\n    // walk deeper in order to find all constructor expression nodes.\n    if (node.getStart() <= diagnostic.start! && node.getEnd() >= diagnostic.start!) {\n      if (ts.isNewExpression(node) ||\n          (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.SuperKeyword)) {\n        resolvedNode = node;\n      }\n\n      ts.forEachChild(node, _visitNode);\n    }\n  };\n\n  ts.forEachChild(sourceFile, _visitNode);\n\n  return resolvedNode;\n}\n\n/** Determines the class declaration of the specified construct signature. */\nfunction getClassDeclarationOfSignature(signature: ts.Signature): ts.ClassDeclaration|null {\n  let node: ts.Node = signature.getDeclaration();\n  // Handle signatures which don't have an actual declaration. This happens if a class\n  // does not have an explicitly written constructor.\n  if (!node) {\n    return null;\n  }\n  while (!ts.isSourceFile(node = node.parent)) {\n    if (ts.isClassDeclaration(node)) {\n      return node;\n    }\n  }\n  return null;\n}\n"]}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.ConstructorSignatureMigration = void 0;
|
|
11
|
+
const ts = require("typescript");
|
|
12
|
+
const migration_1 = require("../../update-tool/migration");
|
|
13
|
+
const version_changes_1 = require("../../update-tool/version-changes");
|
|
14
|
+
/**
|
|
15
|
+
* List of diagnostic codes that refer to pre-emit diagnostics which indicate invalid
|
|
16
|
+
* new expression or super call signatures. See the list of diagnostics here:
|
|
17
|
+
*
|
|
18
|
+
* https://github.com/Microsoft/TypeScript/blob/master/src/compiler/diagnosticMessages.json
|
|
19
|
+
*/
|
|
20
|
+
const signatureErrorDiagnostics = [
|
|
21
|
+
// Type not assignable error diagnostic.
|
|
22
|
+
2345,
|
|
23
|
+
// Constructor argument length invalid diagnostics
|
|
24
|
+
2554,
|
|
25
|
+
2555,
|
|
26
|
+
2556,
|
|
27
|
+
2557,
|
|
28
|
+
];
|
|
29
|
+
/**
|
|
30
|
+
* Migration that visits every TypeScript new expression or super call and checks if
|
|
31
|
+
* the parameter type signature is invalid and needs to be updated manually.
|
|
32
|
+
*/
|
|
33
|
+
class ConstructorSignatureMigration extends migration_1.Migration {
|
|
34
|
+
constructor() {
|
|
35
|
+
super(...arguments);
|
|
36
|
+
// Note that the data for this rule is not distinguished based on the target version because
|
|
37
|
+
// we don't keep track of the new signature and don't want to update incrementally.
|
|
38
|
+
// See: https://github.com/angular/components/pull/12970#issuecomment-418337566
|
|
39
|
+
this.data = version_changes_1.getAllChanges(this.upgradeData.constructorChecks);
|
|
40
|
+
// Only enable the migration rule if there is upgrade data.
|
|
41
|
+
this.enabled = this.data.length !== 0;
|
|
42
|
+
}
|
|
43
|
+
visitNode(node) {
|
|
44
|
+
if (ts.isSourceFile(node)) {
|
|
45
|
+
this._visitSourceFile(node);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Method that will be called for each source file of the upgrade project. In order to
|
|
50
|
+
* properly determine invalid constructor signatures, we take advantage of the pre-emit
|
|
51
|
+
* diagnostics from TypeScript.
|
|
52
|
+
*
|
|
53
|
+
* By using the diagnostics, the migration can handle type assignability. Not using
|
|
54
|
+
* diagnostics would mean that we need to use simple type equality checking which is
|
|
55
|
+
* too strict. See related issue: https://github.com/Microsoft/TypeScript/issues/9879
|
|
56
|
+
*/
|
|
57
|
+
_visitSourceFile(sourceFile) {
|
|
58
|
+
// List of classes of which the constructor signature has changed.
|
|
59
|
+
const diagnostics = ts.getPreEmitDiagnostics(this.program, sourceFile)
|
|
60
|
+
.filter(diagnostic => signatureErrorDiagnostics.includes(diagnostic.code))
|
|
61
|
+
.filter(diagnostic => diagnostic.start !== undefined);
|
|
62
|
+
for (const diagnostic of diagnostics) {
|
|
63
|
+
const node = findConstructorNode(diagnostic, sourceFile);
|
|
64
|
+
if (!node) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
const classType = this.typeChecker.getTypeAtLocation(node.expression);
|
|
68
|
+
const className = classType.symbol && classType.symbol.name;
|
|
69
|
+
const isNewExpression = ts.isNewExpression(node);
|
|
70
|
+
// Determine the class names of the actual construct signatures because we cannot assume that
|
|
71
|
+
// the diagnostic refers to a constructor of the actual expression. In case the constructor
|
|
72
|
+
// is inherited, we need to detect that the owner-class of the constructor is added to the
|
|
73
|
+
// constructor checks upgrade data. e.g. `class CustomCalendar extends MatCalendar {}`.
|
|
74
|
+
const signatureClassNames = classType.getConstructSignatures()
|
|
75
|
+
.map(signature => getClassDeclarationOfSignature(signature))
|
|
76
|
+
.map(declaration => declaration && declaration.name ? declaration.name.text : null)
|
|
77
|
+
.filter(Boolean);
|
|
78
|
+
// Besides checking the signature class names, we need to check the actual class name because
|
|
79
|
+
// there can be classes without an explicit constructor.
|
|
80
|
+
if (!this.data.includes(className) &&
|
|
81
|
+
!signatureClassNames.some(name => this.data.includes(name))) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
const classSignatures = classType.getConstructSignatures().map(signature => getParameterTypesFromSignature(signature, this.typeChecker));
|
|
85
|
+
const expressionName = isNewExpression ? `new ${className}` : 'super';
|
|
86
|
+
const signatures = classSignatures
|
|
87
|
+
.map(signature => signature.map(t => t === null ? 'any' : this.typeChecker.typeToString(t)))
|
|
88
|
+
.map(signature => `${expressionName}(${signature.join(', ')})`)
|
|
89
|
+
.join(' or ');
|
|
90
|
+
this.createFailureAtNode(node, `Found "${className}" constructed with ` +
|
|
91
|
+
`an invalid signature. Please manually update the ${expressionName} expression to ` +
|
|
92
|
+
`match the new signature${classSignatures.length > 1 ? 's' : ''}: ${signatures}`);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
exports.ConstructorSignatureMigration = ConstructorSignatureMigration;
|
|
97
|
+
/** Resolves the type for each parameter in the specified signature. */
|
|
98
|
+
function getParameterTypesFromSignature(signature, typeChecker) {
|
|
99
|
+
return signature.getParameters().map(param => param.declarations ? typeChecker.getTypeAtLocation(param.declarations[0]) : null);
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Walks through each node of a source file in order to find a new-expression node or super-call
|
|
103
|
+
* expression node that is captured by the specified diagnostic.
|
|
104
|
+
*/
|
|
105
|
+
function findConstructorNode(diagnostic, sourceFile) {
|
|
106
|
+
let resolvedNode = null;
|
|
107
|
+
const _visitNode = (node) => {
|
|
108
|
+
// Check whether the current node contains the diagnostic. If the node contains the diagnostic,
|
|
109
|
+
// walk deeper in order to find all constructor expression nodes.
|
|
110
|
+
if (node.getStart() <= diagnostic.start && node.getEnd() >= diagnostic.start) {
|
|
111
|
+
if (ts.isNewExpression(node) ||
|
|
112
|
+
(ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.SuperKeyword)) {
|
|
113
|
+
resolvedNode = node;
|
|
114
|
+
}
|
|
115
|
+
ts.forEachChild(node, _visitNode);
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
ts.forEachChild(sourceFile, _visitNode);
|
|
119
|
+
return resolvedNode;
|
|
120
|
+
}
|
|
121
|
+
/** Determines the class declaration of the specified construct signature. */
|
|
122
|
+
function getClassDeclarationOfSignature(signature) {
|
|
123
|
+
let node = signature.getDeclaration();
|
|
124
|
+
// Handle signatures which don't have an actual declaration. This happens if a class
|
|
125
|
+
// does not have an explicitly written constructor.
|
|
126
|
+
if (!node) {
|
|
127
|
+
return null;
|
|
128
|
+
}
|
|
129
|
+
while (!ts.isSourceFile(node = node.parent)) {
|
|
130
|
+
if (ts.isClassDeclaration(node)) {
|
|
131
|
+
return node;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return null;
|
|
135
|
+
}
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"constructor-signature.js","sourceRoot":"","sources":["../../../../../../../../src/cdk/schematics/ng-update/migrations/constructor-signature.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\nimport {Migration} from '../../update-tool/migration';\nimport {getAllChanges} from '../../update-tool/version-changes';\nimport {UpgradeData} from '../upgrade-data';\n\n/**\n * List of diagnostic codes that refer to pre-emit diagnostics which indicate invalid\n * new expression or super call signatures. See the list of diagnostics here:\n *\n * https://github.com/Microsoft/TypeScript/blob/master/src/compiler/diagnosticMessages.json\n */\nconst signatureErrorDiagnostics = [\n  // Type not assignable error diagnostic.\n  2345,\n  // Constructor argument length invalid diagnostics\n  2554,\n  2555,\n  2556,\n  2557,\n];\n\n/**\n * Migration that visits every TypeScript new expression or super call and checks if\n * the parameter type signature is invalid and needs to be updated manually.\n */\nexport class ConstructorSignatureMigration extends Migration<UpgradeData> {\n  // Note that the data for this rule is not distinguished based on the target version because\n  // we don't keep track of the new signature and don't want to update incrementally.\n  // See: https://github.com/angular/components/pull/12970#issuecomment-418337566\n  data = getAllChanges(this.upgradeData.constructorChecks);\n\n  // Only enable the migration rule if there is upgrade data.\n  enabled = this.data.length !== 0;\n\n  visitNode(node: ts.Node): void {\n    if (ts.isSourceFile(node)) {\n      this._visitSourceFile(node);\n    }\n  }\n\n  /**\n   * Method that will be called for each source file of the upgrade project. In order to\n   * properly determine invalid constructor signatures, we take advantage of the pre-emit\n   * diagnostics from TypeScript.\n   *\n   * By using the diagnostics, the migration can handle type assignability. Not using\n   * diagnostics would mean that we need to use simple type equality checking which is\n   * too strict. See related issue: https://github.com/Microsoft/TypeScript/issues/9879\n   */\n  private _visitSourceFile(sourceFile: ts.SourceFile) {\n    // List of classes of which the constructor signature has changed.\n    const diagnostics =\n        ts.getPreEmitDiagnostics(this.program, sourceFile)\n            .filter(diagnostic => signatureErrorDiagnostics.includes(diagnostic.code))\n            .filter(diagnostic => diagnostic.start !== undefined);\n\n    for (const diagnostic of diagnostics) {\n      const node = findConstructorNode(diagnostic, sourceFile);\n\n      if (!node) {\n        continue;\n      }\n\n      const classType = this.typeChecker.getTypeAtLocation(node.expression);\n      const className = classType.symbol && classType.symbol.name;\n      const isNewExpression = ts.isNewExpression(node);\n\n      // Determine the class names of the actual construct signatures because we cannot assume that\n      // the diagnostic refers to a constructor of the actual expression. In case the constructor\n      // is inherited, we need to detect that the owner-class of the constructor is added to the\n      // constructor checks upgrade data. e.g. `class CustomCalendar extends MatCalendar {}`.\n      const signatureClassNames =\n          classType.getConstructSignatures()\n              .map(signature => getClassDeclarationOfSignature(signature))\n              .map(declaration => declaration && declaration.name ? declaration.name.text : null)\n              .filter(Boolean);\n\n      // Besides checking the signature class names, we need to check the actual class name because\n      // there can be classes without an explicit constructor.\n      if (!this.data.includes(className) &&\n          !signatureClassNames.some(name => this.data.includes(name!))) {\n        continue;\n      }\n\n      const classSignatures = classType.getConstructSignatures().map(\n          signature => getParameterTypesFromSignature(signature, this.typeChecker));\n\n      const expressionName = isNewExpression ? `new ${className}` : 'super';\n      const signatures = classSignatures\n          .map(signature =>\n              signature.map(t => t === null ? 'any' : this.typeChecker.typeToString(t)))\n          .map(signature => `${expressionName}(${signature.join(', ')})`)\n          .join(' or ');\n\n      this.createFailureAtNode(\n          node,\n          `Found \"${className}\" constructed with ` +\n              `an invalid signature. Please manually update the ${expressionName} expression to ` +\n              `match the new signature${classSignatures.length > 1 ? 's' : ''}: ${signatures}`);\n    }\n  }\n}\n\n\n/** Resolves the type for each parameter in the specified signature. */\nfunction getParameterTypesFromSignature(\n    signature: ts.Signature, typeChecker: ts.TypeChecker): (ts.Type|null)[] {\n  return signature.getParameters().map(\n      param => param.declarations ? typeChecker.getTypeAtLocation(param.declarations[0]) : null);\n}\n\n/**\n * Walks through each node of a source file in order to find a new-expression node or super-call\n * expression node that is captured by the specified diagnostic.\n */\nfunction findConstructorNode(\n    diagnostic: ts.Diagnostic, sourceFile: ts.SourceFile): ts.CallExpression|ts.NewExpression|null {\n  let resolvedNode: ts.Node|null = null;\n\n  const _visitNode = (node: ts.Node) => {\n    // Check whether the current node contains the diagnostic. If the node contains the diagnostic,\n    // walk deeper in order to find all constructor expression nodes.\n    if (node.getStart() <= diagnostic.start! && node.getEnd() >= diagnostic.start!) {\n      if (ts.isNewExpression(node) ||\n          (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.SuperKeyword)) {\n        resolvedNode = node;\n      }\n\n      ts.forEachChild(node, _visitNode);\n    }\n  };\n\n  ts.forEachChild(sourceFile, _visitNode);\n\n  return resolvedNode;\n}\n\n/** Determines the class declaration of the specified construct signature. */\nfunction getClassDeclarationOfSignature(signature: ts.Signature): ts.ClassDeclaration|null {\n  let node: ts.Node = signature.getDeclaration();\n  // Handle signatures which don't have an actual declaration. This happens if a class\n  // does not have an explicitly written constructor.\n  if (!node) {\n    return null;\n  }\n  while (!ts.isSourceFile(node = node.parent)) {\n    if (ts.isClassDeclaration(node)) {\n      return node;\n    }\n  }\n  return null;\n}\n"]}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.CssSelectorsMigration = void 0;
|
|
11
|
+
const ts = require("typescript");
|
|
12
|
+
const migration_1 = require("../../update-tool/migration");
|
|
13
|
+
const literal_1 = require("../typescript/literal");
|
|
14
|
+
const upgrade_data_1 = require("../upgrade-data");
|
|
15
|
+
/**
|
|
16
|
+
* Migration that walks through every string literal, template and stylesheet in
|
|
17
|
+
* order to migrate outdated CSS selectors to the new selector.
|
|
18
|
+
*/
|
|
19
|
+
class CssSelectorsMigration extends migration_1.Migration {
|
|
20
|
+
constructor() {
|
|
21
|
+
super(...arguments);
|
|
22
|
+
/** Change data that upgrades to the specified target version. */
|
|
23
|
+
this.data = upgrade_data_1.getVersionUpgradeData(this, 'cssSelectors');
|
|
24
|
+
// Only enable the migration rule if there is upgrade data.
|
|
25
|
+
this.enabled = this.data.length !== 0;
|
|
26
|
+
}
|
|
27
|
+
visitNode(node) {
|
|
28
|
+
if (ts.isStringLiteralLike(node)) {
|
|
29
|
+
this._visitStringLiteralLike(node);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
visitTemplate(template) {
|
|
33
|
+
this.data.forEach(data => {
|
|
34
|
+
if (data.replaceIn && !data.replaceIn.html) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
literal_1.findAllSubstringIndices(template.content, data.replace)
|
|
38
|
+
.map(offset => template.start + offset)
|
|
39
|
+
.forEach(start => this._replaceSelector(template.filePath, start, data));
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
visitStylesheet(stylesheet) {
|
|
43
|
+
this.data.forEach(data => {
|
|
44
|
+
if (data.replaceIn && !data.replaceIn.stylesheet) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
literal_1.findAllSubstringIndices(stylesheet.content, data.replace)
|
|
48
|
+
.map(offset => stylesheet.start + offset)
|
|
49
|
+
.forEach(start => this._replaceSelector(stylesheet.filePath, start, data));
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
_visitStringLiteralLike(node) {
|
|
53
|
+
if (node.parent && node.parent.kind !== ts.SyntaxKind.CallExpression) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const textContent = node.getText();
|
|
57
|
+
const filePath = this.fileSystem.resolve(node.getSourceFile().fileName);
|
|
58
|
+
this.data.forEach(data => {
|
|
59
|
+
if (data.replaceIn && !data.replaceIn.tsStringLiterals) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
literal_1.findAllSubstringIndices(textContent, data.replace)
|
|
63
|
+
.map(offset => node.getStart() + offset)
|
|
64
|
+
.forEach(start => this._replaceSelector(filePath, start, data));
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
_replaceSelector(filePath, start, data) {
|
|
68
|
+
this.fileSystem.edit(filePath)
|
|
69
|
+
.remove(start, data.replace.length)
|
|
70
|
+
.insertRight(start, data.replaceWith);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
exports.CssSelectorsMigration = CssSelectorsMigration;
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3NzLXNlbGVjdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9jZGsvc2NoZW1hdGljcy9uZy11cGRhdGUvbWlncmF0aW9ucy9jc3Mtc2VsZWN0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7O0dBTUc7OztBQUVILGlDQUFpQztBQUdqQywyREFBc0Q7QUFFdEQsbURBQThEO0FBQzlELGtEQUFtRTtBQUVuRTs7O0dBR0c7QUFDSCxNQUFhLHFCQUFzQixTQUFRLHFCQUFzQjtJQUFqRTs7UUFDRSxpRUFBaUU7UUFDakUsU0FBSSxHQUE2QixvQ0FBcUIsQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLENBQUM7UUFFN0UsMkRBQTJEO1FBQzNELFlBQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUM7SUF3RG5DLENBQUM7SUF0REMsU0FBUyxDQUFDLElBQWE7UUFDckIsSUFBSSxFQUFFLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDaEMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3BDO0lBQ0gsQ0FBQztJQUVELGFBQWEsQ0FBQyxRQUEwQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QixJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtnQkFDMUMsT0FBTzthQUNSO1lBRUQsaUNBQXVCLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDO2lCQUNsRCxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQztpQkFDdEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDL0UsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsZUFBZSxDQUFDLFVBQTRCO1FBQzFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3ZCLElBQUksSUFBSSxDQUFDLFNBQVMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFFO2dCQUNoRCxPQUFPO2FBQ1I7WUFFRCxpQ0FBdUIsQ0FBQyxVQUFVLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUM7aUJBQ3BELEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO2lCQUN4QyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNqRixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyx1QkFBdUIsQ0FBQyxJQUEwQjtRQUN4RCxJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUU7WUFDcEUsT0FBTztTQUNSO1FBRUQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25DLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUV4RSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QixJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGdCQUFnQixFQUFFO2dCQUN0RCxPQUFPO2FBQ1I7WUFFRCxpQ0FBdUIsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQztpQkFDN0MsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLE1BQU0sQ0FBQztpQkFDdkMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUN0RSxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyxnQkFBZ0IsQ0FBQyxRQUF1QixFQUFFLEtBQWEsRUFBRSxJQUE0QjtRQUMzRixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7YUFDM0IsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQzthQUNsQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0Y7QUE3REQsc0RBNkRDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuaW1wb3J0IHtXb3Jrc3BhY2VQYXRofSBmcm9tICcuLi8uLi91cGRhdGUtdG9vbC9maWxlLXN5c3RlbSc7XG5pbXBvcnQge1Jlc29sdmVkUmVzb3VyY2V9IGZyb20gJy4uLy4uL3VwZGF0ZS10b29sL2NvbXBvbmVudC1yZXNvdXJjZS1jb2xsZWN0b3InO1xuaW1wb3J0IHtNaWdyYXRpb259IGZyb20gJy4uLy4uL3VwZGF0ZS10b29sL21pZ3JhdGlvbic7XG5pbXBvcnQge0Nzc1NlbGVjdG9yVXBncmFkZURhdGF9IGZyb20gJy4uL2RhdGEvY3NzLXNlbGVjdG9ycyc7XG5pbXBvcnQge2ZpbmRBbGxTdWJzdHJpbmdJbmRpY2VzfSBmcm9tICcuLi90eXBlc2NyaXB0L2xpdGVyYWwnO1xuaW1wb3J0IHtnZXRWZXJzaW9uVXBncmFkZURhdGEsIFVwZ3JhZGVEYXRhfSBmcm9tICcuLi91cGdyYWRlLWRhdGEnO1xuXG4vKipcbiAqIE1pZ3JhdGlvbiB0aGF0IHdhbGtzIHRocm91Z2ggZXZlcnkgc3RyaW5nIGxpdGVyYWwsIHRlbXBsYXRlIGFuZCBzdHlsZXNoZWV0IGluXG4gKiBvcmRlciB0byBtaWdyYXRlIG91dGRhdGVkIENTUyBzZWxlY3RvcnMgdG8gdGhlIG5ldyBzZWxlY3Rvci5cbiAqL1xuZXhwb3J0IGNsYXNzIENzc1NlbGVjdG9yc01pZ3JhdGlvbiBleHRlbmRzIE1pZ3JhdGlvbjxVcGdyYWRlRGF0YT4ge1xuICAvKiogQ2hhbmdlIGRhdGEgdGhhdCB1cGdyYWRlcyB0byB0aGUgc3BlY2lmaWVkIHRhcmdldCB2ZXJzaW9uLiAqL1xuICBkYXRhOiBDc3NTZWxlY3RvclVwZ3JhZGVEYXRhW10gPSBnZXRWZXJzaW9uVXBncmFkZURhdGEodGhpcywgJ2Nzc1NlbGVjdG9ycycpO1xuXG4gIC8vIE9ubHkgZW5hYmxlIHRoZSBtaWdyYXRpb24gcnVsZSBpZiB0aGVyZSBpcyB1cGdyYWRlIGRhdGEuXG4gIGVuYWJsZWQgPSB0aGlzLmRhdGEubGVuZ3RoICE9PSAwO1xuXG4gIHZpc2l0Tm9kZShub2RlOiB0cy5Ob2RlKTogdm9pZCB7XG4gICAgaWYgKHRzLmlzU3RyaW5nTGl0ZXJhbExpa2Uobm9kZSkpIHtcbiAgICAgIHRoaXMuX3Zpc2l0U3RyaW5nTGl0ZXJhbExpa2Uobm9kZSk7XG4gICAgfVxuICB9XG5cbiAgdmlzaXRUZW1wbGF0ZSh0ZW1wbGF0ZTogUmVzb2x2ZWRSZXNvdXJjZSk6IHZvaWQge1xuICAgIHRoaXMuZGF0YS5mb3JFYWNoKGRhdGEgPT4ge1xuICAgICAgaWYgKGRhdGEucmVwbGFjZUluICYmICFkYXRhLnJlcGxhY2VJbi5odG1sKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgZmluZEFsbFN1YnN0cmluZ0luZGljZXModGVtcGxhdGUuY29udGVudCwgZGF0YS5yZXBsYWNlKVxuICAgICAgICAgIC5tYXAob2Zmc2V0ID0+IHRlbXBsYXRlLnN0YXJ0ICsgb2Zmc2V0KVxuICAgICAgICAgIC5mb3JFYWNoKHN0YXJ0ID0+IHRoaXMuX3JlcGxhY2VTZWxlY3Rvcih0ZW1wbGF0ZS5maWxlUGF0aCwgc3RhcnQsIGRhdGEpKTtcbiAgICB9KTtcbiAgfVxuXG4gIHZpc2l0U3R5bGVzaGVldChzdHlsZXNoZWV0OiBSZXNvbHZlZFJlc291cmNlKTogdm9pZCB7XG4gICAgdGhpcy5kYXRhLmZvckVhY2goZGF0YSA9PiB7XG4gICAgICBpZiAoZGF0YS5yZXBsYWNlSW4gJiYgIWRhdGEucmVwbGFjZUluLnN0eWxlc2hlZXQpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuXG4gICAgICBmaW5kQWxsU3Vic3RyaW5nSW5kaWNlcyhzdHlsZXNoZWV0LmNvbnRlbnQsIGRhdGEucmVwbGFjZSlcbiAgICAgICAgICAubWFwKG9mZnNldCA9PiBzdHlsZXNoZWV0LnN0YXJ0ICsgb2Zmc2V0KVxuICAgICAgICAgIC5mb3JFYWNoKHN0YXJ0ID0+IHRoaXMuX3JlcGxhY2VTZWxlY3RvcihzdHlsZXNoZWV0LmZpbGVQYXRoLCBzdGFydCwgZGF0YSkpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBfdmlzaXRTdHJpbmdMaXRlcmFsTGlrZShub2RlOiB0cy5TdHJpbmdMaXRlcmFsTGlrZSkge1xuICAgIGlmIChub2RlLnBhcmVudCAmJiBub2RlLnBhcmVudC5raW5kICE9PSB0cy5TeW50YXhLaW5kLkNhbGxFeHByZXNzaW9uKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgdGV4dENvbnRlbnQgPSBub2RlLmdldFRleHQoKTtcbiAgICBjb25zdCBmaWxlUGF0aCA9IHRoaXMuZmlsZVN5c3RlbS5yZXNvbHZlKG5vZGUuZ2V0U291cmNlRmlsZSgpLmZpbGVOYW1lKTtcblxuICAgIHRoaXMuZGF0YS5mb3JFYWNoKGRhdGEgPT4ge1xuICAgICAgaWYgKGRhdGEucmVwbGFjZUluICYmICFkYXRhLnJlcGxhY2VJbi50c1N0cmluZ0xpdGVyYWxzKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgZmluZEFsbFN1YnN0cmluZ0luZGljZXModGV4dENvbnRlbnQsIGRhdGEucmVwbGFjZSlcbiAgICAgICAgICAubWFwKG9mZnNldCA9PiBub2RlLmdldFN0YXJ0KCkgKyBvZmZzZXQpXG4gICAgICAgICAgLmZvckVhY2goc3RhcnQgPT4gdGhpcy5fcmVwbGFjZVNlbGVjdG9yKGZpbGVQYXRoLCBzdGFydCwgZGF0YSkpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBfcmVwbGFjZVNlbGVjdG9yKGZpbGVQYXRoOiBXb3Jrc3BhY2VQYXRoLCBzdGFydDogbnVtYmVyLCBkYXRhOiBDc3NTZWxlY3RvclVwZ3JhZGVEYXRhKSB7XG4gICAgdGhpcy5maWxlU3lzdGVtLmVkaXQoZmlsZVBhdGgpXG4gICAgICAucmVtb3ZlKHN0YXJ0LCBkYXRhLnJlcGxhY2UubGVuZ3RoKVxuICAgICAgLmluc2VydFJpZ2h0KHN0YXJ0LCBkYXRhLnJlcGxhY2VXaXRoKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.ElementSelectorsMigration = void 0;
|
|
11
|
+
const ts = require("typescript");
|
|
12
|
+
const migration_1 = require("../../update-tool/migration");
|
|
13
|
+
const literal_1 = require("../typescript/literal");
|
|
14
|
+
const upgrade_data_1 = require("../upgrade-data");
|
|
15
|
+
/**
|
|
16
|
+
* Migration that walks through every string literal, template and stylesheet in order
|
|
17
|
+
* to migrate outdated element selectors to the new one.
|
|
18
|
+
*/
|
|
19
|
+
class ElementSelectorsMigration extends migration_1.Migration {
|
|
20
|
+
constructor() {
|
|
21
|
+
super(...arguments);
|
|
22
|
+
/** Change data that upgrades to the specified target version. */
|
|
23
|
+
this.data = upgrade_data_1.getVersionUpgradeData(this, 'elementSelectors');
|
|
24
|
+
// Only enable the migration rule if there is upgrade data.
|
|
25
|
+
this.enabled = this.data.length !== 0;
|
|
26
|
+
}
|
|
27
|
+
visitNode(node) {
|
|
28
|
+
if (ts.isStringLiteralLike(node)) {
|
|
29
|
+
this._visitStringLiteralLike(node);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
visitTemplate(template) {
|
|
33
|
+
this.data.forEach(selector => {
|
|
34
|
+
literal_1.findAllSubstringIndices(template.content, selector.replace)
|
|
35
|
+
.map(offset => template.start + offset)
|
|
36
|
+
.forEach(start => this._replaceSelector(template.filePath, start, selector));
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
visitStylesheet(stylesheet) {
|
|
40
|
+
this.data.forEach(selector => {
|
|
41
|
+
literal_1.findAllSubstringIndices(stylesheet.content, selector.replace)
|
|
42
|
+
.map(offset => stylesheet.start + offset)
|
|
43
|
+
.forEach(start => this._replaceSelector(stylesheet.filePath, start, selector));
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
_visitStringLiteralLike(node) {
|
|
47
|
+
if (node.parent && node.parent.kind !== ts.SyntaxKind.CallExpression) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const textContent = node.getText();
|
|
51
|
+
const filePath = this.fileSystem.resolve(node.getSourceFile().fileName);
|
|
52
|
+
this.data.forEach(selector => {
|
|
53
|
+
literal_1.findAllSubstringIndices(textContent, selector.replace)
|
|
54
|
+
.map(offset => node.getStart() + offset)
|
|
55
|
+
.forEach(start => this._replaceSelector(filePath, start, selector));
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
_replaceSelector(filePath, start, data) {
|
|
59
|
+
this.fileSystem.edit(filePath)
|
|
60
|
+
.remove(start, data.replace.length)
|
|
61
|
+
.insertRight(start, data.replaceWith);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.ElementSelectorsMigration = ElementSelectorsMigration;
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxlbWVudC1zZWxlY3RvcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvY2RrL3NjaGVtYXRpY3MvbmctdXBkYXRlL21pZ3JhdGlvbnMvZWxlbWVudC1zZWxlY3RvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7R0FNRzs7O0FBRUgsaUNBQWlDO0FBR2pDLDJEQUFzRDtBQUV0RCxtREFBOEQ7QUFDOUQsa0RBQW1FO0FBRW5FOzs7R0FHRztBQUNILE1BQWEseUJBQTBCLFNBQVEscUJBQXNCO0lBQXJFOztRQUNFLGlFQUFpRTtRQUNqRSxTQUFJLEdBQUcsb0NBQXFCLENBQUMsSUFBSSxFQUFFLGtCQUFrQixDQUFDLENBQUM7UUFFdkQsMkRBQTJEO1FBQzNELFlBQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUM7SUE2Q25DLENBQUM7SUEzQ0MsU0FBUyxDQUFDLElBQWE7UUFDckIsSUFBSSxFQUFFLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDaEMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3BDO0lBQ0gsQ0FBQztJQUVELGFBQWEsQ0FBQyxRQUEwQjtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRTtZQUMzQixpQ0FBdUIsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUM7aUJBQ3RELEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO2lCQUN0QyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNuRixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxlQUFlLENBQUMsVUFBNEI7UUFDMUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDM0IsaUNBQXVCLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDO2lCQUN4RCxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQztpQkFDeEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDckYsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sdUJBQXVCLENBQUMsSUFBMEI7UUFDeEQsSUFBSSxJQUFJLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFO1lBQ3BFLE9BQU87U0FDUjtRQUVELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNuQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFeEUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDM0IsaUNBQXVCLENBQUMsV0FBVyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUM7aUJBQ2pELEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsR0FBRyxNQUFNLENBQUM7aUJBQ3ZDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDMUUsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sZ0JBQWdCLENBQUMsUUFBdUIsRUFBRSxLQUFhLEVBQ3RDLElBQWdDO1FBQ3ZELElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQzthQUMzQixNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO2FBQ2xDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQWxERCw4REFrREMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge1Jlc29sdmVkUmVzb3VyY2V9IGZyb20gJy4uLy4uL3VwZGF0ZS10b29sL2NvbXBvbmVudC1yZXNvdXJjZS1jb2xsZWN0b3InO1xuaW1wb3J0IHtXb3Jrc3BhY2VQYXRofSBmcm9tICcuLi8uLi91cGRhdGUtdG9vbC9maWxlLXN5c3RlbSc7XG5pbXBvcnQge01pZ3JhdGlvbn0gZnJvbSAnLi4vLi4vdXBkYXRlLXRvb2wvbWlncmF0aW9uJztcbmltcG9ydCB7RWxlbWVudFNlbGVjdG9yVXBncmFkZURhdGF9IGZyb20gJy4uL2RhdGEvZWxlbWVudC1zZWxlY3RvcnMnO1xuaW1wb3J0IHtmaW5kQWxsU3Vic3RyaW5nSW5kaWNlc30gZnJvbSAnLi4vdHlwZXNjcmlwdC9saXRlcmFsJztcbmltcG9ydCB7Z2V0VmVyc2lvblVwZ3JhZGVEYXRhLCBVcGdyYWRlRGF0YX0gZnJvbSAnLi4vdXBncmFkZS1kYXRhJztcblxuLyoqXG4gKiBNaWdyYXRpb24gdGhhdCB3YWxrcyB0aHJvdWdoIGV2ZXJ5IHN0cmluZyBsaXRlcmFsLCB0ZW1wbGF0ZSBhbmQgc3R5bGVzaGVldCBpbiBvcmRlclxuICogdG8gbWlncmF0ZSBvdXRkYXRlZCBlbGVtZW50IHNlbGVjdG9ycyB0byB0aGUgbmV3IG9uZS5cbiAqL1xuZXhwb3J0IGNsYXNzIEVsZW1lbnRTZWxlY3RvcnNNaWdyYXRpb24gZXh0ZW5kcyBNaWdyYXRpb248VXBncmFkZURhdGE+IHtcbiAgLyoqIENoYW5nZSBkYXRhIHRoYXQgdXBncmFkZXMgdG8gdGhlIHNwZWNpZmllZCB0YXJnZXQgdmVyc2lvbi4gKi9cbiAgZGF0YSA9IGdldFZlcnNpb25VcGdyYWRlRGF0YSh0aGlzLCAnZWxlbWVudFNlbGVjdG9ycycpO1xuXG4gIC8vIE9ubHkgZW5hYmxlIHRoZSBtaWdyYXRpb24gcnVsZSBpZiB0aGVyZSBpcyB1cGdyYWRlIGRhdGEuXG4gIGVuYWJsZWQgPSB0aGlzLmRhdGEubGVuZ3RoICE9PSAwO1xuXG4gIHZpc2l0Tm9kZShub2RlOiB0cy5Ob2RlKTogdm9pZCB7XG4gICAgaWYgKHRzLmlzU3RyaW5nTGl0ZXJhbExpa2Uobm9kZSkpIHtcbiAgICAgIHRoaXMuX3Zpc2l0U3RyaW5nTGl0ZXJhbExpa2Uobm9kZSk7XG4gICAgfVxuICB9XG5cbiAgdmlzaXRUZW1wbGF0ZSh0ZW1wbGF0ZTogUmVzb2x2ZWRSZXNvdXJjZSk6IHZvaWQge1xuICAgIHRoaXMuZGF0YS5mb3JFYWNoKHNlbGVjdG9yID0+IHtcbiAgICAgIGZpbmRBbGxTdWJzdHJpbmdJbmRpY2VzKHRlbXBsYXRlLmNvbnRlbnQsIHNlbGVjdG9yLnJlcGxhY2UpXG4gICAgICAgICAgLm1hcChvZmZzZXQgPT4gdGVtcGxhdGUuc3RhcnQgKyBvZmZzZXQpXG4gICAgICAgICAgLmZvckVhY2goc3RhcnQgPT4gdGhpcy5fcmVwbGFjZVNlbGVjdG9yKHRlbXBsYXRlLmZpbGVQYXRoLCBzdGFydCwgc2VsZWN0b3IpKTtcbiAgICB9KTtcbiAgfVxuXG4gIHZpc2l0U3R5bGVzaGVldChzdHlsZXNoZWV0OiBSZXNvbHZlZFJlc291cmNlKTogdm9pZCB7XG4gICAgdGhpcy5kYXRhLmZvckVhY2goc2VsZWN0b3IgPT4ge1xuICAgICAgZmluZEFsbFN1YnN0cmluZ0luZGljZXMoc3R5bGVzaGVldC5jb250ZW50LCBzZWxlY3Rvci5yZXBsYWNlKVxuICAgICAgICAgIC5tYXAob2Zmc2V0ID0+IHN0eWxlc2hlZXQuc3RhcnQgKyBvZmZzZXQpXG4gICAgICAgICAgLmZvckVhY2goc3RhcnQgPT4gdGhpcy5fcmVwbGFjZVNlbGVjdG9yKHN0eWxlc2hlZXQuZmlsZVBhdGgsIHN0YXJ0LCBzZWxlY3RvcikpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBfdmlzaXRTdHJpbmdMaXRlcmFsTGlrZShub2RlOiB0cy5TdHJpbmdMaXRlcmFsTGlrZSkge1xuICAgIGlmIChub2RlLnBhcmVudCAmJiBub2RlLnBhcmVudC5raW5kICE9PSB0cy5TeW50YXhLaW5kLkNhbGxFeHByZXNzaW9uKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgdGV4dENvbnRlbnQgPSBub2RlLmdldFRleHQoKTtcbiAgICBjb25zdCBmaWxlUGF0aCA9IHRoaXMuZmlsZVN5c3RlbS5yZXNvbHZlKG5vZGUuZ2V0U291cmNlRmlsZSgpLmZpbGVOYW1lKTtcblxuICAgIHRoaXMuZGF0YS5mb3JFYWNoKHNlbGVjdG9yID0+IHtcbiAgICAgIGZpbmRBbGxTdWJzdHJpbmdJbmRpY2VzKHRleHRDb250ZW50LCBzZWxlY3Rvci5yZXBsYWNlKVxuICAgICAgICAgIC5tYXAob2Zmc2V0ID0+IG5vZGUuZ2V0U3RhcnQoKSArIG9mZnNldClcbiAgICAgICAgICAuZm9yRWFjaChzdGFydCA9PiB0aGlzLl9yZXBsYWNlU2VsZWN0b3IoZmlsZVBhdGgsIHN0YXJ0LCBzZWxlY3RvcikpO1xuICAgIH0pO1xuICB9XG5cbiAgcHJpdmF0ZSBfcmVwbGFjZVNlbGVjdG9yKGZpbGVQYXRoOiBXb3Jrc3BhY2VQYXRoLCBzdGFydDogbnVtYmVyLFxuICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YTogRWxlbWVudFNlbGVjdG9yVXBncmFkZURhdGEpIHtcbiAgICB0aGlzLmZpbGVTeXN0ZW0uZWRpdChmaWxlUGF0aClcbiAgICAgIC5yZW1vdmUoc3RhcnQsIGRhdGEucmVwbGFjZS5sZW5ndGgpXG4gICAgICAuaW5zZXJ0UmlnaHQoc3RhcnQsIGRhdGEucmVwbGFjZVdpdGgpO1xuICB9XG59XG4iXX0=
|