ES6 typings

.gitignore

@@ -11,6 +11,7 @@ tests/cases/*/*/*.js.map
 tests/cases/*/*/*/*.js.map
 tests/cases/*/*/*/*/*.js.map
 tests/cases/rwc/*
+tests/cases/test262/*
 tests/cases/perf/*
 !tests/cases/webharness/compilerToString.js
 test-args.txt
@@ -19,6 +20,7 @@ tests/baselines/local/*
 tests/services/baselines/local/*
 tests/baselines/prototyping/local/*
 tests/baselines/rwc/*
+tests/baselines/test262/*
 tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
 scripts/processDiagnosticMessages.d.ts

Jakefile

@@ -78,6 +78,7 @@ var harnessSources = [
  "projectsRunner.ts",
  "loggedIO.ts",
  "rwcRunner.ts",
+ "test262Runner.ts",
  "runner.ts"
 ].map(function (f) {
  return path.join(harnessDirectory, f);
@@ -91,10 +92,12 @@ var harnessSources = [
 
 var librarySourceMap = [
  { target: "lib.core.d.ts", sources: ["core.d.ts"] },
- { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "dom.generated.d.ts"], },
- { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "webworker.generated.d.ts"], },
+ { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
+ { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "extensions.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
  { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], },
- { target: "lib.d.ts", sources: ["core.d.ts", "extensions.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
+ { target: "lib.d.ts", sources: ["core.d.ts", "extensions.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
+ { target: "lib.core.es6.d.ts", sources: ["core.d.ts", "es6.d.ts"]},
+ { target: "lib.es6.d.ts", sources: ["core.d.ts", "es6.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"]},
 ];
 
 var libraryTargets = librarySourceMap.map(function (f) {
@@ -341,6 +344,9 @@ var refBaseline = "tests/baselines/reference/";
 var localRwcBaseline = "tests/baselines/rwc/local/";
 var refRwcBaseline = "tests/baselines/rwc/reference/";
 
+var localTest262Baseline = "tests/baselines/test262/local/";
+var refTest262Baseline = "tests/baselines/test262/reference/";
+
 desc("Builds the test infrastructure using the built compiler");
 task("tests", ["local", run].concat(libraryTargets));
 
@@ -509,6 +515,12 @@ task("baseline-accept-rwc", function() {
  fs.renameSync(localRwcBaseline, refRwcBaseline);
 });
 
+desc("Makes the most recent test262 test results the new baseline, overwriting the old baseline");
+task("baseline-accept-test262", function() {
+ jake.rmRf(refTest262Baseline);
+ fs.renameSync(localTest262Baseline, refTest262Baseline);
+});
+
 
 // Webhost
 var webhostPath = "tests/webhost/webtsc.ts";

src/compiler/parser.ts

@@ -5452,7 +5452,7 @@ module ts {
 
  forEach(rootNames, name => processRootFile(name, false));
  if (!seenNoDefaultLib) {
- processRootFile(host.getDefaultLibFilename(), true);
+ processRootFile(host.getDefaultLibFilename(options), true);
  }
  verifyCompilerOptions();
  errors.sort(compareDiagnostics);
@@ -5496,7 +5496,7 @@ module ts {
  }
  var diagnostic: DiagnosticMessage;
  if (hasExtension(filename)) {
- if (!fileExtensionIs(filename, ".ts")) {
+ if (!options.allowNonTsExtensions && !fileExtensionIs(filename, ".ts")) {
  diagnostic = Diagnostics.File_0_must_have_extension_ts_or_d_ts;
  }
  else if (!findSourceFile(filename, isDefaultLib, refFile, refPos, refEnd)) {

src/compiler/tsc.ts

@@ -193,7 +193,7 @@ module ts {
 
  return {
  getSourceFile,
- getDefaultLibFilename: () => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), "lib.d.ts"),
+ getDefaultLibFilename: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts"),
  writeFile,
  getCurrentDirectory: () => currentDirectory || (currentDirectory = sys.getCurrentDirectory()),
  useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,

src/compiler/types.ts

@@ -1306,6 +1306,7 @@ module ts {
  version?: boolean;
  watch?: boolean;
  preserveConstEnums?: boolean;
+ allowNonTsExtensions?: boolean;
  [option: string]: string | number | boolean;
  }
 
@@ -1487,7 +1488,7 @@ module ts {
 
  export interface CompilerHost {
  getSourceFile(filename: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
- getDefaultLibFilename(): string;
+ getDefaultLibFilename(options: CompilerOptions): string;
  getCancellationToken? (): CancellationToken;
  writeFile(filename: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
  getCurrentDirectory(): string;

src/harness/compilerRunner.ts

@@ -113,10 +113,7 @@ class CompilerBaselineRunner extends RunnerBase {
  for (var i = 0; i < tcSettings.length; ++i) {
  // noImplicitAny is passed to getCompiler, but target is just passed in the settings blob to setCompilerSettings
  if (!createNewInstance && (tcSettings[i].flag == "noimplicitany" || tcSettings[i].flag === 'target')) {
- harnessCompiler = Harness.Compiler.getCompiler({
- useExistingInstance: false,
- optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: tcSettings[i].flag === "noimplicitany" }
- });
+ harnessCompiler = Harness.Compiler.getCompiler();
  harnessCompiler.setCompilerSettings(tcSettings);
  createNewInstance = true;
  }
@@ -125,10 +122,7 @@ class CompilerBaselineRunner extends RunnerBase {
 
  afterEach(() => {
  if (createNewInstance) {
- harnessCompiler = Harness.Compiler.getCompiler({
- useExistingInstance: false,
- optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
- });
+ harnessCompiler = Harness.Compiler.getCompiler();
  createNewInstance = false;
  }
  });
@@ -323,10 +317,7 @@ class CompilerBaselineRunner extends RunnerBase {
 
  public initializeTests() {
  describe("Setup compiler for compiler baselines", () => {
- var harnessCompiler = Harness.Compiler.getCompiler({
- useExistingInstance: false,
- optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
- });
+ var harnessCompiler = Harness.Compiler.getCompiler();
  this.parseOptions();
  });
 
@@ -343,10 +334,7 @@ class CompilerBaselineRunner extends RunnerBase {
  }
 
  describe("Cleanup after compiler baselines", () => {
- var harnessCompiler = Harness.Compiler.getCompiler({
- useExistingInstance: false,
- optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
- });
+ var harnessCompiler = Harness.Compiler.getCompiler();
  });
  }
 

src/harness/fourslashRunner.ts

@@ -15,10 +15,6 @@ class FourslashRunner extends RunnerBase {
  }
 
  describe("fourslash tests", () => {
- before(() => {
- Harness.Compiler.getCompiler({ useExistingInstance: false });
- });
-
  this.tests.forEach((fn: string) => {
  fn = ts.normalizeSlashes(fn);
  var justName = fn.replace(/^.*[\\\/]/, '');
@@ -33,10 +29,6 @@ class FourslashRunner extends RunnerBase {
  });
  }
  });
-
- after(() => {
- Harness.Compiler.getCompiler({ useExistingInstance: false });
- });
  });
 
  describe('Generate Tao XML', () => {

src/harness/harness.ts

@@ -1,3 +1,4 @@
+
 //
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // 
@@ -538,6 +539,8 @@ module Harness {
 
  export var defaultLibFileName = 'lib.d.ts';
  export var defaultLibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0");
+ export var defaultES6LibSourceFile = ts.createSourceFile(defaultLibFileName, IO.readFile(libFolder + 'lib.core.es6.d.ts'), /*languageVersion*/ ts.ScriptTarget.Latest, /*version:*/ "0");
+
 
  // Cache these between executions so we don't have to re-parse them for every test
  export var fourslashFilename = 'fourslash.ts';
