merge with master, accept baselines

Author: vladima

.gitattributes

@@ -0,0 +1 @@
+*.js linguist-language=TypeScript

.travis.yml

@@ -3,14 +3,4 @@ language: node_js
 node_js:
   - '0.10'
 
-sudo: false
-
-before_script: 
-  - npm install -g codeclimate-test-reporter
-
-after_script:
-  - cat coverage/lcov.info | codeclimate
-
-addons:
-  code_climate:
-    repo_token: 9852ac5362c8cc38c07ca5adc0f94c20c6c79bd78e17933dc284598a65338656
+sudo: false

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Design changes will not be accepted at this time. If you have a design change pr
 ## Legal
 You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
 
-Please submit a Contributor License Agreement (CLA) before submitting a pull request. Download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features.
+Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features.
 
 ## Housekeeping
 Your pull request should: 

Jakefile

@@ -3,6 +3,7 @@
 var fs = require("fs");
 var os = require("os");
 var path = require("path");
+var child_process = require("child_process");
 
 // Variables
 var compilerDirectory = "src/compiler/";
@@ -25,8 +26,7 @@ var thirdParty = "ThirdPartyNoticeText.txt";
 var nodeModulesPathPrefix = path.resolve("./node_modules/.bin/") + path.delimiter;
 if (process.env.path !== undefined) {
    process.env.path = nodeModulesPathPrefix + process.env.path;
-} 
-else if (process.env.PATH !== undefined) {
+} else if (process.env.PATH !== undefined) {
    process.env.PATH = nodeModulesPathPrefix + process.env.PATH;
 }
 
@@ -203,8 +203,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
 var useDebugMode = true;
 var host = (process.env.host || process.env.TYPESCRIPT_HOST || "node");
 var compilerFilename = "tsc.js";
-
-   /* Compiles a file from a list of sources
+/* Compiles a file from a list of sources
     * @param outFile: the target file name
     * @param sources: an array of the names of the source files
     * @param prereqs: prerequisite tasks to compiling the file
@@ -215,9 +214,8 @@ var compilerFilename = "tsc.js";
     * @param outDir: true to compile using --outDir
     * @param keepComments: false to compile using --removeComments
     * @param callback: a function to execute after the compilation process ends
-    * @async
     */
-    function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
+function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
     file(outFile, prereqs, function() {
         var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory;
         var options = "--module commonjs -noImplicitAny";
@@ -254,11 +252,21 @@ var compilerFilename = "tsc.js";
             options += " --stripInternal"
         }
 
+        options += " --cacheDownlevelForOfLength --preserveNewLines";
+
         var cmd = host + " " + dir + compilerFilename + " " + options + " ";
         cmd = cmd + sources.join(" ");
+        console.log(cmd + "\n");
 
-        exec(cmd, function() {
-            console.log("")
+        var ex = jake.createExec([cmd]);
+        // Add listeners for output and error
+        ex.addListener("stdout", function(output) {
+            process.stdout.write(output);
+        });
+        ex.addListener("stderr", function(error) {
+            process.stderr.write(error);
+        });
+        ex.addListener("cmdEnd", function() {
             if (!useDebugMode && prefixes && fs.existsSync(outFile)) {
                 for (var i in prefixes) {
                     prependFile(prefixes[i], outFile);
@@ -268,14 +276,14 @@ var compilerFilename = "tsc.js";
             if (callback) {
                 callback();
             }
-            else {
-                complete();
-            }
-        }, /* errorHandler */ function() {
+
+            complete();
+        });
+        ex.addListener("error", function() {
             fs.unlinkSync(outFile);
             fail("Compilation of " + outFile + " unsuccessful");
         });
-
+        ex.run();
     }, {async: true});
 }
 
@@ -318,8 +326,19 @@ compileFile(processDiagnosticMessagesJs,
 // The generated diagnostics map; built for the compiler and for the 'generate-diagnostics' task
 file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], function () {
     var cmd = "node " + processDiagnosticMessagesJs + " "  + diagnosticMessagesJson;
-
-    exec(cmd);
+    console.log(cmd);
+    var ex = jake.createExec([cmd]);
+    // Add listeners for output and error
+    ex.addListener("stdout", function(output) {
+        process.stdout.write(output);
+    });
+    ex.addListener("stderr", function(error) {
+        process.stderr.write(error);
+    });
+    ex.addListener("cmdEnd", function() {
+        complete();
+    });
+    ex.run();
 }, {async: true})
 
 desc("Generates a diagnostic file in TypeScript based on an input JSON file");
@@ -384,7 +403,6 @@ compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright
 
                 // Delete the temp dir
                 jake.rmRf(tempDirPath, {silent: true});
-                complete();
            });
 
 var serverFile = path.join(builtLocalDirectory, "tsserver.js");
