maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update runInstall

Browse source
This commit is contained in:
Jason Ramsay 2016-08-31 21:14:24 -07:00
parent 48736dea20
commit 3a993c89f3
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/checker.ts
View file

@ -18627,6 +18627,9 @@ namespace ts {
continue;
}
const file = host.getSourceFile(resolvedDirective.resolvedFileName);
if (!file) {
continue;
}
fileToDirective.set(file.path, key);
}
}

36
src/server/typingsInstaller/nodeTypingsInstaller.ts
View file

@ -93,13 +93,11 @@ namespace ts.server.typingsInstaller {
const id = this.installRunCount;
this.installRunCount++;
let execInstallCmdCount = 0;
const installedTypings: string[] = [];
const expr = /^.*(@types\/\w+)\S*\s*$/gm;
let match: RegExpExecArray;
let filteredTypings: string[] = [];
for (const typing of typingsToInstall) {
const command = `npm install @types/${typing} --save-dev`;
const command = `npm view @types/${typing} --silent name`;
if (this.log.isEnabled()) {
this.log.writeLine(`Running npm install @types ${id}, command '${command}'. cache path '${cachePath}'`);
this.log.writeLine(`Running npm view @types ${id}, command '${command}'.`);
}
this.exec(command, { cwd: cachePath }, (err, stdout, stderr) => {
execInstallCmdCount++;
@ -107,11 +105,33 @@ namespace ts.server.typingsInstaller {
this.log.writeLine(`npm install @types ${id} stdout: ${stdout}`);
this.log.writeLine(`npm install @types ${id} stderr: ${stderr}`);
}
while (match = expr.exec(stdout)) {
installedTypings.push(`node_modules/${match[1]}`);
if (stdout !== "") {
filteredTypings.push(typing);
}
if (execInstallCmdCount >= typingsToInstall.length) {
postInstallAction(installedTypings);
const command = `npm install ${filteredTypings.map(t => "@types/" + t).join(" ")} --save-dev -json`;
if (this.log.isEnabled()) {
this.log.writeLine(`Running npm install @types ${id}, command '${command}'. cache path '${cachePath}'`);
}
this.exec(command, { cwd: cachePath }, (err, stdout, stderr) => {
if (this.log.isEnabled()) {
this.log.writeLine(`npm install @types ${id} stdout: ${stdout}`);
this.log.writeLine(`npm install @types ${id} stderr: ${stderr}`);
}
const installedTypings: string[] = [];
try {
const response = JSON.parse(stdout);
if (response.dependencies) {
for (const typing in response.dependencies) {
installedTypings.push(typing);
}
}
}
catch (e) {
this.log.writeLine(`Error parsing installed @types dependencies. Error details: ${e.message}`);
}
postInstallAction(installedTypings);
});
}
});
}

4
src/server/typingsInstaller/typingsInstaller.ts
View file

@ -26,7 +26,6 @@ namespace ts.server.typingsInstaller {
private packageNameToTypingLocation: Map<string> = createMap<string>();
private missingTypingsSet: Map<true> = createMap<true>();
private knownCachesSet: Map<true> = createMap<true>();
private projectWatchers: Map<FileWatcher[]> = createMap<FileWatcher[]>();
abstract readonly installTypingHost: InstallTypingHost;
@ -203,6 +202,9 @@ namespace ts.server.typingsInstaller {
if (!typingFile) {
continue;
}
if (!this.packageNameToTypingLocation[packageName]) {
this.packageNameToTypingLocation[packageName] = typingFile;
}
installedTypingFiles.push(typingFile);
}
if (this.log.isEnabled()) {