@@ -580,15 +583,14 @@ module Harness {
  return fourslashSourceFile;
  }
  else {
- var lib = defaultLibFileName;
  if (fn === defaultLibFileName) {
- return defaultLibSourceFile;
+ return languageVersion === ts.ScriptTarget.ES6 ? defaultES6LibSourceFile : defaultLibSourceFile;
  }
  // Don't throw here -- the compiler might be looking for a test that actually doesn't exist as part of the TC
  return undefined;
  }
  },
- getDefaultLibFilename: () => defaultLibFileName,
+ getDefaultLibFilename: options => defaultLibFileName,
  writeFile,
  getCanonicalFileName,
  useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
@@ -1016,27 +1018,38 @@ module Harness {
  sys.newLine + sys.newLine + outputLines.join('\r\n');
  }
 
- /* TODO: Delete?
- export function makeDefaultCompilerSettings(options?: { useMinimalDefaultLib: boolean; noImplicitAny: boolean; }) {
- var useMinimalDefaultLib = options ? options.useMinimalDefaultLib : true;
- var noImplicitAny = options ? options.noImplicitAny : false;
- var settings = new TypeScript.CompilationSettings();
- settings.codeGenTarget = TypeScript.LanguageVersion.EcmaScript5;
- settings.moduleGenTarget = TypeScript.ModuleGenTarget.Synchronous;
- settings.noLib = useMinimalDefaultLib;
- settings.noResolve = false;
- settings.noImplicitAny = noImplicitAny;
- return settings;
+ export function collateOutputs(outputFiles: Harness.Compiler.GeneratedFile[], clean?: (s: string) => string) {
+ // Collect, test, and sort the filenames
+ function cleanName(fn: string) {
+ var lastSlash = ts.normalizeSlashes(fn).lastIndexOf('/');
+ return fn.substr(lastSlash + 1).toLowerCase();
+ }
+ outputFiles.sort((a, b) => cleanName(a.fileName).localeCompare(cleanName(b.fileName)));
+
+ // Emit them
+ var result = '';
+ ts.forEach(outputFiles, outputFile => {
+ // Some extra spacing if this isn't the first file
+ if (result.length) result = result + '\r\n\r\n';
+
+ // Filename header + content
+ result = result + '/*====== ' + outputFile.fileName + ' ======*/\r\n';
+ if (clean) {
+ result = result + clean(outputFile.code);
+ } else {
+ result = result + outputFile.code;
+ }
+ });
+ return result;
  }
