fix(typescript) latest version of typescript expects package.json to be passed in in the initial file set

Author: basarat

dist/main/lang/projectService.js

@@ -46,7 +46,8 @@ var building = require('./modules/building');
 function build(query) {
     projectCache_1.consistentPath(query);
     var proj = projectCache_1.getOrCreateProject(query.filePath);
-    var filesToEmit = proj.projectFile.project.compilerOptions.out ? [proj.projectFile.project.files[0]] : proj.projectFile.project.files;
+    var filesToEmit = proj.projectFile.project.files.filter(function (fte) { return !fte.toLowerCase().endsWith('.json'); });
+    filesToEmit = proj.projectFile.project.compilerOptions.out ? [filesToEmit[0]] : filesToEmit;
     var totalCount = filesToEmit.length;
     var builtCount = 0;
     var errorCount = 0;

dist/main/tsconfig/tsconfig.js

@@ -261,6 +261,7 @@ function getProjectSync(pathOrSrcFile) {
     var typings = getDefinitionsForNodeModules(dir, project.files);
     project.files = project.files.concat(typings.implicit);
     project.typings = typings.ours.concat(typings.implicit);
+    project.files = project.files.concat(typings.packagejson);
     project.files = uniq(project.files.map(fsu.consistentPath));
     projectFileDirectory = removeTrailingSlash(fsu.consistentPath(projectFileDirectory));
     return {
@@ -343,6 +344,7 @@ function increaseProjectForReferenceAndImports(files) {
     return files;
 }
 function getDefinitionsForNodeModules(projectDir, files) {
+    var packagejson = [];
     function versionStringToNumber(version) {
         var _a = version.split('.'), maj = _a[0], min = _a[1], patch = _a[2];
         return parseInt(maj) * 1000000 + parseInt(min);
@@ -383,6 +385,7 @@ function getDefinitionsForNodeModules(projectDir, files) {
             var moduleDir = moduleDirs[_i];
             try {
                 var package_json = JSON.parse(fs.readFileSync(moduleDir + "/package.json").toString());
+                packagejson.push(moduleDir + "/package.json");
             }
             catch (ex) {
                 continue;
@@ -411,7 +414,7 @@ function getDefinitionsForNodeModules(projectDir, files) {
         .filter(function (x) { return !existing[x]; });
     var ours = all
         .filter(function (x) { return existing[x]; });
-    return { implicit: implicit, ours: ours };
+    return { implicit: implicit, ours: ours, packagejson: packagejson };
 }
 function prettyJSON(object) {
     var cache = [];

lib/globals.ts

@@ -183,4 +183,5 @@ interface FileDependency {
 /** Provided by the atom team */
 interface String {
     startsWith(str: string): boolean;
+    endsWith(str: string): boolean;
 }

lib/main/lang/projectService.ts

@@ -102,8 +102,9 @@ export function build(query: BuildQuery): Promise<BuildResponse> {
     consistentPath(query);
     var proj = getOrCreateProject(query.filePath);
 
-    /** I am assuming ther was at least one file. How else would we even get here? */
-    let filesToEmit = proj.projectFile.project.compilerOptions.out ? [proj.projectFile.project.files[0]] : proj.projectFile.project.files;
+    let filesToEmit = proj.projectFile.project.files.filter(fte => !fte.toLowerCase().endsWith('.json'));
+    /** I am assuming there was at least one file. How else would we even get here? */
+    filesToEmit = proj.projectFile.project.compilerOptions.out ? [filesToEmit[0]] : filesToEmit;
 
     let totalCount = filesToEmit.length;
     var builtCount = 0;

lib/main/tsconfig/tsconfig.ts

@@ -449,6 +449,7 @@ export function getProjectSync(pathOrSrcFile: string): TypeScriptProjectFileDeta
     var typings = getDefinitionsForNodeModules(dir, project.files);
     project.files = project.files.concat(typings.implicit);
     project.typings = typings.ours.concat(typings.implicit);
+    project.files = project.files.concat(typings.packagejson);
 
     // Normalize to "/" for all files
     // And take the uniq values
@@ -575,8 +576,9 @@ interface Typings {
  *  We will expand on files making sure that we don't have a `typing` with the same name
  *  Also if two node_modules reference a similar sub project (and also recursively) then the one with latest `version` field wins
  */
-function getDefinitionsForNodeModules(projectDir: string, files: string[]): { ours: string[]; implicit: string[] } {
-
+function getDefinitionsForNodeModules(projectDir: string, files: string[]): { ours: string[]; implicit: string[], packagejson: string[] } {
+    let packagejson = [];
+    
     /** TODO use later when we care about versions */
     function versionStringToNumber(version: string): number {
         var [maj, min, patch] = version.split('.');
@@ -636,6 +638,7 @@ function getDefinitionsForNodeModules(projectDir: string, files: string[]): { ou
         for (let moduleDir of moduleDirs) {
             try {
                 var package_json = JSON.parse(fs.readFileSync(`${moduleDir}/package.json`).toString());
+                packagejson.push(`${moduleDir}/package.json`);
             }
             catch (ex) {
                 // Can't read package.json ... no worries ... move on to other modules
@@ -674,7 +677,7 @@ function getDefinitionsForNodeModules(projectDir: string, files: string[]): { ou
     var ours = all
         .filter(x=> existing[x]);
 
-    return { implicit, ours };
+    return { implicit, ours, packagejson };
 }
 
 export function prettyJSON(object: any): string {