Merge pull request microsoft#8469 from Microsoft/tsconfigParsingImprovements

paulvanbrenk · paulvanbrenk · commit fad25747a715 · 2016-05-06T13:33:01.000-07:00
Add propertybag to parsed tsconfig.json file.
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -667,6 +667,7 @@ namespace ts {
         const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
         const options = extend(existingOptions, compilerOptions);
         const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+
         options.configFilePath = configFileName;
 
         const fileNames = getFileNames(errors);
@@ -675,6 +676,7 @@ namespace ts {
             options,
             fileNames,
             typingOptions,
+            raw: json,
             errors
         };
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2596,6 +2596,7 @@ namespace ts {
         options: CompilerOptions;
         typingOptions?: TypingOptions;
         fileNames: string[];
+        raw?: any;
         errors: Diagnostic[];
     }
 
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -1001,6 +1001,7 @@ namespace ts {
                             options: {},
                             typingOptions: {},
                             files: [],
+                            raw: {},
                             errors: [realizeDiagnostic(result.error, "\r\n")]
                         };
                     }
@@ -1012,6 +1013,7 @@ namespace ts {
                         options: configFile.options,
                         typingOptions: configFile.typingOptions,
                         files: configFile.fileNames,
+                        raw: configFile.raw,
                         errors: realizeDiagnostics(configFile.errors, "\r\n")
                     };
                 });

Original file line number	Diff line number	Diff line change
`@@ -2596,6 +2596,7 @@ namespace ts {`
`2596`	`2596`	`options: CompilerOptions;`
`2597`	`2597`	`typingOptions?: TypingOptions;`
`2598`	`2598`	`fileNames: string[];`
	`2599`	`+ raw?: any;`
`2599`	`2600`	`errors: Diagnostic[];`
`2600`	`2601`	`}`
`2601`	`2602`