@angular/core 15.1.0-next.2 → 15.1.0-rc.0

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.
Files changed (93) hide show
  1. package/esm2020/src/application_init.mjs +2 -1
  2. package/esm2020/src/application_ref.mjs +10 -3
  3. package/esm2020/src/di/injector_compatibility.mjs +2 -2
  4. package/esm2020/src/di/r3_injector.mjs +2 -2
  5. package/esm2020/src/errors.mjs +1 -1
  6. package/esm2020/src/linker/view_ref.mjs +1 -1
  7. package/esm2020/src/render3/i18n/i18n_parse.mjs +17 -2
  8. package/esm2020/src/util/global.mjs +1 -1
  9. package/esm2020/src/version.mjs +1 -1
  10. package/esm2020/testing/src/component_fixture.mjs +1 -1
  11. package/esm2020/testing/src/logger.mjs +7 -7
  12. package/esm2020/testing/src/ng_zone_mock.mjs +3 -3
  13. package/esm2020/testing/src/test_bed.mjs +1 -1
  14. package/fesm2015/core.mjs +111 -1560
  15. package/fesm2015/core.mjs.map +1 -1
  16. package/fesm2015/testing.mjs +79 -1334
  17. package/fesm2015/testing.mjs.map +1 -1
  18. package/fesm2020/core.mjs +113 -1584
  19. package/fesm2020/core.mjs.map +1 -1
  20. package/fesm2020/testing.mjs +81 -1358
  21. package/fesm2020/testing.mjs.map +1 -1
  22. package/index.d.ts +4 -4
  23. package/package.json +1 -1
  24. package/schematics/migrations/relative-link-resolution/bundle.js +265 -0
  25. package/schematics/migrations/relative-link-resolution/bundle.js.map +7 -0
  26. package/schematics/migrations/relative-link-resolution/bundle_metadata.json +1 -0
  27. package/schematics/migrations/router-link-with-href/bundle.js +350 -0
  28. package/schematics/migrations/router-link-with-href/bundle.js.map +7 -0
  29. package/schematics/migrations/router-link-with-href/bundle_metadata.json +1 -0
  30. package/schematics/migrations.json +5 -20
  31. package/testing/index.d.ts +4 -1
  32. package/esm2020/src/render3/util/debug_utils.mjs +0 -40
  33. package/esm2020/testing/src/lang_utils.mjs +0 -14
  34. package/schematics/migrations/entry-components/index.d.ts +0 -11
  35. package/schematics/migrations/entry-components/index.js +0 -71
  36. package/schematics/migrations/entry-components/util.d.ts +0 -16
  37. package/schematics/migrations/entry-components/util.js +0 -57
  38. package/schematics/migrations/path-match-type/index.d.ts +0 -11
  39. package/schematics/migrations/path-match-type/index.js +0 -95
  40. package/schematics/migrations/path-match-type/transform.d.ts +0 -19
  41. package/schematics/migrations/path-match-type/transform.js +0 -48
  42. package/schematics/migrations/path-match-type/update_recorder.d.ts +0 -18
  43. package/schematics/migrations/path-match-type/update_recorder.js +0 -20
  44. package/schematics/migrations/path-match-type/util.d.ts +0 -11
  45. package/schematics/migrations/path-match-type/util.js +0 -106
  46. package/schematics/migrations/relative-link-resolution/index.d.ts +0 -10
  47. package/schematics/migrations/relative-link-resolution/index.js +0 -68
  48. package/schematics/migrations/relative-link-resolution/util.d.ts +0 -20
  49. package/schematics/migrations/relative-link-resolution/util.js +0 -82
  50. package/schematics/migrations/router-link-with-href/index.d.ts +0 -10
  51. package/schematics/migrations/router-link-with-href/index.js +0 -70
  52. package/schematics/migrations/router-link-with-href/util.d.ts +0 -19
  53. package/schematics/migrations/router-link-with-href/util.js +0 -111
  54. package/schematics/migrations/typed-forms/index.d.ts +0 -10
  55. package/schematics/migrations/typed-forms/index.js +0 -68
  56. package/schematics/migrations/typed-forms/util.d.ts +0 -19
  57. package/schematics/migrations/typed-forms/util.js +0 -134
  58. package/schematics/utils/import_manager.d.ts +0 -57
  59. package/schematics/utils/import_manager.js +0 -234
  60. package/schematics/utils/line_mappings.d.ts +0 -18
  61. package/schematics/utils/line_mappings.js +0 -75
  62. package/schematics/utils/load_esm.d.ts +0 -32
  63. package/schematics/utils/load_esm.js +0 -79
  64. package/schematics/utils/ng_component_template.d.ts +0 -44
  65. package/schematics/utils/ng_component_template.js +0 -131
  66. package/schematics/utils/ng_decorators.d.ts +0 -23
  67. package/schematics/utils/ng_decorators.js +0 -37
  68. package/schematics/utils/parse_html.d.ts +0 -14
  69. package/schematics/utils/parse_html.js +0 -37
  70. package/schematics/utils/project_tsconfig_paths.d.ts +0 -17
  71. package/schematics/utils/project_tsconfig_paths.js +0 -122
  72. package/schematics/utils/template_ast_visitor.d.ts +0 -55
  73. package/schematics/utils/template_ast_visitor.js +0 -73
  74. package/schematics/utils/typescript/class_declaration.d.ts +0 -15
  75. package/schematics/utils/typescript/class_declaration.js +0 -52
  76. package/schematics/utils/typescript/compiler_host.d.ts +0 -34
  77. package/schematics/utils/typescript/compiler_host.js +0 -85
  78. package/schematics/utils/typescript/decorators.d.ts +0 -11
  79. package/schematics/utils/typescript/decorators.js +0 -37
  80. package/schematics/utils/typescript/find_base_classes.d.ts +0 -14
  81. package/schematics/utils/typescript/find_base_classes.js +0 -47
  82. package/schematics/utils/typescript/functions.d.ts +0 -17
  83. package/schematics/utils/typescript/functions.js +0 -46
  84. package/schematics/utils/typescript/imports.d.ts +0 -53
  85. package/schematics/utils/typescript/imports.js +0 -128
  86. package/schematics/utils/typescript/nodes.d.ts +0 -20
  87. package/schematics/utils/typescript/nodes.js +0 -77
  88. package/schematics/utils/typescript/parse_tsconfig.d.ts +0 -10
  89. package/schematics/utils/typescript/parse_tsconfig.js +0 -66
  90. package/schematics/utils/typescript/property_name.d.ts +0 -19
  91. package/schematics/utils/typescript/property_name.js +0 -41
  92. package/schematics/utils/typescript/symbol.d.ts +0 -19
  93. package/schematics/utils/typescript/symbol.js +0 -93
