hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-29 18:55:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

TS: Remove unneeded alias PackageLocationMap

Browse Source
This commit is contained in:
Asger Feldthaus
2020-01-24 09:51:03 +00:00
parent 542ce816dc
commit 804aef507f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/extractor/lib/typescript/src/common.ts
View File

@@ -14,8 +14,13 @@ export class Project {
private host: ts.CompilerHost;
private resolutionCache: ts.ModuleResolutionCache;
constructor(public tsConfig: string, public config: ts.ParsedCommandLine, public typeTable: TypeTable, public packageLocations: PackageLocationMap,
constructor(
public tsConfig: string,
public config: ts.ParsedCommandLine,
public typeTable: TypeTable,
public packageEntryPoints: Map<string, string>,
public virtualSourceRoot: VirtualSourceRoot) {
this.resolveModuleNames = this.resolveModuleNames.bind(this);
this.resolutionCache = ts.createModuleResolutionCache(pathlib.dirname(tsConfig), ts.sys.realpath, config.options);
@@ -75,7 +80,7 @@ export class Project {
let packageName = packageNameMatch[0];
// Get the overridden location of this package, if one exists.
let packageEntryPoint = this.packageLocations.get(packageName);
let packageEntryPoint = this.packageEntryPoints.get(packageName);
if (packageEntryPoint == null) {
// The package is not overridden, but we have established that it begins with a valid package name.
// Do a lookup in the virtual source root (where dependencies are installed) by changing the 'containing file'.
@@ -116,5 +121,3 @@ export class Project {
return null;
}
}
export type PackageLocationMap = Map<string, string>;

2
javascript/extractor/lib/typescript/src/main.ts
View File

@@ -37,7 +37,7 @@ import * as readline from "readline";
import * as ts from "./typescript";
import * as ast_extractor from "./ast_extractor";
import { Project, PackageLocationMap } from "./common";
import { Project } from "./common";
import { TypeTable } from "./type_table";
import { VirtualSourceRoot } from "./virtual_source_root";