@@ -433,8 +451,10 @@ compileFile(word2mdJs,
 file(specMd, [word2mdJs, specWord], function () {
     var specWordFullPath = path.resolve(specWord);
     var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + specMd;
-
-    exec(cmd);
+    console.log(cmd);
+    child_process.exec(cmd, function () {
+        complete();
+    });
 }, {async: true})
 
 
@@ -485,24 +505,22 @@ var refTest262Baseline = path.join(internalTests, "baselines/test262/reference")
 desc("Builds the test infrastructure using the built compiler");
 task("tests", ["local", run].concat(libraryTargets));
 
-/* Executes a command
- * @param cmd: command to execute
- * @param completeHandler?: a function to execute after the command ends
- * @param errorHandler?: a function to execute if an error occurs
- * @async
- */
-function exec(cmd, completeHandler, errorHandler) {
-    console.log(cmd);
-    var ex = jake.createExec([cmd], {windowsVerbatimArguments: true, interactive: true});
+function exec(cmd, completeHandler) {
+    var ex = jake.createExec([cmd], {windowsVerbatimArguments: true});
+    // Add listeners for output and error
+    ex.addListener("stdout", function(output) {
+        process.stdout.write(output);
+    });
+    ex.addListener("stderr", function(error) {
+        process.stderr.write(error);
+    });
     ex.addListener("cmdEnd", function() {
         if (completeHandler) {
             completeHandler();
         }
-        else {
-            complete();
-        }
+        complete();
     });
-    ex.addListener("error", errorHandler || function(e, status) {
+    ex.addListener("error", function(e, status) {
         fail("Process exited with code " + status);
     })
 
@@ -521,7 +539,7 @@ function cleanTestDirs() {
     }
 
     jake.mkdirP(localRwcBaseline);
-    jake.mkdirP(localTest262Baseline);
+	jake.mkdirP(localTest262Baseline);
     jake.mkdirP(localBaseline);
 }
 
@@ -532,14 +550,10 @@ function writeTestConfigFile(tests, testConfigFile) {
     fs.writeFileSync('test.config', testConfigContents);
 }
 
-/* Removes project output
- * @async
- */
 function deleteTemporaryProjectOutput() {
     if (fs.existsSync(path.join(localBaseline, "projectOutput/"))) {
         jake.rmRf(path.join(localBaseline, "projectOutput/"));
     }
-    complete();
 }
 
 var testTimeout = 20000;
@@ -568,14 +582,14 @@ task("runtests", ["tests", builtLocalDirectory], function() {
     // timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
     // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
     var cmd = host + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
-
+    console.log(cmd);
     exec(cmd, deleteTemporaryProjectOutput);
 }, {async: true});
 
 desc("Generates code coverage data via instanbul")
 task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
     var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run;
-
+    console.log(cmd);
     exec(cmd);
 }, { async: true });
 
@@ -607,6 +621,7 @@ task("runtests-browser", ["tests", "browserify", builtLocalDirectory], function(
 
     tests = tests ? tests : '';
     var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests
+    console.log(cmd);
     exec(cmd);
 }, {async: true});
 
@@ -622,12 +637,14 @@ function getDiffTool() {
 desc("Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable");
 task('diff', function () {
     var cmd = '"' +  getDiffTool()  + '" ' + refBaseline + ' ' + localBaseline;
+    console.log(cmd)
     exec(cmd);
 }, {async: true});
 
 desc("Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable");
 task('diff-rwc', function () {
     var cmd = '"' +  getDiffTool()  + '" ' + refRwcBaseline + ' ' + localRwcBaseline;
+    console.log(cmd)
     exec(cmd);
 }, {async: true});
 
@@ -674,6 +691,13 @@ task("webhost", [webhostJsPath], function() {
     jake.cpR(path.join(builtLocalDirectory, "lib.d.ts"), "tests/webhost/", {silent: true});
 });
 
+// Perf compiler
+var perftscPath = "tests/perftsc.ts";
+var perftscJsPath = "built/local/perftsc.js";
+compileFile(perftscJsPath, [perftscPath], [tscFile, perftscPath, "tests/perfsys.ts"].concat(libraryTargets), [], /*useBuiltCompiler*/ true);
+desc("Builds augmented version of the compiler for perf tests");
+task("perftsc", [perftscJsPath]);
+
 // Instrumented compiler
 var loggedIOpath = harnessDirectory + 'loggedIO.ts';
 var loggedIOJsPath = builtLocalDirectory + 'loggedIO.js';
@@ -682,12 +706,14 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
     jake.mkdirP(temp);
     var options = "--outdir " + temp + ' ' + loggedIOpath;
     var cmd = host + " " + LKGDirectory + compilerFilename + " " + options + " ";
-
-    exec(cmd, function() {
+    console.log(cmd + "\n");
+    var ex = jake.createExec([cmd]);
+    ex.addListener("cmdEnd", function() {
         fs.renameSync(temp + '/harness/loggedIO.js', loggedIOJsPath);
         jake.rmRf(temp);
         complete();
     });
+    ex.run();
 }, {async: true});
 
 var instrumenterPath = harnessDirectory + 'instrumenter.ts';
@@ -697,6 +723,10 @@ compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath],
 desc("Builds an instrumented tsc.js");
 task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {
     var cmd = host + ' ' + instrumenterJsPath + ' record iocapture ' + builtLocalDirectory + compilerFilename;
-
-    exec(cmd);
+    console.log(cmd);
+    var ex = jake.createExec([cmd]);
+    ex.addListener("cmdEnd", function() {
+        complete();
+    });
+    ex.run();
 }, { async: true });

bin/lib.core.d.ts

@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {

bin/lib.core.es6.d.ts

@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {