Always return empty object when converting the json sourcefile into actual json object, allowing to continue compilation even if there are errors in the tsconfig files

sheetalkamat · sheetalkamat · commit 7db76edbae80 · 2017-05-30T11:37:26.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -874,7 +874,7 @@ namespace ts {
             text = readFile(fileName);
         }
         catch (e) {
-            return { error: createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
+            return { config: {}, error: createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
         }
         return parseConfigFileTextToJson(fileName, text);
     }
@@ -1011,10 +1011,7 @@ namespace ts {
         knownRootOptions: Map<CommandLineOption> | undefined,
         jsonConversionNotifier: JsonConversionNotifier | undefined): any {
         if (!sourceFile.jsonObject) {
-            if (sourceFile.endOfFileToken) {
-                return {};
-            }
-            return undefined;
+            return {};
         }
 
         return convertObjectLiteralExpressionToJson(sourceFile.jsonObject, knownRootOptions,
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -225,17 +225,11 @@ namespace ts {
 
             const result = parseJsonText(configFileName, cachedConfigFileText);
             reportDiagnostics(result.parseDiagnostics, /* compilerHost */ undefined);
-            if (!result.endOfFileToken) {
-                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
-                return;
-            }
+
             const cwd = sys.getCurrentDirectory();
             const configParseResult = parseJsonSourceFileConfigFileContent(result, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), cwd), commandLine.options, getNormalizedAbsolutePath(configFileName, cwd));
-            if (configParseResult.errors.length > 0) {
-                reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
-                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
-                return;
-            }
+            reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
+
             if (isWatchSet(configParseResult.options)) {
                 if (!sys.watchFile) {
                     reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* host */ undefined);
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -222,16 +222,9 @@ class ProjectRunner extends RunnerBase {
                     readFile
                 };
                 const configParseResult = ts.parseJsonSourceFileConfigFileContent(result, configParseHost, ts.getDirectoryPath(configFileName), compilerOptions);
-                if (configParseResult.errors.length > 0) {
-                    return {
-                        configFileSourceFiles,
-                        moduleKind,
-                        errors: result.parseDiagnostics.concat(configParseResult.errors)
-                    };
-                }
                 inputFiles = configParseResult.fileNames;
                 compilerOptions = configParseResult.options;
-                errors = result.parseDiagnostics;
+                errors = result.parseDiagnostics.concat(configParseResult.errors);
             }
 
             const projectCompilerResult = compileProjectFiles(moduleKind, configFileSourceFiles, () => inputFiles, getSourceFileText, writeFile, compilerOptions);
diff --git a/src/harness/unittests/tsconfigParsing.ts b/src/harness/unittests/tsconfigParsing.ts
@@ -10,7 +10,7 @@ namespace ts {
 
         function assertParseError(jsonText: string) {
              const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
-             assert.isTrue(undefined === parsed.config);
+             assert.deepEqual(parsed.config, {});
              assert.isTrue(undefined !== parsed.error);
         }
 
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
@@ -76,7 +76,7 @@ namespace ts.JsTyping {
 
         if (!safeList) {
             const result = readConfigFile(safeListPath, (path: string) => host.readFile(path));
-            safeList = result.config ? createMapFromTemplate<string>(result.config) : EmptySafeList;
+            safeList = createMapFromTemplate<string>(result.config);
         }
 
         const filesToWatch: string[] = [];
@@ -163,20 +163,18 @@ namespace ts.JsTyping {
                 filesToWatch.push(jsonPath);
             }
             const result = readConfigFile(jsonPath, (path: string) => host.readFile(path));
-            if (result.config) {
-                const jsonConfig: PackageJson = result.config;
-                if (jsonConfig.dependencies) {
-                    mergeTypings(getOwnKeys(jsonConfig.dependencies));
-                }
-                if (jsonConfig.devDependencies) {
-                    mergeTypings(getOwnKeys(jsonConfig.devDependencies));
-                }
-                if (jsonConfig.optionalDependencies) {
-                    mergeTypings(getOwnKeys(jsonConfig.optionalDependencies));
-                }
-                if (jsonConfig.peerDependencies) {
-                    mergeTypings(getOwnKeys(jsonConfig.peerDependencies));
-                }
+            const jsonConfig: PackageJson = result.config;
+            if (jsonConfig.dependencies) {
+                mergeTypings(getOwnKeys(jsonConfig.dependencies));
+            }
+            if (jsonConfig.devDependencies) {
+                mergeTypings(getOwnKeys(jsonConfig.devDependencies));
+            }
+            if (jsonConfig.optionalDependencies) {
+                mergeTypings(getOwnKeys(jsonConfig.optionalDependencies));
+            }
+            if (jsonConfig.peerDependencies) {
+                mergeTypings(getOwnKeys(jsonConfig.peerDependencies));
             }
         }
 
@@ -222,9 +220,6 @@ namespace ts.JsTyping {
                     continue;
                 }
                 const result = readConfigFile(normalizedFileName, (path: string) => host.readFile(path));
-                if (!result.config) {
-                    continue;
-                }
                 const packageJson: PackageJson = result.config;
 
                 // npm 3's package.json contains a "_requiredBy" field
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -1110,17 +1110,6 @@ namespace ts {
                     const text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
 
                     const result = parseJsonText(fileName, text);
-
-                    if (!result.endOfFileToken) {
-                        return {
-                            options: {},
-                            typeAcquisition: {},
-                            files: [],
-                            raw: {},
-                            errors: realizeDiagnostics(result.parseDiagnostics, "\r\n")
-                        };
-                    }
-
                     const normalizedFileName = normalizeSlashes(fileName);
                     const configFile = parseJsonSourceFileConfigFileContent(result, this.host, getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);
 
@@ -1248,4 +1237,4 @@ namespace TypeScript.Services {
 // TODO: it should be moved into a namespace though.
 
 /* @internal */
-const toolsVersion = "2.4";
+const toolsVersion = "2.4";

Original file line number	Diff line number	Diff line change
`@@ -874,7 +874,7 @@ namespace ts {`
`874`	`874`	`text = readFile(fileName);`
`875`	`875`	`}`
`876`	`876`	`catch (e) {`
`877`		`- return { error: createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };`
	`877`	`+ return { config: {}, error: createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };`
`878`	`878`	`}`
`879`	`879`	`return parseConfigFileTextToJson(fileName, text);`
`880`	`880`	`}`
`@@ -1011,10 +1011,7 @@ namespace ts {`
`1011`	`1011`	`knownRootOptions: Map<CommandLineOption> \| undefined,`
`1012`	`1012`	`jsonConversionNotifier: JsonConversionNotifier \| undefined): any {`
`1013`	`1013`	`if (!sourceFile.jsonObject) {`
`1014`		`- if (sourceFile.endOfFileToken) {`
`1015`		`- return {};`
`1016`		`- }`
`1017`		`- return undefined;`
	`1014`	`+ return {};`
`1018`	`1015`	`}`
`1019`	`1016`
`1020`	`1017`	`return convertObjectLiteralExpressionToJson(sourceFile.jsonObject, knownRootOptions,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace ts {`
`10`	`10`
`11`	`11`	`function assertParseError(jsonText: string) {`
`12`	`12`	`const parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);`
`13`		`- assert.isTrue(undefined === parsed.config);`
	`13`	`+ assert.deepEqual(parsed.config, {});`
`14`	`14`	`assert.isTrue(undefined !== parsed.error);`
`15`	`15`	`}`
`16`	`16`