@@ -1,82 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- var __importDefault = (this && this.__importDefault) || function (mod) {
9
- return (mod && mod.__esModule) ? mod : { "default": mod };
10
- };
11
- (function (factory) {
12
- if (typeof module === "object" && typeof module.exports === "object") {
13
- var v = factory(require, exports);
14
- if (v !== undefined) module.exports = v;
15
- }
16
- else if (typeof define === "function" && define.amd) {
17
- define("@angular/core/schematics/migrations/relative-link-resolution/util", ["require", "exports", "typescript"], factory);
18
- }
19
- })(function (require, exports) {
20
- "use strict";
21
- Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.migrateFile = void 0;
23
- const typescript_1 = __importDefault(require("typescript"));
24
- const relativeLinkResolution = 'relativeLinkResolution';
25
- const knownConfigValues = new Set([`'legacy'`, `'corrected'`]);
26
- function migrateFile(sourceFile, rewriteFn) {
27
- let rewrites = [];
28
- const usages = getUsages(sourceFile);
29
- for (const { objectLiteral, property } of usages) {
30
- const replacementNode = typescript_1.default.factory.updateObjectLiteralExpression(objectLiteral, objectLiteral.properties.filter(prop => prop !== property));
31
- const printer = typescript_1.default.createPrinter();
32
- const replacementText = printer.printNode(typescript_1.default.EmitHint.Unspecified, replacementNode, sourceFile);
33
- rewrites.push({
34
- startPos: objectLiteral.getStart(),
35
- width: objectLiteral.getWidth(),
36
- replacement: replacementText,
37
- });
38
- }
39
- // Process rewrites last-to-first (based on start pos) to avoid offset shifts during rewrites.
40
- rewrites = sortByStartPosDescending(rewrites);
41
- for (const rewrite of rewrites) {
42
- rewriteFn(rewrite.startPos, rewrite.width, rewrite.replacement);
43
- }
44
- }
45
- exports.migrateFile = migrateFile;
46
- function getUsages(sourceFile) {
47
- const usages = [];
48
- const visitNode = (node) => {
49
- if (typescript_1.default.isObjectLiteralExpression(node)) {
50
- // Look for patterns like the following:
51
- // ```
52
- // { ... relativeLinkResolution: 'legacy', ... }
53
- // ```
54
- // or:
55
- // ```
56
- // { ... relativeLinkResolution: 'corrected', ... }
57
- // ```
58
- // If the value is unknown (i.e. not 'legacy' or 'corrected'),
59
- // do not attempt to rewrite (this might be an application-specific
60
- // configuration, not a part of Router).
61
- const property = node.properties.find(prop => typescript_1.default.isPropertyAssignment(prop) && typescript_1.default.isIdentifier(prop.name) &&
62
- prop.name.text === relativeLinkResolution &&
63
- knownConfigValues.has(prop.initializer.getText()));
64
- if (property) {
65
- usages.push({ objectLiteral: node, property });
66
- }
67
- }
68
- typescript_1.default.forEachChild(node, visitNode);
69
- };
70
- typescript_1.default.forEachChild(sourceFile, visitNode);
71
- return usages;
72
- }
73
- /**
74
- * Sort all found usages based on their start positions in the source file in descending order (i.e.
75
- * last usage goes first on the list, etc). This is needed to avoid shifting offsets in the source
76
- * file (in case there are multiple usages) as we rewrite symbols.
77
- */
78
- function sortByStartPosDescending(rewrites) {
79
- return rewrites.sort((entityA, entityB) => entityB.startPos - entityA.startPos);
80
- }
81
- });
82
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JlbGF0aXZlLWxpbmstcmVzb2x1dGlvbi91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDREQUE0QjtJQUU1QixNQUFNLHNCQUFzQixHQUFHLHdCQUF3QixDQUFDO0lBQ3hELE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQztJQWUvRCxTQUFnQixXQUFXLENBQUMsVUFBeUIsRUFBRSxTQUFvQjtRQUN6RSxJQUFJLFFBQVEsR0FBb0IsRUFBRSxDQUFDO1FBQ25DLE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNyQyxLQUFLLE1BQU0sRUFBQyxhQUFhLEVBQUUsUUFBUSxFQUFDLElBQUksTUFBTSxFQUFFO1lBQzlDLE1BQU0sZUFBZSxHQUFHLG9CQUFFLENBQUMsT0FBTyxDQUFDLDZCQUE2QixDQUM1RCxhQUFhLEVBQUUsYUFBYSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztZQUMvRSxNQUFNLE9BQU8sR0FBRyxvQkFBRSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ25DLE1BQU0sZUFBZSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsb0JBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGVBQWUsRUFBRSxVQUFVLENBQUMsQ0FBQztZQUNoRyxRQUFRLENBQUMsSUFBSSxDQUFDO2dCQUNaLFFBQVEsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFO2dCQUNsQyxLQUFLLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRTtnQkFDL0IsV0FBVyxFQUFFLGVBQWU7YUFDN0IsQ0FBQyxDQUFDO1NBQ0o7UUFFRCw4RkFBOEY7UUFDOUYsUUFBUSxHQUFHLHdCQUF3QixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzlDLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFO1lBQzlCLFNBQVMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1NBQ2pFO0lBQ0gsQ0FBQztJQXBCRCxrQ0FvQkM7SUFFRCxTQUFTLFNBQVMsQ0FBQyxVQUF5QjtRQUMxQyxNQUFNLE1BQU0sR0FBcUIsRUFBRSxDQUFDO1FBQ3BDLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBYSxFQUFFLEVBQUU7WUFDbEMsSUFBSSxvQkFBRSxDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUN0Qyx3Q0FBd0M7Z0JBQ3hDLE1BQU07Z0JBQ04sZ0RBQWdEO2dCQUNoRCxNQUFNO2dCQUNOLE1BQU07Z0JBQ04sTUFBTTtnQkFDTixtREFBbUQ7Z0JBQ25ELE1BQU07Z0JBQ04sOERBQThEO2dCQUM5RCxtRUFBbUU7Z0JBQ25FLHdDQUF3QztnQkFDeEMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQ2pDLElBQUksQ0FBQyxFQUFFLENBQUMsb0JBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxvQkFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO29CQUMvRCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxzQkFBc0I7b0JBQ3pDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDM0QsSUFBSSxRQUFRLEVBQUU7b0JBQ1osTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFDLGFBQWEsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFDLENBQUMsQ0FBQztpQkFDOUM7YUFDRjtZQUNELG9CQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNuQyxDQUFDLENBQUM7UUFDRixvQkFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDdkMsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxTQUFTLHdCQUF3QixDQUFDLFFBQXlCO1FBQ3pELE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xGLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5jb25zdCByZWxhdGl2ZUxpbmtSZXNvbHV0aW9uID0gJ3JlbGF0aXZlTGlua1Jlc29sdXRpb24nO1xuY29uc3Qga25vd25Db25maWdWYWx1ZXMgPSBuZXcgU2V0KFtgJ2xlZ2FjeSdgLCBgJ2NvcnJlY3RlZCdgXSk7XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmV3cml0ZUVudGl0eSB7XG4gIHN0YXJ0UG9zOiBudW1iZXI7XG4gIHdpZHRoOiBudW1iZXI7XG4gIHJlcGxhY2VtZW50OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgTWlncmF0YWJsZU5vZGUge1xuICBvYmplY3RMaXRlcmFsOiB0cy5PYmplY3RMaXRlcmFsRXhwcmVzc2lvbjtcbiAgcHJvcGVydHk6IHRzLk9iamVjdExpdGVyYWxFbGVtZW50TGlrZTtcbn1cblxuZXhwb3J0IHR5cGUgUmV3cml0ZUZuID0gKHN0YXJ0UG9zOiBudW1iZXIsIG9yaWdMZW5ndGg6IG51bWJlciwgdGV4dDogc3RyaW5nKSA9PiB2b2lkO1xuXG5leHBvcnQgZnVuY3Rpb24gbWlncmF0ZUZpbGUoc291cmNlRmlsZTogdHMuU291cmNlRmlsZSwgcmV3cml0ZUZuOiBSZXdyaXRlRm4pIHtcbiAgbGV0IHJld3JpdGVzOiBSZXdyaXRlRW50aXR5W10gPSBbXTtcbiAgY29uc3QgdXNhZ2VzID0gZ2V0VXNhZ2VzKHNvdXJjZUZpbGUpO1xuICBmb3IgKGNvbnN0IHtvYmplY3RMaXRlcmFsLCBwcm9wZXJ0eX0gb2YgdXNhZ2VzKSB7XG4gICAgY29uc3QgcmVwbGFjZW1lbnROb2RlID0gdHMuZmFjdG9yeS51cGRhdGVPYmplY3RMaXRlcmFsRXhwcmVzc2lvbihcbiAgICAgICAgb2JqZWN0TGl0ZXJhbCwgb2JqZWN0TGl0ZXJhbC5wcm9wZXJ0aWVzLmZpbHRlcihwcm9wID0+IHByb3AgIT09IHByb3BlcnR5KSk7XG4gICAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcbiAgICBjb25zdCByZXBsYWNlbWVudFRleHQgPSBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgcmVwbGFjZW1lbnROb2RlLCBzb3VyY2VGaWxlKTtcbiAgICByZXdyaXRlcy5wdXNoKHtcbiAgICAgIHN0YXJ0UG9zOiBvYmplY3RMaXRlcmFsLmdldFN0YXJ0KCksXG4gICAgICB3aWR0aDogb2JqZWN0TGl0ZXJhbC5nZXRXaWR0aCgpLFxuICAgICAgcmVwbGFjZW1lbnQ6IHJlcGxhY2VtZW50VGV4dCxcbiAgICB9KTtcbiAgfVxuXG4gIC8vIFByb2Nlc3MgcmV3cml0ZXMgbGFzdC10by1maXJzdCAoYmFzZWQgb24gc3RhcnQgcG9zKSB0byBhdm9pZCBvZmZzZXQgc2hpZnRzIGR1cmluZyByZXdyaXRlcy5cbiAgcmV3cml0ZXMgPSBzb3J0QnlTdGFydFBvc0Rlc2NlbmRpbmcocmV3cml0ZXMpO1xuICBmb3IgKGNvbnN0IHJld3JpdGUgb2YgcmV3cml0ZXMpIHtcbiAgICByZXdyaXRlRm4ocmV3cml0ZS5zdGFydFBvcywgcmV3cml0ZS53aWR0aCwgcmV3cml0ZS5yZXBsYWNlbWVudCk7XG4gIH1cbn1cblxuZnVuY3Rpb24gZ2V0VXNhZ2VzKHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiBNaWdyYXRhYmxlTm9kZVtdIHtcbiAgY29uc3QgdXNhZ2VzOiBNaWdyYXRhYmxlTm9kZVtdID0gW107XG4gIGNvbnN0IHZpc2l0Tm9kZSA9IChub2RlOiB0cy5Ob2RlKSA9PiB7XG4gICAgaWYgKHRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obm9kZSkpIHtcbiAgICAgIC8vIExvb2sgZm9yIHBhdHRlcm5zIGxpa2UgdGhlIGZvbGxvd2luZzpcbiAgICAgIC8vIGBgYFxuICAgICAgLy8geyAuLi4gcmVsYXRpdmVMaW5rUmVzb2x1dGlvbjogJ2xlZ2FjeScsIC4uLiB9XG4gICAgICAvLyBgYGBcbiAgICAgIC8vIG9yOlxuICAgICAgLy8gYGBgXG4gICAgICAvLyB7IC4uLiByZWxhdGl2ZUxpbmtSZXNvbHV0aW9uOiAnY29ycmVjdGVkJywgLi4uIH1cbiAgICAgIC8vIGBgYFxuICAgICAgLy8gSWYgdGhlIHZhbHVlIGlzIHVua25vd24gKGkuZS4gbm90ICdsZWdhY3knIG9yICdjb3JyZWN0ZWQnKSxcbiAgICAgIC8vIGRvIG5vdCBhdHRlbXB0IHRvIHJld3JpdGUgKHRoaXMgbWlnaHQgYmUgYW4gYXBwbGljYXRpb24tc3BlY2lmaWNcbiAgICAgIC8vIGNvbmZpZ3VyYXRpb24sIG5vdCBhIHBhcnQgb2YgUm91dGVyKS5cbiAgICAgIGNvbnN0IHByb3BlcnR5ID0gbm9kZS5wcm9wZXJ0aWVzLmZpbmQoXG4gICAgICAgICAgcHJvcCA9PiB0cy5pc1Byb3BlcnR5QXNzaWdubWVudChwcm9wKSAmJiB0cy5pc0lkZW50aWZpZXIocHJvcC5uYW1lKSAmJlxuICAgICAgICAgICAgICBwcm9wLm5hbWUudGV4dCA9PT0gcmVsYXRpdmVMaW5rUmVzb2x1dGlvbiAmJlxuICAgICAgICAgICAgICBrbm93bkNvbmZpZ1ZhbHVlcy5oYXMocHJvcC5pbml0aWFsaXplci5nZXRUZXh0KCkpKTtcbiAgICAgIGlmIChwcm9wZXJ0eSkge1xuICAgICAgICB1c2FnZXMucHVzaCh7b2JqZWN0TGl0ZXJhbDogbm9kZSwgcHJvcGVydHl9KTtcbiAgICAgIH1cbiAgICB9XG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIHZpc2l0Tm9kZSk7XG4gIH07XG4gIHRzLmZvckVhY2hDaGlsZChzb3VyY2VGaWxlLCB2aXNpdE5vZGUpO1xuICByZXR1cm4gdXNhZ2VzO1xufVxuXG4vKipcbiAqIFNvcnQgYWxsIGZvdW5kIHVzYWdlcyBiYXNlZCBvbiB0aGVpciBzdGFydCBwb3NpdGlvbnMgaW4gdGhlIHNvdXJjZSBmaWxlIGluIGRlc2NlbmRpbmcgb3JkZXIgKGkuZS5cbiAqIGxhc3QgdXNhZ2UgZ29lcyBmaXJzdCBvbiB0aGUgbGlzdCwgZXRjKS4gVGhpcyBpcyBuZWVkZWQgdG8gYXZvaWQgc2hpZnRpbmcgb2Zmc2V0cyBpbiB0aGUgc291cmNlXG4gKiBmaWxlIChpbiBjYXNlIHRoZXJlIGFyZSBtdWx0aXBsZSB1c2FnZXMpIGFzIHdlIHJld3JpdGUgc3ltYm9scy5cbiAqL1xuZnVuY3Rpb24gc29ydEJ5U3RhcnRQb3NEZXNjZW5kaW5nKHJld3JpdGVzOiBSZXdyaXRlRW50aXR5W10pOiBSZXdyaXRlRW50aXR5W10ge1xuICByZXR1cm4gcmV3cml0ZXMuc29ydCgoZW50aXR5QSwgZW50aXR5QikgPT4gZW50aXR5Qi5zdGFydFBvcyAtIGVudGl0eUEuc3RhcnRQb3MpO1xufVxuIl19
@@ -1,10 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- /// <amd-module name="@angular/core/schematics/migrations/router-link-with-href" />
9
- import { Rule } from '@angular-devkit/schematics';
10
- export default function (): Rule;
@@ -1,70 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
- return new (P || (P = Promise))(function (resolve, reject) {
11
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
- step((generator = generator.apply(thisArg, _arguments || [])).next());
15
- });
16
- };
17
- (function (factory) {
18
- if (typeof module === "object" && typeof module.exports === "object") {
19
- var v = factory(require, exports);
20
- if (v !== undefined) module.exports = v;
21
- }
22
- else if (typeof define === "function" && define.amd) {
23
- define("@angular/core/schematics/migrations/router-link-with-href", ["require", "exports", "@angular-devkit/schematics", "path", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/router-link-with-href/util"], factory);
24
- }
25
- })(function (require, exports) {
26
- "use strict";
27
- Object.defineProperty(exports, "__esModule", { value: true });
28
- const schematics_1 = require("@angular-devkit/schematics");
29
- const path_1 = require("path");
30
- const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
31
- const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
32
- const util_1 = require("@angular/core/schematics/migrations/router-link-with-href/util");
33
- function default_1() {
34
- return (tree) => __awaiter(this, void 0, void 0, function* () {
35
- const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
36
- const basePath = process.cwd();
37
- const allPaths = [...buildPaths, ...testPaths];
38
- if (!allPaths.length) {
39
- throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot run the `RouterLinkWithHref` migration.');
40
- }
41
- for (const tsconfigPath of allPaths) {
42
- runRouterLinkWithHrefMigration(tree, tsconfigPath, basePath);
43
- }
44
- });
45
- }
46
- exports.default = default_1;
47
- function runRouterLinkWithHrefMigration(tree, tsconfigPath, basePath) {
48
- const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
49
- const typeChecker = program.getTypeChecker();
50
- const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
51
- for (const sourceFile of sourceFiles) {
52
- let update = null;
53
- const rewriter = (startPos, width, text) => {
54
- if (update === null) {
55
- // Lazily initialize update, because most files will not require migration.
56
- update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
57
- }
58
- update.remove(startPos, width);
59
- if (text !== null) {
60
- update.insertLeft(startPos, text);
61
- }
62
- };
63
- (0, util_1.migrateFile)(sourceFile, typeChecker, rewriter);
64
- if (update !== null) {
65
- tree.commitUpdate(update);
66
- }
67
- }
68
- }
69
- });
70
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9yb3V0ZXItbGluay13aXRoLWhyZWYvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkY7SUFDM0YsK0JBQThCO0lBRTlCLGtHQUEyRTtJQUMzRSwyRkFBNEY7SUFFNUYseUZBQW1DO0lBRW5DO1FBQ0UsT0FBTyxDQUFPLElBQVUsRUFBRSxFQUFFO1lBQzFCLE1BQU0sRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFDLEdBQUcsTUFBTSxJQUFBLGdEQUF1QixFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BFLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7WUFFL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7Z0JBQ3BCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FDekIsa0ZBQWtGLENBQUMsQ0FBQzthQUN6RjtZQUVELEtBQUssTUFBTSxZQUFZLElBQUksUUFBUSxFQUFFO2dCQUNuQyw4QkFBOEIsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQzlEO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRCxTQUFTLDhCQUE4QixDQUFDLElBQVUsRUFBRSxZQUFvQixFQUFFLFFBQWdCO1FBQ3hGLE1BQU0sRUFBQyxPQUFPLEVBQUMsR0FBRyxJQUFBLHNDQUFzQixFQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDdkUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sV0FBVyxHQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxJQUFBLDhCQUFjLEVBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBRWpHLEtBQUssTUFBTSxVQUFVLElBQUksV0FBVyxFQUFFO1lBQ3BDLElBQUksTUFBTSxHQUF3QixJQUFJLENBQUM7WUFFdkMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxRQUFnQixFQUFFLEtBQWEsRUFBRSxJQUFpQixFQUFFLEVBQUU7Z0JBQ3RFLElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtvQkFDbkIsMkVBQTJFO29CQUMzRSxNQUFNLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7aUJBQ3BFO2dCQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO2dCQUMvQixJQUFJLElBQUksS0FBSyxJQUFJLEVBQUU7b0JBQ2pCLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO2lCQUNuQztZQUNILENBQUMsQ0FBQztZQUVGLElBQUEsa0JBQVcsRUFBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRS9DLElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtnQkFDbkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUMzQjtTQUNGO0lBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWUsIFVwZGF0ZVJlY29yZGVyfSBmcm9tICdAYW5ndWxhci1kZXZraXQvc2NoZW1hdGljcyc7XG5pbXBvcnQge3JlbGF0aXZlfSBmcm9tICdwYXRoJztcblxuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuXG5pbXBvcnQge21pZ3JhdGVGaWxlfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuIGFzeW5jICh0cmVlOiBUcmVlKSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBhd2FpdCBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG4gICAgY29uc3QgYWxsUGF0aHMgPSBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXTtcblxuICAgIGlmICghYWxsUGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBydW4gdGhlIGBSb3V0ZXJMaW5rV2l0aEhyZWZgIG1pZ3JhdGlvbi4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuUm91dGVyTGlua1dpdGhIcmVmTWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuUm91dGVyTGlua1dpdGhIcmVmTWlncmF0aW9uKHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKSB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHR5cGVDaGVja2VyID0gcHJvZ3JhbS5nZXRUeXBlQ2hlY2tlcigpO1xuICBjb25zdCBzb3VyY2VGaWxlcyA9XG4gICAgICBwcm9ncmFtLmdldFNvdXJjZUZpbGVzKCkuZmlsdGVyKHNvdXJjZUZpbGUgPT4gY2FuTWlncmF0ZUZpbGUoYmFzZVBhdGgsIHNvdXJjZUZpbGUsIHByb2dyYW0pKTtcblxuICBmb3IgKGNvbnN0IHNvdXJjZUZpbGUgb2Ygc291cmNlRmlsZXMpIHtcbiAgICBsZXQgdXBkYXRlOiBVcGRhdGVSZWNvcmRlcnxudWxsID0gbnVsbDtcblxuICAgIGNvbnN0IHJld3JpdGVyID0gKHN0YXJ0UG9zOiBudW1iZXIsIHdpZHRoOiBudW1iZXIsIHRleHQ6IHN0cmluZ3xudWxsKSA9PiB7XG4gICAgICBpZiAodXBkYXRlID09PSBudWxsKSB7XG4gICAgICAgIC8vIExhemlseSBpbml0aWFsaXplIHVwZGF0ZSwgYmVjYXVzZSBtb3N0IGZpbGVzIHdpbGwgbm90IHJlcXVpcmUgbWlncmF0aW9uLlxuICAgICAgICB1cGRhdGUgPSB0cmVlLmJlZ2luVXBkYXRlKHJlbGF0aXZlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLmZpbGVOYW1lKSk7XG4gICAgICB9XG4gICAgICB1cGRhdGUucmVtb3ZlKHN0YXJ0UG9zLCB3aWR0aCk7XG4gICAgICBpZiAodGV4dCAhPT0gbnVsbCkge1xuICAgICAgICB1cGRhdGUuaW5zZXJ0TGVmdChzdGFydFBvcywgdGV4dCk7XG4gICAgICB9XG4gICAgfTtcblxuICAgIG1pZ3JhdGVGaWxlKHNvdXJjZUZpbGUsIHR5cGVDaGVja2VyLCByZXdyaXRlcik7XG5cbiAgICBpZiAodXBkYXRlICE9PSBudWxsKSB7XG4gICAgICB0cmVlLmNvbW1pdFVwZGF0ZSh1cGRhdGUpO1xuICAgIH1cbiAgfVxufVxuIl19
@@ -1,19 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- /// <amd-module name="@angular/core/schematics/migrations/router-link-with-href/util" />
9
- import ts from 'typescript';
10
- export declare const routerLink = "RouterLink";
11
- export declare const routerLinkWithHref = "RouterLinkWithHref";
12
- export declare const routerModule = "@angular/router";
13
- export interface RewriteEntity {
14
- startPos: number;
15
- width: number;
16
- replacement: string;
17
- }
18
- export type RewriteFn = (startPos: number, width: number, text: string) => void;
19
- export declare function migrateFile(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: RewriteFn): void;
@@ -1,111 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- var __importDefault = (this && this.__importDefault) || function (mod) {
9
- return (mod && mod.__esModule) ? mod : { "default": mod };
10
- };
11
- (function (factory) {
12
- if (typeof module === "object" && typeof module.exports === "object") {
13
- var v = factory(require, exports);
14
- if (v !== undefined) module.exports = v;
15
- }
16
- else if (typeof define === "function" && define.amd) {
17
- define("@angular/core/schematics/migrations/router-link-with-href/util", ["require", "exports", "typescript", "@angular/core/schematics/utils/typescript/imports", "@angular/core/schematics/utils/typescript/nodes"], factory);
18
- }
19
- })(function (require, exports) {
20
- "use strict";
21
- Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.migrateFile = exports.routerModule = exports.routerLinkWithHref = exports.routerLink = void 0;
23
- const typescript_1 = __importDefault(require("typescript"));
24
- const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
25
- const nodes_1 = require("@angular/core/schematics/utils/typescript/nodes");
26
- exports.routerLink = 'RouterLink';
27
- exports.routerLinkWithHref = 'RouterLinkWithHref';
28
- exports.routerModule = '@angular/router';
29
- function migrateFile(sourceFile, typeChecker, rewrite) {
30
- const routerLinkWithHrefSpec = (0, imports_1.getImportSpecifier)(sourceFile, exports.routerModule, exports.routerLinkWithHref);
31
- // No `RouterLinkWithHref` found, nothing to migrate, exit early.
32
- if (routerLinkWithHrefSpec === null)
33
- return;
34
- let rewrites = findUsages(sourceFile, typeChecker);
35
- // There are some usages of the `RouterLinkWithHref` symbol, which need to
36
- // be rewritten to `RouterLink` instead. Let's check if the `RouterLink` is
37
- // already imported.
38
- const routerLinkSpec = (0, imports_1.getImportSpecifier)(sourceFile, exports.routerModule, exports.routerLink);
39
- if (routerLinkSpec) {
40
- // The `RouterLink` symbol is already imported, just drop the `RouterLinkWithHref` one.
41
- const routerLinkNamedImports = routerLinkWithHrefSpec ?
42
- (0, nodes_1.closestNode)(routerLinkWithHrefSpec, typescript_1.default.SyntaxKind.NamedImports) :
43
- null;
44
- if (routerLinkNamedImports !== null) {
45
- // Given an original import like this one:
46
- // ```
47
- // import {RouterModule, RouterLinkWithHref, RouterLink} from '@angular/router';
48
- // ```
49
- // The code below removes the `RouterLinkWithHref` from the named imports section
50
- // (i.e. `{RouterModule, RouterLinkWithHref, RouterLink}`) and prints an updated
51
- // version (`{RouterModule, RouterLink}`) to a string, which is used as a
52
- // replacement.
53
- const rewrittenNamedImports = (0, imports_1.removeSymbolFromNamedImports)(routerLinkNamedImports, routerLinkWithHrefSpec);
54
- const printer = typescript_1.default.createPrinter();
55
- const replacement = printer.printNode(typescript_1.default.EmitHint.Unspecified, rewrittenNamedImports, sourceFile);
56
- rewrites.push({
57
- startPos: routerLinkNamedImports.getStart(),
58
- width: routerLinkNamedImports.getWidth(),
59
- replacement: replacement,
60
- });
61
- }
62
- }
63
- else {
64
- // The `RouterLink` symbol is not imported, but the `RouterLinkWithHref` is imported,
65
- // so rewrite `RouterLinkWithHref` -> `RouterLink`.
66
- rewrites.push({
67
- startPos: routerLinkWithHrefSpec.getStart(),
68
- width: routerLinkWithHrefSpec.getWidth(),
69
- replacement: exports.routerLink,
70
- });
71
- }
72
- // Process rewrites last-to-first (based on start pos) to avoid offset shifts during rewrites.
73
- rewrites = sortByStartPosDescending(rewrites);
74
- for (const usage of rewrites) {
75
- rewrite(usage.startPos, usage.width, usage.replacement);
76
- }
77
- }
78
- exports.migrateFile = migrateFile;
79
- function findUsages(sourceFile, typeChecker) {
80
- const usages = [];
81
- const visitNode = (node) => {
82
- if (typescript_1.default.isImportSpecifier(node)) {
83
- // Skip this node and all of its children; imports are a special case.
84
- return;
85
- }
86
- if (typescript_1.default.isIdentifier(node)) {
87
- const importIdentifier = (0, imports_1.getImportOfIdentifier)(typeChecker, node);
88
- if ((importIdentifier === null || importIdentifier === void 0 ? void 0 : importIdentifier.importModule) === exports.routerModule &&
89
- importIdentifier.name === exports.routerLinkWithHref) {
90
- usages.push({
91
- startPos: node.getStart(),
92
- width: node.getWidth(),
93
- replacement: exports.routerLink,
94
- });
95
- }
96
- }
97
- typescript_1.default.forEachChild(node, visitNode);
98
- };
99
- typescript_1.default.forEachChild(sourceFile, visitNode);
100
- return usages;
101
- }
102
- /**
103
- * Sort all found usages based on their start positions in the source file in descending order (i.e.
104
- * last usage goes first on the list, etc). This is needed to avoid shifting offsets in the source
105
- * file (in case there are multiple usages) as we rewrite symbols.
106
- */
107
- function sortByStartPosDescending(rewrites) {
108
- return rewrites.sort((entityA, entityB) => entityB.startPos - entityA.startPos);
109
- }
110
- });
111
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/router-link-with-href/util.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 ts from 'typescript';\n\nimport {getImportOfIdentifier, getImportSpecifier, removeSymbolFromNamedImports} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nexport const routerLink = 'RouterLink';\nexport const routerLinkWithHref = 'RouterLinkWithHref';\nexport const routerModule = '@angular/router';\n\nexport interface RewriteEntity {\n  startPos: number;\n  width: number;\n  replacement: string;\n}\n\nexport type RewriteFn = (startPos: number, width: number, text: string) => void;\n\nexport function migrateFile(\n    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: RewriteFn) {\n  const routerLinkWithHrefSpec = getImportSpecifier(sourceFile, routerModule, routerLinkWithHref);\n\n  // No `RouterLinkWithHref` found, nothing to migrate, exit early.\n  if (routerLinkWithHrefSpec === null) return;\n\n  let rewrites = findUsages(sourceFile, typeChecker);\n\n  // There are some usages of the `RouterLinkWithHref` symbol, which need to\n  // be rewritten to `RouterLink` instead. Let's check if the `RouterLink` is\n  // already imported.\n  const routerLinkSpec = getImportSpecifier(sourceFile, routerModule, routerLink);\n\n  if (routerLinkSpec) {\n    // The `RouterLink` symbol is already imported, just drop the `RouterLinkWithHref` one.\n    const routerLinkNamedImports = routerLinkWithHrefSpec ?\n        closestNode<ts.NamedImports>(routerLinkWithHrefSpec, ts.SyntaxKind.NamedImports) :\n        null;\n    if (routerLinkNamedImports !== null) {\n      // Given an original import like this one:\n      // ```\n      // import {RouterModule, RouterLinkWithHref, RouterLink} from '@angular/router';\n      // ```\n      // The code below removes the `RouterLinkWithHref` from the named imports section\n      // (i.e. `{RouterModule, RouterLinkWithHref, RouterLink}`) and prints an updated\n      // version (`{RouterModule, RouterLink}`) to a string, which is used as a\n      // replacement.\n      const rewrittenNamedImports =\n          removeSymbolFromNamedImports(routerLinkNamedImports, routerLinkWithHrefSpec);\n      const printer = ts.createPrinter();\n      const replacement =\n          printer.printNode(ts.EmitHint.Unspecified, rewrittenNamedImports, sourceFile);\n      rewrites.push({\n        startPos: routerLinkNamedImports.getStart(),\n        width: routerLinkNamedImports.getWidth(),\n        replacement: replacement,\n      });\n    }\n  } else {\n    // The `RouterLink` symbol is not imported, but the `RouterLinkWithHref` is imported,\n    // so rewrite `RouterLinkWithHref` -> `RouterLink`.\n    rewrites.push({\n      startPos: routerLinkWithHrefSpec.getStart(),\n      width: routerLinkWithHrefSpec.getWidth(),\n      replacement: routerLink,\n    });\n  }\n\n  // Process rewrites last-to-first (based on start pos) to avoid offset shifts during rewrites.\n  rewrites = sortByStartPosDescending(rewrites);\n  for (const usage of rewrites) {\n    rewrite(usage.startPos, usage.width, usage.replacement);\n  }\n}\n\nfunction findUsages(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker): RewriteEntity[] {\n  const usages: RewriteEntity[] = [];\n  const visitNode = (node: ts.Node) => {\n    if (ts.isImportSpecifier(node)) {\n      // Skip this node and all of its children; imports are a special case.\n      return;\n    }\n    if (ts.isIdentifier(node)) {\n      const importIdentifier = getImportOfIdentifier(typeChecker, node);\n      if (importIdentifier?.importModule === routerModule &&\n          importIdentifier.name === routerLinkWithHref) {\n        usages.push({\n          startPos: node.getStart(),\n          width: node.getWidth(),\n          replacement: routerLink,\n        });\n      }\n    }\n    ts.forEachChild(node, visitNode);\n  };\n  ts.forEachChild(sourceFile, visitNode);\n  return usages;\n}\n\n/**\n * Sort all found usages based on their start positions in the source file in descending order (i.e.\n * last usage goes first on the list, etc). This is needed to avoid shifting offsets in the source\n * file (in case there are multiple usages) as we rewrite symbols.\n */\nfunction sortByStartPosDescending(rewrites: RewriteEntity[]): RewriteEntity[] {\n  return rewrites.sort((entityA, entityB) => entityB.startPos - entityA.startPos);\n}\n"]}
@@ -1,10 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- /// <amd-module name="@angular/core/schematics/migrations/typed-forms" />
9
- import { Rule } from '@angular-devkit/schematics';
10
- export default function (): Rule;
@@ -1,68 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
- return new (P || (P = Promise))(function (resolve, reject) {
11
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
- step((generator = generator.apply(thisArg, _arguments || [])).next());
15
- });
16
- };
17
- (function (factory) {
18
- if (typeof module === "object" && typeof module.exports === "object") {
19
- var v = factory(require, exports);
20
- if (v !== undefined) module.exports = v;
21
- }
22
- else if (typeof define === "function" && define.amd) {
23
- define("@angular/core/schematics/migrations/typed-forms", ["require", "exports", "@angular-devkit/schematics", "path", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/typed-forms/util"], factory);
24
- }
25
- })(function (require, exports) {
26
- "use strict";
27
- Object.defineProperty(exports, "__esModule", { value: true });
28
- const schematics_1 = require("@angular-devkit/schematics");
29
- const path_1 = require("path");
30
- const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
31
- const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
32
- const util_1 = require("@angular/core/schematics/migrations/typed-forms/util");
33
- function default_1() {
34
- return (tree) => __awaiter(this, void 0, void 0, function* () {
35
- const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
36
- const basePath = process.cwd();
37
- const allPaths = [...buildPaths, ...testPaths];
38
- if (!allPaths.length) {
39
- throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot migrate to Typed Forms.');
40
- }
41
- for (const tsconfigPath of allPaths) {
42
- runTypedFormsMigration(tree, tsconfigPath, basePath);
43
- }
44
- });
45
- }
46
- exports.default = default_1;
47
- function runTypedFormsMigration(tree, tsconfigPath, basePath) {
48
- const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
49
- const typeChecker = program.getTypeChecker();
50
- const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
51
- for (const sourceFile of sourceFiles) {
52
- let update = null;
53
- const rewriter = (startPos, origLength, text) => {
54
- if (update === null) {
55
- // Lazily initialize update, because most files will not require migration.
56
- update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
57
- }
58
- update.remove(startPos, origLength);
59
- update.insertLeft(startPos, text);
60
- };
61
- (0, util_1.migrateFile)(sourceFile, typeChecker, rewriter);
62
- if (update !== null) {
63
- tree.commitUpdate(update);
64
- }
65
- }
66
- }
67
- });
68
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy90eXBlZC1mb3Jtcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDJEQUEyRjtJQUMzRiwrQkFBOEI7SUFFOUIsa0dBQTJFO0lBQzNFLDJGQUE0RjtJQUU1RiwrRUFBbUM7SUFFbkM7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyxNQUFNLElBQUEsZ0RBQXVCLEVBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEUsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQy9CLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRyxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztZQUUvQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtnQkFDcEIsTUFBTSxJQUFJLGdDQUFtQixDQUN6QixrRUFBa0UsQ0FBQyxDQUFDO2FBQ3pFO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQ25DLHNCQUFzQixDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7YUFDdEQ7UUFDSCxDQUFDLENBQUEsQ0FBQztJQUNKLENBQUM7SUFmRCw0QkFlQztJQUVELFNBQVMsc0JBQXNCLENBQUMsSUFBVSxFQUFFLFlBQW9CLEVBQUUsUUFBZ0I7UUFDaEYsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsTUFBTSxXQUFXLEdBQ2IsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLElBQUEsOEJBQWMsRUFBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFFakcsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7WUFDcEMsSUFBSSxNQUFNLEdBQXdCLElBQUksQ0FBQztZQUV2QyxNQUFNLFFBQVEsR0FBRyxDQUFDLFFBQWdCLEVBQUUsVUFBa0IsRUFBRSxJQUFZLEVBQUUsRUFBRTtnQkFDdEUsSUFBSSxNQUFNLEtBQUssSUFBSSxFQUFFO29CQUNuQiwyRUFBMkU7b0JBQzNFLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUEsZUFBUSxFQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztpQkFDcEU7Z0JBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7Z0JBQ3BDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3BDLENBQUMsQ0FBQztZQUVGLElBQUEsa0JBQVcsRUFBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRS9DLElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtnQkFDbkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUMzQjtTQUNGO0lBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWUsIFVwZGF0ZVJlY29yZGVyfSBmcm9tICdAYW5ndWxhci1kZXZraXQvc2NoZW1hdGljcyc7XG5pbXBvcnQge3JlbGF0aXZlfSBmcm9tICdwYXRoJztcblxuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuXG5pbXBvcnQge21pZ3JhdGVGaWxlfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuIGFzeW5jICh0cmVlOiBUcmVlKSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBhd2FpdCBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG4gICAgY29uc3QgYWxsUGF0aHMgPSBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXTtcblxuICAgIGlmICghYWxsUGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBtaWdyYXRlIHRvIFR5cGVkIEZvcm1zLicpO1xuICAgIH1cblxuICAgIGZvciAoY29uc3QgdHNjb25maWdQYXRoIG9mIGFsbFBhdGhzKSB7XG4gICAgICBydW5UeXBlZEZvcm1zTWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuVHlwZWRGb3Jtc01pZ3JhdGlvbih0cmVlOiBUcmVlLCB0c2NvbmZpZ1BhdGg6IHN0cmluZywgYmFzZVBhdGg6IHN0cmluZykge1xuICBjb25zdCB7cHJvZ3JhbX0gPSBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICBjb25zdCB0eXBlQ2hlY2tlciA9IHByb2dyYW0uZ2V0VHlwZUNoZWNrZXIoKTtcbiAgY29uc3Qgc291cmNlRmlsZXMgPVxuICAgICAgcHJvZ3JhbS5nZXRTb3VyY2VGaWxlcygpLmZpbHRlcihzb3VyY2VGaWxlID0+IGNhbk1pZ3JhdGVGaWxlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLCBwcm9ncmFtKSk7XG5cbiAgZm9yIChjb25zdCBzb3VyY2VGaWxlIG9mIHNvdXJjZUZpbGVzKSB7XG4gICAgbGV0IHVwZGF0ZTogVXBkYXRlUmVjb3JkZXJ8bnVsbCA9IG51bGw7XG5cbiAgICBjb25zdCByZXdyaXRlciA9IChzdGFydFBvczogbnVtYmVyLCBvcmlnTGVuZ3RoOiBudW1iZXIsIHRleHQ6IHN0cmluZykgPT4ge1xuICAgICAgaWYgKHVwZGF0ZSA9PT0gbnVsbCkge1xuICAgICAgICAvLyBMYXppbHkgaW5pdGlhbGl6ZSB1cGRhdGUsIGJlY2F1c2UgbW9zdCBmaWxlcyB3aWxsIG5vdCByZXF1aXJlIG1pZ3JhdGlvbi5cbiAgICAgICAgdXBkYXRlID0gdHJlZS5iZWdpblVwZGF0ZShyZWxhdGl2ZShiYXNlUGF0aCwgc291cmNlRmlsZS5maWxlTmFtZSkpO1xuICAgICAgfVxuICAgICAgdXBkYXRlLnJlbW92ZShzdGFydFBvcywgb3JpZ0xlbmd0aCk7XG4gICAgICB1cGRhdGUuaW5zZXJ0TGVmdChzdGFydFBvcywgdGV4dCk7XG4gICAgfTtcblxuICAgIG1pZ3JhdGVGaWxlKHNvdXJjZUZpbGUsIHR5cGVDaGVja2VyLCByZXdyaXRlcik7XG5cbiAgICBpZiAodXBkYXRlICE9PSBudWxsKSB7XG4gICAgICB0cmVlLmNvbW1pdFVwZGF0ZSh1cGRhdGUpO1xuICAgIH1cbiAgfVxufVxuIl19
@@ -1,19 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- /// <amd-module name="@angular/core/schematics/migrations/typed-forms/util" />
9
- import ts from 'typescript';
10
- export declare const classes: Set<string>;
11
- export declare const formControl = "FormControl";
12
- export declare const untypedPrefix = "Untyped";
13
- export declare const forms = "@angular/forms";
14
- export interface MigratableNode {
15
- node: ts.Node;
16
- importName: string;
17
- }
18
- export type rewriteFn = (startPos: number, origLength: number, text: string) => void;
19
- export declare function migrateFile(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: rewriteFn): void;
@@ -1,134 +0,0 @@
1
- /**
2
- * @license
3
- * Copyright Google LLC All Rights Reserved.
4
- *
5
- * Use of this source code is governed by an MIT-style license that can be
6
- * found in the LICENSE file at https://angular.io/license
7
- */
8
- var __importDefault = (this && this.__importDefault) || function (mod) {
9
- return (mod && mod.__esModule) ? mod : { "default": mod };
10
- };
11
- (function (factory) {
12
- if (typeof module === "object" && typeof module.exports === "object") {
13
- var v = factory(require, exports);
14
- if (v !== undefined) module.exports = v;
15
- }
16
- else if (typeof define === "function" && define.amd) {
17
- define("@angular/core/schematics/migrations/typed-forms/util", ["require", "exports", "typescript", "@angular/core/schematics/utils/typescript/imports"], factory);
18
- }
19
- })(function (require, exports) {
20
- "use strict";
21
- Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.migrateFile = exports.forms = exports.untypedPrefix = exports.formControl = exports.classes = void 0;
23
- const typescript_1 = __importDefault(require("typescript"));
24
- const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
25
- exports.classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);
26
- exports.formControl = 'FormControl';
27
- exports.untypedPrefix = 'Untyped';
28
- exports.forms = '@angular/forms';
29
- function migrateFile(sourceFile, typeChecker, rewrite) {
30
- const imports = getImports(sourceFile);
31
- // If no relevant classes are imported, we can exit early.
32
- if (imports.length === 0)
33
- return;
34
- // For each control class, migrate all of its uses.
35
- for (let i = imports.length; i >= 0; i--) {
36
- const imp = imports[i];
37
- const usages = getUsages(sourceFile, typeChecker, imp);
38
- if (usages.length === 0) {
39
- // Since there are no usages of this class we need to migrate it, we should completely
40
- // skip it for the subsequent migration steps.
41
- imports.splice(i, 1);
42
- }
43
- for (const usage of usages) {
44
- const newName = getUntypedVersionOfImportOrName(usage.importName);
45
- if (newName === null) {
46
- // This should never happen.
47
- console.error(`Typed forms migration error: unknown replacement for usage ${usage.node.getText()}`);
48
- continue;
49
- }
50
- rewrite(usage.node.getStart(), usage.node.getWidth(), newName);
51
- }
52
- }
53
- // For each imported control class, migrate to the corresponding uptyped import.
54
- for (const imp of imports) {
55
- const untypedClass = getUntypedVersionOfImportOrName(imp.getText());
56
- if (untypedClass === null) {
57
- // This should never happen.
58
- console.error(`Typed forms migration error: unknown untyped version of import ${imp.getText()}`);
59
- continue;
60
- }
61
- if ((0, imports_1.getImportSpecifier)(sourceFile, exports.forms, untypedClass)) {
62
- // In order to make the migration idempotent, we must check whether the untyped version of the
63
- // class is already present. If present, immediately continue.
64
- continue;
65
- }
66
- rewrite(imp.getStart(), imp.getWidth(), untypedClass);
67
- }
68
- }
69
- exports.migrateFile = migrateFile;
70
- function getImports(sourceFile) {
71
- let imports = [];
72
- for (const cc of exports.classes) {
73
- const specifier = (0, imports_1.getImportSpecifier)(sourceFile, exports.forms, cc);
74
- if (!specifier)
75
- continue;
76
- imports.push(specifier);
77
- }
78
- return imports;
79
- }
80
- function getUntypedVersionOfImportOrName(name) {
81
- for (const cc of exports.classes) {
82
- if (name.includes(cc)) {
83
- return `${exports.untypedPrefix}${cc}`;
84
- }
85
- }
86
- return null;
87
- }
88
- function getUsages(sourceFile, typeChecker, importSpecifier) {
89
- const usages = [];
90
- const visitNode = (node) => {
91
- if (typescript_1.default.isImportSpecifier(node)) {
92
- // Skip this node and all of its children; imports are a special case.
93
- return;
94
- }
95
- if (typescript_1.default.isIdentifier(node) && isUsageOfFormsImport(typeChecker, node, importSpecifier)) {
96
- usages.push({ node, importName: importSpecifier.getText() });
97
- }
98
- typescript_1.default.forEachChild(node, visitNode);
99
- };
100
- typescript_1.default.forEachChild(sourceFile, visitNode);
101
- return usages;
102
- }
103
- function isUsageOfFormsImport(typeChecker, node, importSpecifier) {
104
- var _a, _b;
105
- const symbol = typeChecker.getSymbolAtLocation(node);
106
- // We check symbol.declarations because we actually care about the name at the declaration site,
107
- // not the usage site. These could be different in the case of overridden constructors.
108
- if (!symbol || symbol.declarations === undefined || !symbol.declarations.length)
109
- return false;
110
- const decl = symbol.declarations[0];
111
- if (!typescript_1.default.isImportSpecifier(decl))
112
- return false;
113
- // As per `typescript/imports.ts`, we must walk up the tree to find the enclosing import
114
- // declaration. For reasons specific to the TS AST, this is always 3 levels up from an import
115
- // specifier node.
116
- const importDecl = decl.parent.parent.parent;
117
- if (!typescript_1.default.isStringLiteral(importDecl.moduleSpecifier))
118
- return false;
119
- const importName = (_b = (_a = typeChecker.getTypeAtLocation(importSpecifier)) === null || _a === void 0 ? void 0 : _a.getSymbol()) === null || _b === void 0 ? void 0 : _b.getName();
120
- if (!importName)
121
- return false;
122
- // Handles aliased imports: e.g. "import {Component as myComp} from ...";
123
- const declName = decl.propertyName ? decl.propertyName.text : decl.name.text;
124
- if (importName === declName)
125
- return true;
126
- // In the case of FormControl's overridden exported constructor, the value name and declaration
127
- // name are not exactly the same. For our purposes, it's enough to check whether the latter is a
128
- // substring of the former.
129
- if (declName === exports.formControl && importName.includes(declName))
130
- return true;
131
- return false;
132
- }
133
- });
134
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/typed-forms/util.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 ts from 'typescript';\n\nimport {getImportSpecifier} from '../../utils/typescript/imports';\n\nexport const classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);\nexport const formControl = 'FormControl';\nexport const untypedPrefix = 'Untyped';\nexport const forms = '@angular/forms';\n\nexport interface MigratableNode {\n  node: ts.Node;\n  importName: string;\n}\n\nexport type rewriteFn = (startPos: number, origLength: number, text: string) => void;\n\nexport function migrateFile(\n    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: rewriteFn) {\n  const imports = getImports(sourceFile);\n\n  // If no relevant classes are imported, we can exit early.\n  if (imports.length === 0) return;\n\n  // For each control class, migrate all of its uses.\n  for (let i = imports.length; i >= 0; i--) {\n    const imp = imports[i];\n    const usages = getUsages(sourceFile, typeChecker, imp);\n    if (usages.length === 0) {\n      // Since there are no usages of this class we need to migrate it, we should completely\n      // skip it for the subsequent migration steps.\n      imports.splice(i, 1);\n    }\n    for (const usage of usages) {\n      const newName = getUntypedVersionOfImportOrName(usage.importName);\n      if (newName === null) {\n        // This should never happen.\n        console.error(\n            `Typed forms migration error: unknown replacement for usage ${usage.node.getText()}`);\n        continue;\n      }\n      rewrite(usage.node.getStart(), usage.node.getWidth(), newName);\n    }\n  }\n\n  // For each imported control class, migrate to the corresponding uptyped import.\n  for (const imp of imports) {\n    const untypedClass = getUntypedVersionOfImportOrName(imp.getText());\n    if (untypedClass === null) {\n      // This should never happen.\n      console.error(\n          `Typed forms migration error: unknown untyped version of import ${imp.getText()}`);\n      continue;\n    }\n    if (getImportSpecifier(sourceFile, forms, untypedClass)) {\n      // In order to make the migration idempotent, we must check whether the untyped version of the\n      // class is already present. If present, immediately continue.\n      continue;\n    }\n    rewrite(imp.getStart(), imp.getWidth(), untypedClass);\n  }\n}\n\nfunction getImports(sourceFile: ts.SourceFile): ts.ImportSpecifier[] {\n  let imports: ts.ImportSpecifier[] = [];\n  for (const cc of classes) {\n    const specifier = getImportSpecifier(sourceFile, forms, cc);\n    if (!specifier) continue;\n    imports.push(specifier);\n  }\n  return imports;\n}\n\nfunction getUntypedVersionOfImportOrName(name: string): string|null {\n  for (const cc of classes) {\n    if (name.includes(cc)) {\n      return `${untypedPrefix}${cc}`;\n    }\n  }\n  return null;\n}\n\nfunction getUsages(\n    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker,\n    importSpecifier: ts.ImportSpecifier): MigratableNode[] {\n  const usages: MigratableNode[] = [];\n  const visitNode = (node: ts.Node) => {\n    if (ts.isImportSpecifier(node)) {\n      // Skip this node and all of its children; imports are a special case.\n      return;\n    }\n    if (ts.isIdentifier(node) && isUsageOfFormsImport(typeChecker, node, importSpecifier)) {\n      usages.push({node, importName: importSpecifier.getText()});\n    }\n    ts.forEachChild(node, visitNode);\n  };\n  ts.forEachChild(sourceFile, visitNode);\n  return usages;\n}\n\nfunction isUsageOfFormsImport(\n    typeChecker: ts.TypeChecker, node: ts.Identifier,\n    importSpecifier: ts.ImportSpecifier): boolean {\n  const symbol = typeChecker.getSymbolAtLocation(node);\n\n  // We check symbol.declarations because we actually care about the name at the declaration site,\n  // not the usage site. These could be different in the case of overridden constructors.\n  if (!symbol || symbol.declarations === undefined || !symbol.declarations.length) return false;\n\n  const decl = symbol.declarations[0];\n  if (!ts.isImportSpecifier(decl)) return false;\n\n  // As per `typescript/imports.ts`, we must walk up the tree to find the enclosing import\n  // declaration. For reasons specific to the TS AST, this is always 3 levels up from an import\n  // specifier node.\n  const importDecl = decl.parent.parent.parent;\n  if (!ts.isStringLiteral(importDecl.moduleSpecifier)) return false;\n\n  const importName = typeChecker.getTypeAtLocation(importSpecifier)?.getSymbol()?.getName();\n  if (!importName) return false;\n\n  // Handles aliased imports: e.g. \"import {Component as myComp} from ...\";\n  const declName = decl.propertyName ? decl.propertyName.text : decl.name.text;\n\n  if (importName === declName) return true;\n\n  // In the case of FormControl's overridden exported constructor, the value name and declaration\n  // name are not exactly the same. For our purposes, it's enough to check whether the latter is a\n  // substring of the former.\n  if (declName === formControl && importName.includes(declName)) return true;\n\n  return false;\n}\n"]}