- */
 
  /** The harness' compiler instance used when tests are actually run. Reseting or changing settings of this compiler instance must be done within a test case (i.e., describe/it) */
  var harnessCompiler: HarnessCompiler;
 
  /** Returns the singleton harness compiler instance for generating and running tests.
  If required a fresh compiler instance will be created, otherwise the existing singleton will be re-used.
  */
- export function getCompiler(opts?: { useExistingInstance: boolean; optionsForFreshInstance?: { useMinimalDefaultLib: boolean; noImplicitAny: boolean; } }) {
+ export function getCompiler() {
  return harnessCompiler = harnessCompiler || new HarnessCompiler();
  }
 

src/harness/projectsRunner.ts

@@ -171,7 +171,7 @@ class ProjectRunner extends RunnerBase {
  function getSourceFile(filename: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
  var sourceFile: ts.SourceFile = undefined;
  if (filename === Harness.Compiler.defaultLibFileName) {
- sourceFile = Harness.Compiler.defaultLibSourceFile;
+ sourceFile = languageVersion === ts.ScriptTarget.ES6 ? Harness.Compiler.defaultES6LibSourceFile : Harness.Compiler.defaultLibSourceFile;
  }
  else {
  var text = getSourceFileText(filename);
@@ -186,7 +186,7 @@ class ProjectRunner extends RunnerBase {
  function createCompilerHost(): ts.CompilerHost {
  return {
  getSourceFile,
- getDefaultLibFilename: () => "lib.d.ts",
+ getDefaultLibFilename: options => options.target === ts.ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts",
  writeFile,
  getCurrentDirectory,
  getCanonicalFileName: Harness.Compiler.getCanonicalFileName,

src/harness/runner.ts

@@ -13,9 +13,9 @@
 // limitations under the License.
 //
 
+/// <reference path='test262Runner.ts' />
 /// <reference path='compilerRunner.ts' />
-// TODO: re-enable
-// ///<reference path='fourslashRunner.ts' />
+/// <reference path='fourslashRunner.ts' />
 /// <reference path='projectsRunner.ts' />
 /// <reference path='rwcRunner.ts' />
 
@@ -69,6 +69,9 @@ if (testConfigFile !== '') {
  case 'rwc':
  runners.push(new RWCRunner());
  break;
+ case 'test262':
+ runners.push(new Test262BaselineRunner());
+ break;
  case 'reverse':
  reverse = true;
  break;

src/harness/rwcRunner.ts

@@ -20,31 +20,6 @@ module RWC {
  }
  }
 
- function collateOutputs(outputFiles: Harness.Compiler.GeneratedFile[], clean?: (s: string) => string) {
- // Collect, test, and sort the filenames
- function cleanName(fn: string) {
- var lastSlash = ts.normalizeSlashes(fn).lastIndexOf('/');
- return fn.substr(lastSlash + 1).toLowerCase();
- }
- outputFiles.sort((a, b) => cleanName(a.fileName).localeCompare(cleanName(b.fileName)));
-
- // Emit them
- var result = '';
- ts.forEach(outputFiles, outputFile => {
- // Some extra spacing if this isn't the first file
- if (result.length) result = result + '\r\n\r\n';
-
- // Filename header + content
- result = result + '/*====== ' + outputFile.fileName + ' ======*/\r\n';
- if (clean) {
- result = result + clean(outputFile.code);
- } else {
- result = result + outputFile.code;
- }
- });
- return result;
- }
-
  export function runRWCTest(jsonPath: string) {
  describe("Testing a RWC project: " + jsonPath, () => {
  var inputFiles: { unitName: string; content: string; }[] = [];
@@ -136,7 +111,7 @@ module RWC {
 
  it('has the expected emitted code', () => {
  Harness.Baseline.runBaseline('has the expected emitted code', baseName + '.output.js', () => {
- return collateOutputs(compilerResult.files, s => SyntacticCleaner.clean(s));
+ return Harness.Compiler.collateOutputs(compilerResult.files, s => SyntacticCleaner.clean(s));
  }, false, baselineOpts);
  });
 
@@ -145,7 +120,7 @@ module RWC {
  if (compilerResult.errors.length || !compilerResult.declFilesCode.length) {
  return null;
  }
- return collateOutputs(compilerResult.declFilesCode);
+ return Harness.Compiler.collateOutputs(compilerResult.declFilesCode);
  }, false, baselineOpts);
  });
 
@@ -155,7 +130,7 @@ module RWC {
  return null;
  }
 
- return collateOutputs(compilerResult.sourceMaps);
+ return Harness.Compiler.collateOutputs(compilerResult.sourceMaps);
  }, false, baselineOpts);
  });