Merge pull request microsoft#8284 from Microsoft/Fix8271

mhegazy · mhegazy · commit 59d1f1f8ab6e · 2016-04-25T14:17:51.000-07:00
Fix microsoft#8271: Add `undefined` type to index signatures
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2513,14 +2513,14 @@ namespace ts {
         types?: string[];
 
         list?: string[];
-        [option: string]: CompilerOptionsValue;
+        [option: string]: CompilerOptionsValue | undefined;
     }
 
     export interface TypingOptions {
         enableAutoDiscovery?: boolean;
         include?: string[];
         exclude?: string[];
-        [option: string]: string[] | boolean;
+        [option: string]: string[] | boolean | undefined;
     }
 
     export interface DiscoverTypingsInfo {
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1027,7 +1027,7 @@ namespace ts {
         getScriptFileNames(): string[];
         getScriptKind?(fileName: string): ScriptKind;
         getScriptVersion(fileName: string): string;
-        getScriptSnapshot(fileName: string): IScriptSnapshot;
+        getScriptSnapshot(fileName: string): IScriptSnapshot | undefined;
         getLocalizedDiagnosticMessages?(): any;
         getCancellationToken?(): HostCancellationToken;
         getCurrentDirectory(): string;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
@@ -55,7 +55,7 @@ export function delint(sourceFile: ts.SourceFile) {
     }
 }
 
-const fileNames = process.argv.slice(2);
+const fileNames: string[] = process.argv.slice(2);
 fileNames.forEach(fileName => {
     // Parse a file
     let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
@@ -19,7 +19,7 @@ function printError(error: ts.Diagnostic): void {
     console.log(`${error.file && error.file.fileName}: ${error.messageText}`);
 }
 
-export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program {
+export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program | undefined {
     const { config, error } = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson)
     if (error) {
         printError(error);
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
@@ -8,7 +8,13 @@
 
 declare var process: any;
 declare var console: any;
-declare var fs: any;
+declare var fs: {
+    existsSync(path: string): boolean;
+    readdirSync(path: string): string[];
+    readFileSync(filename: string, encoding?: string): string;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: { mtime: Date }, prev: { mtime: Date }) => void): void;
+};
 declare var path: any;
 
 import * as ts from "typescript";
diff --git a/tests/cases/compiler/APISample_compile.ts b/tests/cases/compiler/APISample_compile.ts
@@ -1,6 +1,7 @@
 ﻿// @module: commonjs
 // @includebuiltfile: typescript_standalone.d.ts
-// @stripInternal:true
+// @noImplicitAny:true
+// @strictNullChecks:true
 
 /*
  * Note: This test is a public API sample. The sample sources can be found 
diff --git a/tests/cases/compiler/APISample_linter.ts b/tests/cases/compiler/APISample_linter.ts
@@ -1,6 +1,7 @@
 ﻿// @module: commonjs
 // @includebuiltfile: typescript_standalone.d.ts
-// @stripInternal:true
+// @noImplicitAny:true
+// @strictNullChecks:true
 
 /*
  * Note: This test is a public API sample. The sample sources can be found 
@@ -57,7 +58,7 @@ export function delint(sourceFile: ts.SourceFile) {
     }
 }
 
-const fileNames = process.argv.slice(2);
+const fileNames: string[] = process.argv.slice(2);
 fileNames.forEach(fileName => {
     // Parse a file
     let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /*setParentNodes */ true);
diff --git a/tests/cases/compiler/APISample_parseConfig.ts b/tests/cases/compiler/APISample_parseConfig.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @includebuiltfile: typescript_standalone.d.ts
-// @stripInternal:true
+// @noImplicitAny:true
+// @strictNullChecks:true
 
 /*
  * Note: This test is a public API sample. The sample sources can be found 
@@ -21,7 +22,7 @@ function printError(error: ts.Diagnostic): void {
     console.log(`${error.file && error.file.fileName}: ${error.messageText}`);
 }
 
-export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program {
+export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program | undefined {
     const { config, error } = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson)
     if (error) {
         printError(error);
diff --git a/tests/cases/compiler/APISample_transform.ts b/tests/cases/compiler/APISample_transform.ts
@@ -1,6 +1,7 @@
 ﻿// @module: commonjs
 // @includebuiltfile: typescript_standalone.d.ts
-// @stripInternal:true
+// @noImplicitAny:true
+// @strictNullChecks:true
 
 /*
  * Note: This test is a public API sample. The sample sources can be found 
diff --git a/tests/cases/compiler/APISample_watcher.ts b/tests/cases/compiler/APISample_watcher.ts
@@ -1,6 +1,7 @@
 ﻿// @module: commonjs
 // @includebuiltfile: typescript_standalone.d.ts
-// @stripInternal:true
+// @noImplicitAny:true
+// @strictNullChecks:true
 
 /*
  * Note: This test is a public API sample. The sample sources can be found 
@@ -10,7 +11,13 @@
 
 declare var process: any;
 declare var console: any;
-declare var fs: any;
+declare var fs: {
+    existsSync(path: string): boolean;
+    readdirSync(path: string): string[];
+    readFileSync(filename: string, encoding?: string): string;
+    writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
+    watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: { mtime: Date }, prev: { mtime: Date }) => void): void;
+};
 declare var path: any;
 
 import * as ts from "typescript";

Original file line number	Diff line number	Diff line change
`@@ -2513,14 +2513,14 @@ namespace ts {`
`2513`	`2513`	`types?: string[];`
`2514`	`2514`
`2515`	`2515`	`list?: string[];`
`2516`		`- [option: string]: CompilerOptionsValue;`
	`2516`	`+ [option: string]: CompilerOptionsValue \| undefined;`
`2517`	`2517`	`}`
`2518`	`2518`
`2519`	`2519`	`export interface TypingOptions {`
`2520`	`2520`	`enableAutoDiscovery?: boolean;`
`2521`	`2521`	`include?: string[];`
`2522`	`2522`	`exclude?: string[];`
`2523`		`- [option: string]: string[] \| boolean;`
	`2523`	`+ [option: string]: string[] \| boolean \| undefined;`
`2524`	`2524`	`}`
`2525`	`2525`
`2526`	`2526`	`export interface DiscoverTypingsInfo {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ export function delint(sourceFile: ts.SourceFile) {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-const fileNames = process.argv.slice(2);`
	`58`	`+const fileNames: string[] = process.argv.slice(2);`
`59`	`59`	`fileNames.forEach(fileName => {`
`60`	`60`	`// Parse a file`
`61`	`61`	`let sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES6, /setParentNodes / true);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function printError(error: ts.Diagnostic): void {`
`19`	`19`	console.log(`${error.file && error.file.fileName}: ${error.messageText}`);
`20`	`20`	`}`
`21`	`21`
`22`		`-export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program {`
	`22`	`+export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program \| undefined {`
`23`	`23`	`const { config, error } = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson)`
`24`	`24`	`if (error) {`
`25`	`25`	`printError(error);`