7849fdde09
In #38227 the signatures of `navigateByUrl` and `createUrlTree` were updated to exclude unsupported properties from their `extras` parameter. This migration looks for the relevant method calls that pass in an `extras` parameter and drops the unsupported properties. **Before:** ``` this._router.navigateByUrl('/', {skipLocationChange: false, fragment: 'foo'}); ``` **After:** ``` this._router.navigateByUrl('/', { /* Removed unsupported properties by Angular migration: fragment. */ skipLocationChange: false }); ``` These changes also move the method call detection logic out of the `Renderer2` migration and into a common place so that it can be reused in other migrations. PR Close #38825
62 lines
2.2 KiB
TypeScript
62 lines
2.2 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright Google LLC All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
* found in the LICENSE file at https://angular.io/license
|
|
*/
|
|
|
|
import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';
|
|
import {relative} from 'path';
|
|
import * as ts from 'typescript';
|
|
|
|
import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';
|
|
import {createMigrationProgram} from '../../utils/typescript/compiler_host';
|
|
import {findLiteralsToMigrate, migrateLiteral} from './util';
|
|
|
|
|
|
/** Migration that switches `Router.navigateByUrl` and `Router.createUrlTree` to a new signature. */
|
|
export default function(): Rule {
|
|
return (tree: Tree) => {
|
|
const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);
|
|
const basePath = process.cwd();
|
|
const allPaths = [...buildPaths, ...testPaths];
|
|
|
|
if (!allPaths.length) {
|
|
throw new SchematicsException(
|
|
'Could not find any tsconfig file. Cannot migrate ' +
|
|
'Router.navigateByUrl and Router.createUrlTree calls.');
|
|
}
|
|
|
|
for (const tsconfigPath of allPaths) {
|
|
runNavigationExtrasOmissionsMigration(tree, tsconfigPath, basePath);
|
|
}
|
|
};
|
|
}
|
|
|
|
function runNavigationExtrasOmissionsMigration(tree: Tree, tsconfigPath: string, basePath: string) {
|
|
const {program} = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
const typeChecker = program.getTypeChecker();
|
|
const printer = ts.createPrinter();
|
|
const sourceFiles = program.getSourceFiles().filter(
|
|
f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
|
|
|
|
sourceFiles.forEach(sourceFile => {
|
|
const literalsToMigrate = findLiteralsToMigrate(sourceFile, typeChecker);
|
|
const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
|
|
literalsToMigrate.forEach((instances, methodName) => instances.forEach(instance => {
|
|
const migratedNode = migrateLiteral(methodName, instance);
|
|
|
|
if (migratedNode !== instance) {
|
|
update.remove(instance.getStart(), instance.getWidth());
|
|
update.insertRight(
|
|
instance.getStart(),
|
|
printer.printNode(ts.EmitHint.Unspecified, migratedNode, sourceFile));
|
|
}
|
|
}));
|
|
|
|
tree.commitUpdate(update);
|
|
});
|
|
}
|