diff --git a/.gitignore b/.gitignore index 548f1e3979..8fc575c216 100644 --- a/.gitignore +++ b/.gitignore @@ -29,8 +29,9 @@ Properties !_infrastructure/tests/*/*.js !_infrastructure/tests/*/*/*.js !_infrastructure/tests/*/*/*/*.js - -.idea -*.iml - -node_modules + +.idea +*.iml +*.js.map + +node_modules diff --git a/_infrastructure/tests/_ref.d.ts b/_infrastructure/tests/_ref.d.ts index 1743cad05c..5a0809f3b8 100644 --- a/_infrastructure/tests/_ref.d.ts +++ b/_infrastructure/tests/_ref.d.ts @@ -1 +1 @@ -/// +/// diff --git a/_infrastructure/tests/runner.js b/_infrastructure/tests/runner.js index 1a7c4fc987..b11be80a39 100644 --- a/_infrastructure/tests/runner.js +++ b/_infrastructure/tests/runner.js @@ -1,53 +1,41 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +var DT; +(function (DT) { + 'use strict'; -var ExecResult = (function () { - function ExecResult() { - this.stdout = ""; - this.stderr = ""; - } - return ExecResult; -})(); + var Promise = require('bluebird'); + var nodeExec = require('child_process').exec; -var NodeExec = (function () { - function NodeExec() { - } - NodeExec.prototype.exec = function (filename, cmdLineArgs, handleResult) { - var nodeExec = require('child_process').exec; + var ExecResult = (function () { + function ExecResult() { + this.stdout = ''; + this.stderr = ''; + } + return ExecResult; + })(); + DT.ExecResult = ExecResult; - var result = new ExecResult(); - result.exitCode = null; - var cmdLine = filename + ' ' + cmdLineArgs.join(' '); + function exec(filename, cmdLineArgs) { + return new Promise(function (resolve) { + var result = new ExecResult(); + result.exitCode = null; - var process = nodeExec(cmdLine, { maxBuffer: 1 * 1024 * 1024 }, function (error, stdout, stderr) { - result.stdout = stdout; - result.stderr = stderr; - result.exitCode = error ? error.code : 0; - handleResult(result); + var cmdLine = filename + ' ' + cmdLineArgs.join(' '); + + nodeExec(cmdLine, { maxBuffer: 1 * 1024 * 1024 }, function (error, stdout, stderr) { + result.error = error; + result.stdout = stdout; + result.stderr = stderr; + result.exitCode = error ? error.code : 0; + resolve(result); + }); }); - }; - return NodeExec; -})(); - -var Exec = function () { - return new NodeExec(); -}(); + } + DT.exec = exec; +})(DT || (DT = {})); /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; var path = require('path'); @@ -58,6 +46,7 @@ var DT; var File = (function () { function File(baseDir, filePathWithName) { this.references = []; + // why choose? this.baseDir = baseDir; this.filePathWithName = filePathWithName; this.ext = path.extname(this.filePathWithName); @@ -65,7 +54,7 @@ var DT; this.dir = path.dirname(this.filePathWithName); this.formatName = path.join(this.dir, this.file + this.ext); this.fullPath = path.join(this.baseDir, this.dir, this.file + this.ext); - // lock it (shallow) + // lock it (shallow) (needs `use strict` in each file to work) // Object.freeze(this); } File.prototype.toString = function () { @@ -75,43 +64,44 @@ var DT; })(); DT.File = File; })(DT || (DT = {})); -/// -/// -/// +/// +/// +/// var DT; (function (DT) { - 'use-strict'; + 'use strict'; + var fs = require('fs'); + var Promise = require('bluebird'); + var Tsc = (function () { function Tsc() { } - Tsc.run = function (tsfile, options, callback) { - options = options || {}; - options.tscVersion = options.tscVersion || DT.DEFAULT_TSC_VERSION; - if (typeof options.checkNoImplicitAny === "undefined") { - options.checkNoImplicitAny = true; - } - if (typeof options.useTscParams === "undefined") { - options.useTscParams = true; - } - - if (!fs.existsSync(tsfile)) { - throw new Error(tsfile + " not exists"); - } - - var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js'; - if (!fs.existsSync(tscPath)) { - throw new Error(tscPath + ' is not exists'); - } - var command = 'node ' + tscPath + ' --module commonjs '; - if (options.useTscParams && fs.existsSync(tsfile + '.tscparams')) { - command += '@' + tsfile + '.tscparams'; - } else if (options.checkNoImplicitAny) { - command += '--noImplicitAny'; - } - Exec.exec(command, [tsfile], function (execResult) { - callback(execResult); + Tsc.run = function (tsfile, options) { + return Promise.attempt(function () { + options = options || {}; + options.tscVersion = options.tscVersion || DT.DEFAULT_TSC_VERSION; + if (typeof options.checkNoImplicitAny === 'undefined') { + options.checkNoImplicitAny = true; + } + if (typeof options.useTscParams === 'undefined') { + options.useTscParams = true; + } + if (!fs.existsSync(tsfile)) { + throw new Error(tsfile + ' not exists'); + } + var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js'; + if (!fs.existsSync(tscPath)) { + throw new Error(tscPath + ' is not exists'); + } + var command = 'node ' + tscPath + ' --module commonjs '; + if (options.useTscParams && fs.existsSync(tsfile + '.tscparams')) { + command += '@' + tsfile + '.tscparams'; + } else if (options.checkNoImplicitAny) { + command += '--noImplicitAny'; + } + return DT.exec(command, [tsfile]); }); }; return Tsc; @@ -122,7 +112,7 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; ///////////////////////////////// // Timer.start starts a timer @@ -154,7 +144,7 @@ var DT; return null; } - return (day_diff == 0 && (diff < 60 && (diff + " seconds") || diff < 120 && "1 minute" || diff < 3600 && Math.floor(diff / 60) + " minutes" || diff < 7200 && "1 hour" || diff < 86400 && Math.floor(diff / 3600) + " hours") || day_diff == 1 && "Yesterday" || day_diff < 7 && day_diff + " days" || day_diff < 31 && Math.ceil(day_diff / 7) + " weeks"); + return (day_diff == 0 && (diff < 60 && (diff + ' seconds') || diff < 120 && '1 minute' || diff < 3600 && Math.floor(diff / 60) + ' minutes' || diff < 7200 && '1 hour' || diff < 86400 && Math.floor(diff / 3600) + ' hours') || day_diff == 1 && 'Yesterday' || day_diff < 7 && day_diff + ' days' || day_diff < 31 && Math.ceil(day_diff / 7) + ' weeks'); }; return Timer; })(); @@ -163,7 +153,11 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; + + var fs = require('fs'); + var Lazy = require('lazy.js'); + var Promise = require('bluebird'); var referenceTagExp = //g; @@ -189,32 +183,37 @@ var DT; return ret; } DT.extractReferenceTags = extractReferenceTags; + + function fileExists(target) { + return new Promise(function (resolve, reject) { + fs.exists(target, function (bool) { + resolve(bool); + }); + }); + } + DT.fileExists = fileExists; })(DT || (DT = {})); /// /// /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; var fs = require('fs'); var path = require('path'); + var Lazy = require('lazy.js'); + var Promise = require('bluebird'); + var readFile = Promise.promisify(fs.readFile); + + ///////////////////////////////// + // Track all files in the repo: map full path to File objects + ///////////////////////////////// var FileIndex = (function () { function FileIndex(options) { this.options = options; } - FileIndex.prototype.parseFiles = function (files, callback) { - var _this = this; - this.fileMap = Object.create(null); - files.forEach(function (file) { - _this.fileMap[file.fullPath] = file; - }); - this.loadReferences(files, function () { - callback(); - }); - }; - FileIndex.prototype.hasFile = function (target) { return target in this.fileMap; }; @@ -226,42 +225,54 @@ var DT; return null; }; - FileIndex.prototype.loadReferences = function (files, callback) { + FileIndex.prototype.parseFiles = function (files) { var _this = this; - var queue = files.slice(0); - var active = []; - var max = 50; - var next = function () { - if (queue.length === 0 && active.length === 0) { - callback(); - return; - } - - while (queue.length > 0 && active.length < max) { - var file = queue.pop(); - active.push(file); - _this.parseFile(file, function (file) { - active.splice(active.indexOf(file), 1); - next(); - }); - } - }; - process.nextTick(next); + return Promise.attempt(function () { + _this.fileMap = Object.create(null); + files.forEach(function (file) { + _this.fileMap[file.fullPath] = file; + }); + return _this.loadReferences(files); + }); }; - FileIndex.prototype.parseFile = function (file, callback) { + FileIndex.prototype.loadReferences = function (files) { var _this = this; - fs.readFile(file.filePathWithName, { + return new Promise(function (resolve, reject) { + var queue = files.slice(0); + var active = []; + var max = 50; + var next = function () { + if (queue.length === 0 && active.length === 0) { + resolve(); + return; + } + + while (queue.length > 0 && active.length < max) { + var file = queue.pop(); + active.push(file); + _this.parseFile(file).then(function (file) { + active.splice(active.indexOf(file), 1); + next(); + }).catch(function (err) { + queue = []; + active = []; + reject(err); + }); + } + }; + next(); + }); + }; + + // TODO replace with a stream? + FileIndex.prototype.parseFile = function (file) { + var _this = this; + return readFile(file.filePathWithName, { encoding: 'utf8', flag: 'r' - }, function (err, content) { - if (err) { - throw err; - } - - // console.log('----'); - // console.log(file.filePathWithName); - file.references = DT.extractReferenceTags(content).map(function (ref) { + }).then(function (content) { + file.references = Lazy(DT.extractReferenceTags(content)).map(function (ref) { return path.resolve(path.dirname(file.fullPath), ref); }).reduce(function (memo, ref) { if (ref in _this.fileMap) { @@ -272,8 +283,8 @@ var DT; return memo; }, []); - // console.log(file.references); - callback(file); + // return the object + return file; }); }; return FileIndex; @@ -283,11 +294,12 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; var fs = require('fs'); var path = require('path'); var Git = require('git-wrapper'); + var Promise = require('bluebird'); var GitChanges = (function () { function GitChanges(baseDir) { @@ -299,22 +311,16 @@ var DT; throw new Error('cannot locate git-dir: ' + dir); } this.options['git-dir'] = dir; + + this.git = new Git(this.options); + this.git.exec = Promise.promisify(this.git.exec); } - GitChanges.prototype.getChanges = function (callback) { + GitChanges.prototype.getChanges = function () { var _this = this; - //git diff --name-only HEAD~1 - var git = new Git(this.options); var opts = {}; var args = ['--name-only HEAD~1']; - git.exec('diff', opts, args, function (err, msg) { - if (err) { - callback(err); - return; - } + return this.git.exec('diff', opts, args).then(function (msg) { _this.paths = msg.replace(/^\s+/, '').replace(/\s+$/, '').split(/\r?\n/g); - - // console.log(paths); - callback(null); }); }; return GitChanges; @@ -325,19 +331,20 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; - ///////////////////////////////// - // All the common things that we pring are functions of this class + // All the common things that we print are functions of this class ///////////////////////////////// var Print = (function () { - function Print(version, typings, tests, tsFiles) { + function Print(version) { this.version = version; + this.WIDTH = 77; + } + Print.prototype.init = function (typings, tests, tsFiles) { this.typings = typings; this.tests = tests; this.tsFiles = tsFiles; - this.WIDTH = 77; - } + }; + Print.prototype.out = function (s) { process.stdout.write(s); return this; @@ -347,9 +354,15 @@ var DT; return new Array(times + 1).join(s); }; + Print.prototype.printChangeHeader = function () { + this.out('=============================================================================\n'); + this.out(' \33[36m\33[1mDefinitelyTyped Diff Detector 0.1.0\33[0m \n'); + this.out('=============================================================================\n'); + }; + Print.prototype.printHeader = function () { this.out('=============================================================================\n'); - this.out(' \33[36m\33[1mDefinitelyTyped test runner 0.4.0\33[0m\n'); + this.out(' \33[36m\33[1mDefinitelyTyped Test Runner 0.5.0\33[0m\n'); this.out('=============================================================================\n'); this.out(' \33[36m\33[1mTypescript version:\33[0m ' + this.version + '\n'); this.out(' \33[36m\33[1mTypings :\33[0m ' + this.typings + '\n'); @@ -360,9 +373,9 @@ var DT; Print.prototype.printSuiteHeader = function (title) { var left = Math.floor((this.WIDTH - title.length) / 2) - 1; var right = Math.ceil((this.WIDTH - title.length) / 2) - 1; - this.out(this.repeat("=", left)).out(" \33[34m\33[1m"); + this.out(this.repeat('=', left)).out(' \33[34m\33[1m'); this.out(title); - this.out("\33[0m ").out(this.repeat("=", right)).printBreak(); + this.out('\33[0m ').out(this.repeat('=', right)).printBreak(); }; Print.prototype.printDiv = function () { @@ -390,16 +403,18 @@ var DT; }; Print.prototype.clearCurrentLine = function () { - this.out("\r\33[K"); + this.out('\r\33[K'); return this; }; Print.prototype.printSuccessCount = function (current, total) { - this.out(' \33[36m\33[1mSuccessful :\33[0m \33[32m\33[1m' + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + var arb = (total === 0) ? 0 : (current / total); + this.out(' \33[36m\33[1mSuccessful :\33[0m \33[32m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); }; Print.prototype.printFailedCount = function (current, total) { - this.out(' \33[36m\33[1mFailure :\33[0m \33[31m\33[1m' + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + var arb = (total === 0) ? 0 : (current / total); + this.out(' \33[36m\33[1mFailure :\33[0m \33[31m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); }; Print.prototype.printTypingsWithoutTestsMessage = function () { @@ -414,10 +429,31 @@ var DT; this.out(' \33[36m\33[1mElapsed time :\33[0m ~' + time + ' (' + s + 's)\n'); }; - Print.prototype.printSuiteErrorCount = function (errorHeadline, current, total, valuesColor) { - if (typeof valuesColor === "undefined") { valuesColor = '\33[31m\33[1m'; } + Print.prototype.printSuiteErrorCount = function (errorHeadline, current, total, warn) { + if (typeof warn === "undefined") { warn = false; } + var arb = (total === 0) ? 0 : (current / total); this.out(' \33[36m\33[1m').out(errorHeadline).out(this.repeat(' ', 16 - errorHeadline.length)); - this.out(':\33[0m ' + valuesColor + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + if (warn) { + this.out(': \33[31m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + } else { + this.out(': \33[33m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + } + }; + + Print.prototype.printSubHeader = function (file) { + this.out(' \33[36m\33[1m' + file + '\33[0m\n'); + }; + + Print.prototype.printLine = function (file) { + this.out(file + '\n'); + }; + + Print.prototype.printElement = function (file) { + this.out(' - ' + file + '\n'); + }; + + Print.prototype.printElement2 = function (file) { + this.out(' - ' + file + '\n'); }; Print.prototype.printTypingsWithoutTestName = function (file) { @@ -443,8 +479,6 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; - ///////////////////////////////// @@ -461,7 +495,7 @@ var DT; }; DefaultTestReporter.prototype.printNegativeCharacter = function (index, testResult) { - this.print.out("x"); + this.print.out('x'); this.printBreakIfNeeded(index); }; @@ -478,7 +512,9 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; + + var Promise = require('bluebird'); @@ -495,42 +531,31 @@ var DT; this.printErrorCount = true; } TestSuiteBase.prototype.filterTargetFiles = function (files) { - throw new Error("please implement this method"); + throw new Error('please implement this method'); }; - TestSuiteBase.prototype.start = function (targetFiles, testCallback, suiteCallback) { + TestSuiteBase.prototype.start = function (targetFiles, testCallback) { var _this = this; - targetFiles = this.filterTargetFiles(targetFiles); this.timer.start(); - var count = 0; - - // exec test is async process. serialize. - var executor = function () { - var targetFile = targetFiles[count]; - if (targetFile) { - _this.runTest(targetFile, function (result) { + return this.filterTargetFiles(targetFiles).then(function (targetFiles) { + return Promise.reduce(targetFiles, function (count, targetFile) { + return _this.runTest(targetFile).then(function (result) { testCallback(result, count + 1); - count++; - executor(); + return count++; }); - } else { - _this.timer.end(); - _this.finish(suiteCallback); - } - }; - executor(); - }; - - TestSuiteBase.prototype.runTest = function (targetFile, callback) { - var _this = this; - new DT.Test(this, targetFile, { tscVersion: this.options.tscVersion }).run(function (result) { - _this.testResults.push(result); - callback(result); + }, 0); + }).then(function (count) { + _this.timer.end(); + return _this; }); }; - TestSuiteBase.prototype.finish = function (suiteCallback) { - suiteCallback(this); + TestSuiteBase.prototype.runTest = function (targetFile) { + var _this = this; + return new DT.Test(this, targetFile, { tscVersion: this.options.tscVersion }).run().then(function (result) { + _this.testResults.push(result); + return result; + }); }; Object.defineProperty(TestSuiteBase.prototype, "okTests", { @@ -566,7 +591,11 @@ var __extends = this.__extends || function (d, b) { }; var DT; (function (DT) { - 'use-strict'; + 'use strict'; + + var Promise = require('bluebird'); + + var endDts = /.ts$/i; ///////////////////////////////// // .d.ts syntax inspection @@ -574,12 +603,12 @@ var DT; var SyntaxChecking = (function (_super) { __extends(SyntaxChecking, _super); function SyntaxChecking(options) { - _super.call(this, options, "Syntax checking", "Syntax error"); + _super.call(this, options, 'Syntax checking', 'Syntax error'); } SyntaxChecking.prototype.filterTargetFiles = function (files) { - return files.filter(function (file) { - return DT.endsWith(file.formatName.toUpperCase(), '.D.TS'); - }); + return Promise.cast(files.filter(function (file) { + return endDts.test(file.formatName); + })); }; return SyntaxChecking; })(DT.TestSuiteBase); @@ -589,7 +618,11 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; + 'use strict'; + + var Promise = require('bluebird'); + + var endTestDts = /-test.ts$/i; ///////////////////////////////// // Compile with *-tests.ts @@ -597,24 +630,25 @@ var DT; var TestEval = (function (_super) { __extends(TestEval, _super); function TestEval(options) { - _super.call(this, options, "Typing tests", "Failed tests"); + _super.call(this, options, 'Typing tests', 'Failed tests'); } TestEval.prototype.filterTargetFiles = function (files) { - return files.filter(function (file) { - return DT.endsWith(file.formatName.toUpperCase(), '-TESTS.TS'); - }); + return Promise.cast(files.filter(function (file) { + return endTestDts.test(file.formatName); + })); }; return TestEval; })(DT.TestSuiteBase); DT.TestEval = TestEval; })(DT || (DT = {})); -/// -/// +/// +/// var DT; (function (DT) { - 'use-strict'; + 'use strict'; var fs = require('fs'); + var Promise = require('bluebird'); ///////////////////////////////// // Try compile without .tscparams @@ -624,7 +658,7 @@ var DT; __extends(FindNotRequiredTscparams, _super); function FindNotRequiredTscparams(options, print) { var _this = this; - _super.call(this, options, "Find not required .tscparams files", "New arrival!"); + _super.call(this, options, 'Find not required .tscparams files', 'New arrival!'); this.print = print; this.printErrorCount = false; @@ -637,29 +671,28 @@ var DT; }; } FindNotRequiredTscparams.prototype.filterTargetFiles = function (files) { - return files.filter(function (file) { - return fs.existsSync(file.filePathWithName + '.tscparams'); + return Promise.filter(files, function (file) { + return new Promise(function (resolve) { + fs.exists(file.filePathWithName + '.tscparams', resolve); + }); }); }; - FindNotRequiredTscparams.prototype.runTest = function (targetFile, callback) { + FindNotRequiredTscparams.prototype.runTest = function (targetFile) { var _this = this; this.print.clearCurrentLine().out(targetFile.formatName); - new DT.Test(this, targetFile, { + + return new DT.Test(this, targetFile, { tscVersion: this.options.tscVersion, useTscParams: false, checkNoImplicitAny: true - }).run(function (result) { + }).run().then(function (result) { _this.testResults.push(result); - callback(result); + _this.print.clearCurrentLine(); + return result; }); }; - FindNotRequiredTscparams.prototype.finish = function (suiteCallback) { - this.print.clearCurrentLine(); - suiteCallback(this); - }; - Object.defineProperty(FindNotRequiredTscparams.prototype, "ngTests", { get: function () { // Do not show ng test results @@ -672,8 +705,8 @@ var DT; })(DT.TestSuiteBase); DT.FindNotRequiredTscparams = FindNotRequiredTscparams; })(DT || (DT = {})); -/// -/// +/// +/// /// /// /// @@ -688,27 +721,33 @@ var DT; /// var DT; (function (DT) { - 'use-strict'; - require('source-map-support').install(); + // hacky typing + var Lazy = require('lazy.js'); + var Promise = require('bluebird'); + var fs = require('fs'); var path = require('path'); var glob = require('glob'); + var assert = require('assert'); var tsExp = /\.ts$/; - DT.DEFAULT_TSC_VERSION = "0.9.1.1"; + DT.DEFAULT_TSC_VERSION = '0.9.1.1'; + ///////////////////////////////// + // Single test + ///////////////////////////////// var Test = (function () { function Test(suite, tsfile, options) { this.suite = suite; this.tsfile = tsfile; this.options = options; } - Test.prototype.run = function (callback) { + Test.prototype.run = function () { var _this = this; - DT.Tsc.run(this.tsfile.filePathWithName, this.options, function (execResult) { + return DT.Tsc.run(this.tsfile.filePathWithName, this.options).then(function (execResult) { var testResult = new TestResult(); testResult.hostedBy = _this.suite; testResult.targetFile = _this.tsfile; @@ -718,7 +757,7 @@ var DT; testResult.stderr = execResult.stderr; testResult.exitCode = execResult.exitCode; - callback(testResult); + return testResult; }); }; return Test; @@ -745,12 +784,9 @@ var DT; ///////////////////////////////// // The main class to kick things off ///////////////////////////////// - // TODO move to bluebird (Promises) - // TODO move to lazy.js (functional) var TestRunner = (function () { function TestRunner(dtPath, options) { if (typeof options === "undefined") { options = { tscVersion: DT.DEFAULT_TSC_VERSION }; } - var _this = this; this.dtPath = dtPath; this.options = options; this.suites = []; @@ -758,28 +794,12 @@ var DT; this.index = new DT.FileIndex(this.options); this.changes = new DT.GitChanges(this.dtPath); - - // should be async (way faster) - // only includes .d.ts or -tests.ts or -test.ts or .ts - var filesName = glob.sync('**/*.ts', { cwd: dtPath }); - this.files = filesName.filter(function (fileName) { - return _this.checkAcceptFile(fileName); - }).sort().map(function (fileName) { - return new DT.File(dtPath, fileName); - }); + this.print = new DT.Print(this.options.tscVersion); } TestRunner.prototype.addSuite = function (suite) { this.suites.push(suite); }; - TestRunner.prototype.run = function () { - this.timer = new DT.Timer(); - this.timer.start(); - - // we need promises - this.doGetChanges(); - }; - TestRunner.prototype.checkAcceptFile = function (fileName) { var ok = tsExp.test(fileName); ok = ok && fileName.indexOf('_infrastructure') < 0; @@ -788,155 +808,181 @@ var DT; return ok; }; - TestRunner.prototype.doGetChanges = function () { + TestRunner.prototype.run = function () { var _this = this; - this.changes.getChanges(function (err) { - if (err) { - throw err; - } - console.log(''); - console.log('changes:'); - console.log('---'); + this.timer = new DT.Timer(); + this.timer.start(); - _this.changes.paths.forEach(function (file) { - console.log(file); + // only includes .d.ts or -tests.ts or -test.ts or .ts + return Promise.promisify(glob).call(glob, '**/*.ts', { + cwd: dtPath + }).then(function (filesNames) { + _this.files = Lazy(filesNames).filter(function (fileName) { + return _this.checkAcceptFile(fileName); + }).map(function (fileName) { + return new DT.File(dtPath, fileName); + }).toArray(); + + _this.print.printChangeHeader(); + + return Promise.all([ + _this.doParseFiles(), + _this.doGetChanges() + ]); + }).then(function () { + return _this.doCollectTargets(); + }).then(function (files) { + return _this.runTests(files); + }).then(function () { + return !_this.suites.some(function (suite) { + return suite.ngTests.length !== 0; }); - console.log('---'); - - // chain - _this.doGetReferences(); }); }; - TestRunner.prototype.doGetReferences = function () { - var _this = this; - this.index.parseFiles(this.files, function () { - console.log(''); - console.log('files:'); - console.log('---'); - _this.files.forEach(function (file) { - console.log(file.filePathWithName); - file.references.forEach(function (file) { - console.log(' - %s', file.filePathWithName); - }); + TestRunner.prototype.doParseFiles = function () { + return this.index.parseFiles(this.files).then(function () { + /* + this.print.printSubHeader('Files:'); + this.print.printDiv(); + this.files.forEach((file) => { + this.print.printLine(file.filePathWithName); + file.references.forEach((file) => { + this.print.printElement(file.filePathWithName); }); - console.log('---'); - + }); + this.print.printBreak();*/ // chain - _this.doCollectTargets(); - }); + }).thenReturn(); + }; + + TestRunner.prototype.doGetChanges = function () { + var _this = this; + return this.changes.getChanges().then(function () { + _this.print.printSubHeader('All changes'); + _this.print.printDiv(); + + Lazy(_this.changes.paths).each(function (file) { + _this.print.printLine(file); + }); + }).thenReturn(); }; TestRunner.prototype.doCollectTargets = function () { - // TODO clean this up when functional (do we need changeMap?) var _this = this; - // bake map for lookup - var changeMap = this.changes.paths.filter(function (full) { - return _this.checkAcceptFile(full); - }).map(function (local) { - return path.resolve(_this.dtPath, local); - }).reduce(function (memo, full) { - var file = _this.index.getFile(full); - if (!file) { - // what does it mean? deleted? - console.log('not in index: ' + full); - return memo; - } - memo[full] = file; - return memo; - }, Object.create(null)); + return new Promise(function (resolve) { + // bake map for lookup + var changeMap = Object.create(null); - // collect referring files (and also log) - var touched = Object.create(null); - console.log(''); - console.log('relevant changes:'); - console.log('---'); - Object.keys(changeMap).sort().forEach(function (src) { - touched[src] = changeMap[src]; - console.log(changeMap[src].formatName); - }); - console.log('---'); - - // terrible loop (whatever) - // just add stuff until there is nothing new added - // TODO improve it - var added; - do { - added = 0; - this.files.forEach(function (file) { - // lol getter - if (file.fullPath in touched) { + Lazy(_this.changes.paths).filter(function (full) { + return _this.checkAcceptFile(full); + }).map(function (local) { + return path.resolve(_this.dtPath, local); + }).each(function (full) { + var file = _this.index.getFile(full); + if (!file) { + // TODO figure out what to do here + // what does it mean? deleted? + console.log('not in index: ' + full); return; } - - // check if one of our references is touched - file.references.some(function (ref) { - if (ref.fullPath in touched) { - // add us - touched[file.fullPath] = file; - added++; - return true; - } - return false; - }); + changeMap[full] = file; }); - } while(added > 0); - console.log(''); - console.log('touched:'); - console.log('---'); - var files = Object.keys(touched).sort().map(function (src) { - console.log(touched[src].formatName); - return touched[src]; + _this.print.printDiv(); + _this.print.printSubHeader('Relevant changes'); + _this.print.printDiv(); + + Object.keys(changeMap).sort().forEach(function (src) { + _this.print.printLine(changeMap[src].formatName); + }); + + // terrible loop (whatever) + // just add stuff until there is nothing new added + // TODO improve it + var added; + var files = _this.files.slice(0); + do { + added = 0; + + for (var i = files.length - 1; i >= 0; i--) { + var file = files[i]; + if (file.fullPath in changeMap) { + _this.files.splice(i, 1); + continue; + } + + for (var j = 0, jj = file.references.length; j < jj; j++) { + if (file.references[j].fullPath in changeMap) { + // add us + changeMap[file.fullPath] = file; + added++; + break; + } + } + } + } while(added > 0); + + _this.print.printDiv(); + _this.print.printSubHeader('Reference mapped'); + _this.print.printDiv(); + + var result = Object.keys(changeMap).sort().map(function (src) { + _this.print.printLine(changeMap[src].formatName); + changeMap[src].references.forEach(function (file) { + _this.print.printElement(file.formatName); + }); + return changeMap[src]; + }); + resolve(result); }); - console.log('---'); - - this.runTests(files); }; TestRunner.prototype.runTests = function (files) { var _this = this; - var syntaxChecking = new DT.SyntaxChecking(this.options); - var testEval = new DT.TestEval(this.options); - if (!this.options.findNotRequiredTscparams) { - this.addSuite(syntaxChecking); - this.addSuite(testEval); - } + return Promise.attempt(function () { + assert(Array.isArray(files), 'files must be array'); - var typings = syntaxChecking.filterTargetFiles(files).length; - var testFiles = testEval.filterTargetFiles(files).length; + var syntaxChecking = new DT.SyntaxChecking(_this.options); + var testEval = new DT.TestEval(_this.options); - this.print = new DT.Print(this.options.tscVersion, typings, testFiles, files.length); - this.print.printHeader(); + if (!_this.options.findNotRequiredTscparams) { + _this.addSuite(syntaxChecking); + _this.addSuite(testEval); + } - if (this.options.findNotRequiredTscparams) { - this.addSuite(new DT.FindNotRequiredTscparams(this.options, this.print)); - } + return Promise.all([ + syntaxChecking.filterTargetFiles(files), + testEval.filterTargetFiles(files) + ]); + }).spread(function (syntaxFiles, testFiles) { + _this.print.init(syntaxFiles.length, testFiles.length, files.length); + _this.print.printHeader(); - var count = 0; - var executor = function () { - var suite = _this.suites[count]; - if (suite) { + if (_this.options.findNotRequiredTscparams) { + _this.addSuite(new DT.FindNotRequiredTscparams(_this.options, _this.print)); + } + + return Promise.reduce(_this.suites, function (count, suite) { suite.testReporter = suite.testReporter || new DT.DefaultTestReporter(_this.print); _this.print.printSuiteHeader(suite.testSuiteName); - var targetFiles = suite.filterTargetFiles(files); - suite.start(targetFiles, function (testResult, index) { - _this.testCompleteCallback(testResult, index); - }, function (suite) { - _this.suiteCompleteCallback(suite); - count++; - executor(); + return suite.filterTargetFiles(files).then(function (targetFiles) { + return suite.start(targetFiles, function (testResult, index) { + _this.printTestComplete(testResult, index); + }); + }).then(function (suite) { + _this.printSuiteComplete(suite); + return count++; }); - } else { - _this.timer.end(); - _this.allTestCompleteCallback(files); - } - }; - executor(); + }, 0); + }).then(function (count) { + _this.timer.end(); + _this.finaliseTests(files); + }); }; - TestRunner.prototype.testCompleteCallback = function (testResult, index) { + TestRunner.prototype.printTestComplete = function (testResult, index) { var reporter = testResult.hostedBy.testReporter; if (testResult.success) { reporter.printPositiveCharacter(index, testResult); @@ -945,7 +991,7 @@ var DT; } }; - TestRunner.prototype.suiteCompleteCallback = function (suite) { + TestRunner.prototype.printSuiteComplete = function (suite) { this.print.printBreak(); this.print.printDiv(); @@ -954,19 +1000,20 @@ var DT; this.print.printFailedCount(suite.ngTests.length, suite.testResults.length); }; - TestRunner.prototype.allTestCompleteCallback = function (files) { + TestRunner.prototype.finaliseTests = function (files) { var _this = this; - var testEval = this.suites.filter(function (suite) { + var testEval = Lazy(this.suites).filter(function (suite) { return suite instanceof DT.TestEval; - })[0]; + }).first(); + if (testEval) { - var existsTestTypings = testEval.testResults.map(function (testResult) { + var existsTestTypings = Lazy(testEval.testResults).map(function (testResult) { return testResult.targetFile.dir; }).reduce(function (a, b) { return a.indexOf(b) < 0 ? a.concat([b]) : a; }, []); - var typings = files.map(function (file) { + var typings = Lazy(files).map(function (file) { return file.dir; }).reduce(function (a, b) { return a.indexOf(b) < 0 ? a.concat([b]) : a; @@ -975,6 +1022,7 @@ var DT; var withoutTestTypings = typings.filter(function (typing) { return existsTestTypings.indexOf(typing) < 0; }); + this.print.printDiv(); this.print.printTypingsWithoutTest(withoutTestTypings); } @@ -991,10 +1039,11 @@ var DT; _this.print.printSuiteErrorCount(suite.errorHeadline, suite.ngTests.length, suite.testResults.length); }); if (testEval) { - this.print.printSuiteErrorCount("Without tests", withoutTestTypings.length, typings.length, '\33[33m\33[1m'); + this.print.printSuiteErrorCount('Without tests', withoutTestTypings.length, typings.length, true); } this.print.printDiv(); + if (this.suites.some(function (suite) { return suite.ngTests.length !== 0; })) { @@ -1008,8 +1057,6 @@ var DT; }); _this.print.printBoldDiv(); }); - - process.exit(1); } }; return TestRunner; @@ -1018,25 +1065,26 @@ var DT; var dtPath = path.resolve(path.dirname((module).filename), '..', '..'); var findNotRequiredTscparams = process.argv.some(function (arg) { - return arg == "--try-without-tscparams"; + return arg == '--try-without-tscparams'; }); - var tscVersionIndex = process.argv.indexOf("--tsc-version"); + var tscVersionIndex = process.argv.indexOf('--tsc-version'); var tscVersion = DT.DEFAULT_TSC_VERSION; - if (-1 < tscVersionIndex) { + + if (tscVersionIndex > -1) { tscVersion = process.argv[tscVersionIndex + 1]; } - console.log('--'); - console.log(' dtPath %s', dtPath); - console.log(' tscVersion %s', tscVersion); - console.log(' findNotRequiredTscparams %s', findNotRequiredTscparams); - console.log('--'); - console.log(''); - var runner = new TestRunner(dtPath, { tscVersion: tscVersion, findNotRequiredTscparams: findNotRequiredTscparams }); - runner.run(); + runner.run().then(function (success) { + if (!success) { + process.exit(1); + } + }).catch(function (err) { + throw err; + process.exit(2); + }); })(DT || (DT = {})); //# sourceMappingURL=runner.js.map diff --git a/_infrastructure/tests/runner.ts b/_infrastructure/tests/runner.ts index f2ca6a0592..4f3a4389c9 100644 --- a/_infrastructure/tests/runner.ts +++ b/_infrastructure/tests/runner.ts @@ -1,6 +1,6 @@ -/// +/// -/// +/// /// /// @@ -19,24 +19,30 @@ /// module DT { - 'use-strict'; - require('source-map-support').install(); + // hacky typing + var Lazy: LazyJS.LazyStatic = require('lazy.js'); + var Promise: typeof Promise = require('bluebird'); + var fs = require('fs'); var path = require('path'); var glob = require('glob'); + var assert = require('assert'); var tsExp = /\.ts$/; - export var DEFAULT_TSC_VERSION = "0.9.1.1"; + export var DEFAULT_TSC_VERSION = '0.9.1.1'; + ///////////////////////////////// + // Single test + ///////////////////////////////// export class Test { constructor(public suite: ITestSuite, public tsfile: File, public options?: TscExecOptions) { } - public run(callback: (result: TestResult) => void) { - Tsc.run(this.tsfile.filePathWithName, this.options, (execResult) => { + public run(): Promise { + return Tsc.run(this.tsfile.filePathWithName, this.options).then((execResult: ExecResult) => { var testResult = new TestResult(); testResult.hostedBy = this.suite; testResult.targetFile = this.tsfile; @@ -46,7 +52,7 @@ module DT { testResult.stderr = execResult.stderr; testResult.exitCode = execResult.exitCode; - callback(testResult); + return testResult; }); } } @@ -76,12 +82,10 @@ module DT { ///////////////////////////////// // The main class to kick things off ///////////////////////////////// - // TODO move to bluebird (Promises) - // TODO move to lazy.js (functional) export class TestRunner { - files: File[]; - timer: Timer; - suites: ITestSuite[] = []; + private files: File[]; + private timer: Timer; + private suites: ITestSuite[] = []; private index: FileIndex; private changes: GitChanges; @@ -92,29 +96,13 @@ module DT { this.index = new FileIndex(this.options); this.changes = new GitChanges(this.dtPath); - - // should be async (way faster) - // only includes .d.ts or -tests.ts or -test.ts or .ts - var filesName = glob.sync('**/*.ts', { cwd: dtPath }); - this.files = filesName.filter((fileName) => { - return this.checkAcceptFile(fileName); - }).sort().map((fileName) => { - return new File(dtPath, fileName); - }); + this.print = new Print(this.options.tscVersion); } public addSuite(suite: ITestSuite): void { this.suites.push(suite); } - public run(): void { - this.timer = new Timer(); - this.timer.start(); - - // we need promises - this.doGetChanges(); - } - private checkAcceptFile(fileName: string): boolean { var ok = tsExp.test(fileName); ok = ok && fileName.indexOf('_infrastructure') < 0; @@ -123,155 +111,179 @@ module DT { return ok; } - private doGetChanges(): void { - this.changes.getChanges((err) => { - if (err) { - throw err; - } - console.log(''); - console.log('changes:'); - console.log('---'); + public run(): Promise { + this.timer = new Timer(); + this.timer.start(); - this.changes.paths.forEach((file) => { - console.log(file); + // only includes .d.ts or -tests.ts or -test.ts or .ts + return Promise.promisify(glob).call(glob, '**/*.ts', { + cwd: dtPath + }).then((filesNames: string[]) => { + this.files = Lazy(filesNames).filter((fileName) => { + return this.checkAcceptFile(fileName); + }).map((fileName: string) => { + return new File(dtPath, fileName); + }).toArray(); + + this.print.printChangeHeader(); + + return Promise.all([ + this.doParseFiles(), + this.doGetChanges() + ]); + }).then(() => { + return this.doCollectTargets(); + }).then((files) => { + return this.runTests(files); + }).then(() => { + return !this.suites.some((suite) => { + return suite.ngTests.length !== 0 }); - console.log('---'); - - // chain - this.doGetReferences(); }); } - private doGetReferences(): void { - this.index.parseFiles(this.files, () => { - console.log(''); - console.log('files:'); - console.log('---'); - this.files.forEach((file) => { - console.log(file.filePathWithName); - file.references.forEach((file) => { - console.log(' - %s', file.filePathWithName); - }); - }); - console.log('---'); - + private doParseFiles(): Promise { + return this.index.parseFiles(this.files).then(() => { + /* + this.print.printSubHeader('Files:'); + this.print.printDiv(); + this.files.forEach((file) => { + this.print.printLine(file.filePathWithName); + file.references.forEach((file) => { + this.print.printElement(file.filePathWithName); + }); + }); + this.print.printBreak();*/ // chain - this.doCollectTargets(); - }); + }).thenReturn(); } - private doCollectTargets(): void { + private doGetChanges(): Promise { + return this.changes.getChanges().then(() => { + this.print.printSubHeader('All changes'); + this.print.printDiv(); - // TODO clean this up when functional (do we need changeMap?) + Lazy(this.changes.paths).each((file) => { + this.print.printLine(file); + }); + }).thenReturn(); + } - // bake map for lookup - var changeMap = this.changes.paths.filter((full) => { - return this.checkAcceptFile(full); - }).map((local) => { - return path.resolve(this.dtPath, local); - }).reduce((memo, full) => { - var file = this.index.getFile(full); - if (!file) { - // what does it mean? deleted? - console.log('not in index: ' + full); - return memo; - } - memo[full] = file; - return memo; - }, Object.create(null)); + private doCollectTargets(): Promise { + return new Promise((resolve) => { - // collect referring files (and also log) - var touched = Object.create(null); - console.log(''); - console.log('relevant changes:'); - console.log('---'); - Object.keys(changeMap).sort().forEach((src) => { - touched[src] = changeMap[src]; - console.log(changeMap[src].formatName); - }); - console.log('---'); + // bake map for lookup + var changeMap = Object.create(null); - // terrible loop (whatever) - // just add stuff until there is nothing new added - // TODO improve it - var added:number; - do { - added = 0; - this.files.forEach((file) => { - // lol getter - if (file.fullPath in touched) { + Lazy(this.changes.paths).filter((full) => { + return this.checkAcceptFile(full); + }).map((local) => { + return path.resolve(this.dtPath, local); + }).each((full) => { + var file = this.index.getFile(full); + if (!file) { + // TODO figure out what to do here + // what does it mean? deleted? + console.log('not in index: ' + full); return; } - // check if one of our references is touched - file.references.some((ref) => { - if (ref.fullPath in touched) { - // add us - touched[file.fullPath] = file; - added++; - return true; - } - return false; - }); + changeMap[full] = file; }); - } - while(added > 0); - console.log(''); - console.log('touched:'); - console.log('---'); - var files: File[] = Object.keys(touched).sort().map((src) => { - console.log(touched[src].formatName); - return touched[src]; + this.print.printDiv(); + this.print.printSubHeader('Relevant changes'); + this.print.printDiv(); + + Object.keys(changeMap).sort().forEach((src) => { + this.print.printLine(changeMap[src].formatName); + }); + + // terrible loop (whatever) + // just add stuff until there is nothing new added + // TODO improve it + var added: number; + var files = this.files.slice(0); + do { + added = 0; + + for (var i = files.length - 1; i >= 0; i--) { + var file = files[i]; + if (file.fullPath in changeMap) { + this.files.splice(i, 1); + continue; + } + // check if one of our references is touched + for (var j = 0, jj = file.references.length; j < jj; j++) { + if (file.references[j].fullPath in changeMap) { + // add us + changeMap[file.fullPath] = file; + added++; + break; + } + } + } + } + while (added > 0); + + this.print.printDiv(); + this.print.printSubHeader('Reference mapped'); + this.print.printDiv(); + + var result: File[] = Object.keys(changeMap).sort().map((src) => { + this.print.printLine(changeMap[src].formatName); + changeMap[src].references.forEach((file: File) => { + this.print.printElement(file.formatName); + }); + return changeMap[src]; + }); + resolve(result); }); - console.log('---'); - - this.runTests(files); } - private runTests(files: File[]): void { + private runTests(files: File[]): Promise { + return Promise.attempt(() => { + assert(Array.isArray(files), 'files must be array'); - var syntaxChecking = new SyntaxChecking(this.options); - var testEval = new TestEval(this.options); - if (!this.options.findNotRequiredTscparams) { - this.addSuite(syntaxChecking); - this.addSuite(testEval); - } + var syntaxChecking = new SyntaxChecking(this.options); + var testEval = new TestEval(this.options); - var typings = syntaxChecking.filterTargetFiles(files).length; - var testFiles = testEval.filterTargetFiles(files).length; + if (!this.options.findNotRequiredTscparams) { + this.addSuite(syntaxChecking); + this.addSuite(testEval); + } - this.print = new Print(this.options.tscVersion, typings, testFiles, files.length); - this.print.printHeader(); + return Promise.all([ + syntaxChecking.filterTargetFiles(files), + testEval.filterTargetFiles(files) + ]); + }).spread((syntaxFiles, testFiles) => { + this.print.init(syntaxFiles.length, testFiles.length, files.length); + this.print.printHeader(); - if (this.options.findNotRequiredTscparams) { - this.addSuite(new FindNotRequiredTscparams(this.options, this.print)); - } + if (this.options.findNotRequiredTscparams) { + this.addSuite(new FindNotRequiredTscparams(this.options, this.print)); + } - var count = 0; - var executor = () => { - var suite = this.suites[count]; - if (suite) { + return Promise.reduce(this.suites, (count, suite: ITestSuite) => { suite.testReporter = suite.testReporter || new DefaultTestReporter(this.print); this.print.printSuiteHeader(suite.testSuiteName); - var targetFiles = suite.filterTargetFiles(files); - suite.start(targetFiles, (testResult, index) => { - this.testCompleteCallback(testResult, index); - }, (suite) => { - this.suiteCompleteCallback(suite); - count++; - executor(); + return suite.filterTargetFiles(files).then((targetFiles) => { + return suite.start(targetFiles, (testResult, index) => { + this.printTestComplete(testResult, index); + }); + }).then((suite) => { + this.printSuiteComplete(suite); + return count++; }); - } - else { - this.timer.end(); - this.allTestCompleteCallback(files); - } - }; - executor(); + }, 0); + }).then((count) => { + this.timer.end(); + this.finaliseTests(files); + }); } - private testCompleteCallback(testResult: TestResult, index: number) { + private printTestComplete(testResult: TestResult, index: number): void { var reporter = testResult.hostedBy.testReporter; if (testResult.success) { reporter.printPositiveCharacter(index, testResult); @@ -281,7 +293,7 @@ module DT { } } - private suiteCompleteCallback(suite: ITestSuite) { + private printSuiteComplete(suite: ITestSuite): void { this.print.printBreak(); this.print.printDiv(); @@ -290,16 +302,19 @@ module DT { this.print.printFailedCount(suite.ngTests.length, suite.testResults.length); } - private allTestCompleteCallback(files: File[]) { - var testEval = this.suites.filter(suite => suite instanceof TestEval)[0]; + private finaliseTests(files: File[]): void { + var testEval: TestEval = Lazy(this.suites).filter((suite) => { + return suite instanceof TestEval; + }).first(); + if (testEval) { - var existsTestTypings: string[] = testEval.testResults.map((testResult) => { + var existsTestTypings: string[] = Lazy(testEval.testResults).map((testResult) => { return testResult.targetFile.dir; }).reduce((a: string[], b: string) => { return a.indexOf(b) < 0 ? a.concat([b]) : a; }, []); - var typings: string[] = files.map((file) => { + var typings: string[] = Lazy(files).map((file) => { return file.dir; }).reduce((a: string[], b: string) => { return a.indexOf(b) < 0 ? a.concat([b]) : a; @@ -308,6 +323,7 @@ module DT { var withoutTestTypings: string[] = typings.filter((typing) => { return existsTestTypings.indexOf(typing) < 0; }); + this.print.printDiv(); this.print.printTypingsWithoutTest(withoutTestTypings); } @@ -324,10 +340,11 @@ module DT { this.print.printSuiteErrorCount(suite.errorHeadline, suite.ngTests.length, suite.testResults.length); }); if (testEval) { - this.print.printSuiteErrorCount("Without tests", withoutTestTypings.length, typings.length, '\33[33m\33[1m'); + this.print.printSuiteErrorCount('Without tests', withoutTestTypings.length, typings.length, true); } this.print.printDiv(); + if (this.suites.some((suite) => { return suite.ngTests.length !== 0 })) { @@ -341,30 +358,29 @@ module DT { }); this.print.printBoldDiv(); }); - - process.exit(1); } } } var dtPath = path.resolve(path.dirname((module).filename), '..', '..'); - var findNotRequiredTscparams = process.argv.some(arg => arg == "--try-without-tscparams"); - var tscVersionIndex = process.argv.indexOf("--tsc-version"); + var findNotRequiredTscparams = process.argv.some(arg => arg == '--try-without-tscparams'); + var tscVersionIndex = process.argv.indexOf('--tsc-version'); var tscVersion = DEFAULT_TSC_VERSION; - if (-1 < tscVersionIndex) { + + if (tscVersionIndex > -1) { tscVersion = process.argv[tscVersionIndex + 1]; } - console.log('--'); - console.log(' dtPath %s', dtPath); - console.log(' tscVersion %s', tscVersion); - console.log(' findNotRequiredTscparams %s', findNotRequiredTscparams); - console.log('--'); - console.log(''); - var runner = new TestRunner(dtPath, { tscVersion: tscVersion, findNotRequiredTscparams: findNotRequiredTscparams }); - runner.run(); + runner.run().then((success) => { + if (!success) { + process.exit(1); + } + }).catch((err) => { + throw err; + process.exit(2); + }); } diff --git a/_infrastructure/tests/src/changes.ts b/_infrastructure/tests/src/changes.ts index 3bc7334e02..f3ec262084 100644 --- a/_infrastructure/tests/src/changes.ts +++ b/_infrastructure/tests/src/changes.ts @@ -1,14 +1,16 @@ /// module DT { - 'use-strict'; + 'use strict'; var fs = require('fs'); var path = require('path'); var Git = require('git-wrapper'); + var Promise: typeof Promise = require('bluebird'); export class GitChanges { + git; options = {}; paths: string[] = []; @@ -18,21 +20,16 @@ module DT { throw new Error('cannot locate git-dir: ' + dir); } this.options['git-dir'] = dir; + + this.git = new Git(this.options); + this.git.exec = Promise.promisify(this.git.exec); } - getChanges(callback: (err) => void): void { - //git diff --name-only HEAD~1 - var git = new Git(this.options); + getChanges(): Promise { var opts = {}; var args = ['--name-only HEAD~1']; - git.exec('diff', opts, args, (err, msg: string) => { - if (err) { - callback(err); - return; - } + return this.git.exec('diff', opts, args).then((msg: string) => { this.paths = msg.replace(/^\s+/, '').replace(/\s+$/, '').split(/\r?\n/g); - // console.log(paths); - callback(null); }); } } diff --git a/_infrastructure/tests/src/exec.ts b/_infrastructure/tests/src/exec.ts new file mode 100644 index 0000000000..3c3f3c0e02 --- /dev/null +++ b/_infrastructure/tests/src/exec.ts @@ -0,0 +1,30 @@ +module DT { + 'use strict'; + + var Promise: typeof Promise = require('bluebird'); + var nodeExec = require('child_process').exec; + + export class ExecResult { + error; + stdout = ''; + stderr = ''; + exitCode: number; + } + + export function exec(filename: string, cmdLineArgs: string[]): Promise { + return new Promise((resolve) => { + var result = new ExecResult(); + result.exitCode = null; + + var cmdLine = filename + ' ' + cmdLineArgs.join(' '); + + nodeExec(cmdLine, {maxBuffer: 1 * 1024 * 1024}, (error, stdout, stderr) => { + result.error = error; + result.stdout = stdout; + result.stderr = stderr; + result.exitCode = error ? error.code : 0; + resolve(result); + }); + }); + } +} diff --git a/_infrastructure/tests/src/file.ts b/_infrastructure/tests/src/file.ts index 4bb81e9857..389936b491 100644 --- a/_infrastructure/tests/src/file.ts +++ b/_infrastructure/tests/src/file.ts @@ -1,7 +1,7 @@ /// module DT { - 'use-strict'; + 'use strict'; var path = require('path'); @@ -20,6 +20,7 @@ module DT { references: File[] = []; constructor(baseDir: string, filePathWithName: string) { + // why choose? this.baseDir = baseDir; this.filePathWithName = filePathWithName; this.ext = path.extname(this.filePathWithName); @@ -28,7 +29,7 @@ module DT { this.formatName = path.join(this.dir, this.file + this.ext); this.fullPath = path.join(this.baseDir, this.dir, this.file + this.ext); - // lock it (shallow) + // lock it (shallow) (needs `use strict` in each file to work) // Object.freeze(this); } diff --git a/_infrastructure/tests/src/host/exec.ts b/_infrastructure/tests/src/host/exec.ts deleted file mode 100644 index 07a9d66626..0000000000 --- a/_infrastructure/tests/src/host/exec.ts +++ /dev/null @@ -1,46 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -// Allows for executing a program with command-line arguments and reading the result -interface IExec { - exec: (filename: string, cmdLineArgs: string[], handleResult: (ExecResult) => void) => void; -} - -class ExecResult { - public stdout = ""; - public stderr = ""; - public exitCode: number; -} - -class NodeExec implements IExec { - public exec(filename: string, cmdLineArgs: string[], handleResult: (ExecResult) => void): void { - var nodeExec = require('child_process').exec; - - var result = new ExecResult(); - result.exitCode = null; - var cmdLine = filename + ' ' + cmdLineArgs.join(' '); - - var process = nodeExec(cmdLine, {maxBuffer: 1 * 1024 * 1024}, function (error, stdout, stderr) { - result.stdout = stdout; - result.stderr = stderr; - result.exitCode = error ? error.code : 0; - handleResult(result); - }); - } -} - -var Exec: IExec = function (): IExec { - return new NodeExec(); -}(); diff --git a/_infrastructure/tests/src/index.ts b/_infrastructure/tests/src/index.ts index 7c9561af93..183c1e64db 100644 --- a/_infrastructure/tests/src/index.ts +++ b/_infrastructure/tests/src/index.ts @@ -3,28 +3,25 @@ /// module DT { - 'use-strict'; + 'use strict'; var fs = require('fs'); var path = require('path'); + var Lazy = require('lazy.js'); + var Promise: typeof Promise = require('bluebird'); + var readFile = Promise.promisify(fs.readFile); + + ///////////////////////////////// + // Track all files in the repo: map full path to File objects + ///////////////////////////////// export class FileIndex { - fileMap: {[path:string]:File - }; + fileMap: {[fullPath:string]:File}; + options: ITestRunnerOptions; - constructor(public options: ITestRunnerOptions) { - - } - - parseFiles(files: File[], callback: () => void): void { - this.fileMap = Object.create(null); - files.forEach((file) => { - this.fileMap[file.fullPath] = file; - }); - this.loadReferences(files, () => { - callback(); - }); + constructor(options: ITestRunnerOptions) { + this.options = options; } hasFile(target: string): boolean { @@ -38,43 +35,53 @@ module DT { return null; } - private loadReferences(files: File[], callback: () => void): void { - var queue = files.slice(0); - var active = []; - var max = 50; - var next = () => { - if (queue.length === 0 && active.length === 0) { - callback(); - return; - } - // queue paralel - while (queue.length > 0 && active.length < max) { - var file = queue.pop(); - active.push(file); - this.parseFile(file, (file) => { - active.splice(active.indexOf(file), 1); - next(); - }); - } - }; - process.nextTick(next); + parseFiles(files: File[]): Promise { + return Promise.attempt(() => { + this.fileMap = Object.create(null); + files.forEach((file) => { + this.fileMap[file.fullPath] = file; + }); + return this.loadReferences(files); + }); } - private parseFile(file: File, callback: (file: File) => void): void { - fs.readFile(file.filePathWithName, { + private loadReferences(files: File[]): Promise { + return new Promise((resolve, reject) => { + var queue = files.slice(0); + var active = []; + var max = 50; + var next = () => { + if (queue.length === 0 && active.length === 0) { + resolve(); + return; + } + // queue paralel + while (queue.length > 0 && active.length < max) { + var file = queue.pop(); + active.push(file); + this.parseFile(file).then((file) => { + active.splice(active.indexOf(file), 1); + next(); + }).catch((err) => { + queue = []; + active = []; + reject(err); + }); + } + }; + next(); + }); + } + + // TODO replace with a stream? + private parseFile(file: File): Promise { + return readFile(file.filePathWithName, { encoding: 'utf8', flag: 'r' - }, (err, content) => { - if (err) { - // just blow up? - throw err; - } - // console.log('----'); - // console.log(file.filePathWithName); - - file.references = extractReferenceTags(content).map((ref: string) => { + }).then((content) => { + file.references = Lazy(extractReferenceTags(content)).map((ref) => { return path.resolve(path.dirname(file.fullPath), ref); - }).reduce((memo: File[], ref: string) => { + }).reduce((memo: File[], ref) => { if (ref in this.fileMap) { memo.push(this.fileMap[ref]); } @@ -83,10 +90,8 @@ module DT { } return memo; }, []); - - // console.log(file.references); - - callback(file); + // return the object + return file; }); } } diff --git a/_infrastructure/tests/src/printer.ts b/_infrastructure/tests/src/printer.ts index 585ca5aa3a..613251b825 100644 --- a/_infrastructure/tests/src/printer.ts +++ b/_infrastructure/tests/src/printer.ts @@ -2,16 +2,26 @@ /// module DT { - 'use-strict'; ///////////////////////////////// - // All the common things that we pring are functions of this class + // All the common things that we print are functions of this class ///////////////////////////////// export class Print { WIDTH = 77; - constructor(public version: string, public typings: number, public tests: number, public tsFiles: number) { + typings: number; + tests: number; + tsFiles: number + + constructor(public version: string){ + + } + + public init(typings: number, tests: number, tsFiles: number) { + this.typings = typings; + this.tests = tests; + this.tsFiles = tsFiles; } public out(s: any): Print { @@ -23,9 +33,15 @@ module DT { return new Array(times + 1).join(s); } + public printChangeHeader() { + this.out('=============================================================================\n'); + this.out(' \33[36m\33[1mDefinitelyTyped Diff Detector 0.1.0\33[0m \n'); + this.out('=============================================================================\n'); + } + public printHeader() { this.out('=============================================================================\n'); - this.out(' \33[36m\33[1mDefinitelyTyped test runner 0.4.0\33[0m\n'); + this.out(' \33[36m\33[1mDefinitelyTyped Test Runner 0.5.0\33[0m\n'); this.out('=============================================================================\n'); this.out(' \33[36m\33[1mTypescript version:\33[0m ' + this.version + '\n'); this.out(' \33[36m\33[1mTypings :\33[0m ' + this.typings + '\n'); @@ -36,9 +52,9 @@ module DT { public printSuiteHeader(title: string) { var left = Math.floor((this.WIDTH - title.length ) / 2) - 1; var right = Math.ceil((this.WIDTH - title.length ) / 2) - 1; - this.out(this.repeat("=", left)).out(" \33[34m\33[1m"); + this.out(this.repeat('=', left)).out(' \33[34m\33[1m'); this.out(title); - this.out("\33[0m ").out(this.repeat("=", right)).printBreak(); + this.out('\33[0m ').out(this.repeat('=', right)).printBreak(); } public printDiv() { @@ -66,16 +82,18 @@ module DT { } public clearCurrentLine(): Print { - this.out("\r\33[K"); + this.out('\r\33[K'); return this; } public printSuccessCount(current: number, total: number) { - this.out(' \33[36m\33[1mSuccessful :\33[0m \33[32m\33[1m' + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + var arb = (total === 0) ? 0 : (current / total); + this.out(' \33[36m\33[1mSuccessful :\33[0m \33[32m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); } public printFailedCount(current: number, total: number) { - this.out(' \33[36m\33[1mFailure :\33[0m \33[31m\33[1m' + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + var arb = (total === 0) ? 0 : (current / total); + this.out(' \33[36m\33[1mFailure :\33[0m \33[31m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); } public printTypingsWithoutTestsMessage() { @@ -90,9 +108,31 @@ module DT { this.out(' \33[36m\33[1mElapsed time :\33[0m ~' + time + ' (' + s + 's)\n'); } - public printSuiteErrorCount(errorHeadline: string, current: number, total: number, valuesColor = '\33[31m\33[1m') { + public printSuiteErrorCount(errorHeadline: string, current: number, total: number, warn: boolean = false) { + var arb = (total === 0) ? 0 : (current / total); this.out(' \33[36m\33[1m').out(errorHeadline).out(this.repeat(' ', 16 - errorHeadline.length)); - this.out(':\33[0m ' + valuesColor + ((current / total) * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + if (warn) { + this.out(': \33[31m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + } + else { + this.out(': \33[33m\33[1m' + (arb * 100).toFixed(2) + '% (' + current + '/' + total + ')\33[0m\n'); + } + } + + public printSubHeader(file: string) { + this.out(' \33[36m\33[1m' + file + '\33[0m\n'); + } + + public printLine(file: string) { + this.out(file + '\n'); + } + + public printElement(file: string) { + this.out(' - ' + file + '\n'); + } + + public printElement2(file: string) { + this.out(' - ' + file + '\n'); } public printTypingsWithoutTestName(file: string) { diff --git a/_infrastructure/tests/src/reporter/reporter.ts b/_infrastructure/tests/src/reporter/reporter.ts index edab8a6a04..783eae287a 100644 --- a/_infrastructure/tests/src/reporter/reporter.ts +++ b/_infrastructure/tests/src/reporter/reporter.ts @@ -2,8 +2,6 @@ /// module DT { - 'use-strict'; - ///////////////////////////////// // Test reporter interface // for example, . and x @@ -27,7 +25,7 @@ module DT { } public printNegativeCharacter(index: number, testResult: TestResult) { - this.print.out("x"); + this.print.out('x'); this.printBreakIfNeeded(index); } diff --git a/_infrastructure/tests/src/suite/suite.ts b/_infrastructure/tests/src/suite/suite.ts index 33d69af06e..4de10ce1d6 100644 --- a/_infrastructure/tests/src/suite/suite.ts +++ b/_infrastructure/tests/src/suite/suite.ts @@ -1,7 +1,9 @@ /// module DT { - 'use-strict'; + 'use strict'; + + var Promise: typeof Promise = require('bluebird'); ///////////////////////////////// // The interface for test suite @@ -9,9 +11,9 @@ module DT { export interface ITestSuite { testSuiteName:string; errorHeadline:string; - filterTargetFiles(files: File[]):File[]; + filterTargetFiles(files: File[]): Promise; - start(targetFiles: File[], testCallback: (result: TestResult, index: number) => void, suiteCallback: (suite: ITestSuite) => void):void; + start(targetFiles: File[], testCallback: (result: TestResult, index: number) => void): Promise; testResults:TestResult[]; okTests:TestResult[]; @@ -34,41 +36,30 @@ module DT { constructor(public options: ITestRunnerOptions, public testSuiteName: string, public errorHeadline: string) { } - public filterTargetFiles(files: File[]): File[] { - throw new Error("please implement this method"); + public filterTargetFiles(files: File[]): Promise { + throw new Error('please implement this method'); } - public start(targetFiles: File[], testCallback: (result: TestResult, index: number) => void, suiteCallback: (suite: ITestSuite) => void): void { - targetFiles = this.filterTargetFiles(targetFiles); + public start(targetFiles: File[], testCallback: (result: TestResult, index: number) => void): Promise { this.timer.start(); - var count = 0; - // exec test is async process. serialize. - var executor = () => { - var targetFile = targetFiles[count]; - if (targetFile) { - this.runTest(targetFile, (result) => { + return this.filterTargetFiles(targetFiles).then((targetFiles) => { + return Promise.reduce(targetFiles, (count, targetFile) => { + return this.runTest(targetFile).then((result) => { testCallback(result, count + 1); - count++; - executor(); + return count++; }); - } - else { - this.timer.end(); - this.finish(suiteCallback); - } - }; - executor(); - } - - public runTest(targetFile: File, callback: (result: TestResult) => void): void { - new Test(this, targetFile, {tscVersion: this.options.tscVersion}).run((result) => { - this.testResults.push(result); - callback(result); + }, 0); + }).then((count: number) => { + this.timer.end(); + return this; }); } - public finish(suiteCallback: (suite: ITestSuite) => void) { - suiteCallback(this); + public runTest(targetFile: File): Promise { + return new Test(this, targetFile, {tscVersion: this.options.tscVersion}).run().then((result) => { + this.testResults.push(result); + return result; + }); } public get okTests(): TestResult[] { diff --git a/_infrastructure/tests/src/suite/syntax.ts b/_infrastructure/tests/src/suite/syntax.ts index ff4b3bdb4b..41808b2a2b 100644 --- a/_infrastructure/tests/src/suite/syntax.ts +++ b/_infrastructure/tests/src/suite/syntax.ts @@ -2,7 +2,11 @@ /// module DT { - 'use-strict'; + 'use strict'; + + var Promise: typeof Promise = require('bluebird'); + + var endDts = /.ts$/i; ///////////////////////////////// // .d.ts syntax inspection @@ -10,13 +14,13 @@ module DT { export class SyntaxChecking extends TestSuiteBase { constructor(options: ITestRunnerOptions) { - super(options, "Syntax checking", "Syntax error"); + super(options, 'Syntax checking', 'Syntax error'); } - public filterTargetFiles(files: File[]): File[] { - return files.filter((file) => { - return DT.endsWith(file.formatName.toUpperCase(), '.D.TS'); - }); + public filterTargetFiles(files: File[]): Promise { + return Promise.cast(files.filter((file) => { + return endDts.test(file.formatName); + })); } } } diff --git a/_infrastructure/tests/src/suite/testEval.ts b/_infrastructure/tests/src/suite/testEval.ts index 13a6598874..bc842549fc 100644 --- a/_infrastructure/tests/src/suite/testEval.ts +++ b/_infrastructure/tests/src/suite/testEval.ts @@ -2,20 +2,25 @@ /// module DT { - 'use-strict'; + 'use strict'; + + var Promise: typeof Promise = require('bluebird'); + + var endTestDts = /-test.ts$/i; + ///////////////////////////////// // Compile with *-tests.ts ///////////////////////////////// export class TestEval extends TestSuiteBase { constructor(options) { - super(options, "Typing tests", "Failed tests"); + super(options, 'Typing tests', 'Failed tests'); } - public filterTargetFiles(files: File[]): File[] { - return files.filter((file) => { - return DT.endsWith(file.formatName.toUpperCase(), '-TESTS.TS') - }); + public filterTargetFiles(files: File[]): Promise { + return Promise.cast(files.filter((file) => { + return endTestDts.test(file.formatName); + })); } } diff --git a/_infrastructure/tests/src/suite/tscParams.ts b/_infrastructure/tests/src/suite/tscParams.ts index e4bb4f4c15..cef23d622b 100644 --- a/_infrastructure/tests/src/suite/tscParams.ts +++ b/_infrastructure/tests/src/suite/tscParams.ts @@ -1,10 +1,11 @@ -/// -/// +/// +/// module DT { - 'use-strict'; + 'use strict'; var fs = require('fs'); + var Promise: typeof Promise = require('bluebird'); ///////////////////////////////// // Try compile without .tscparams @@ -15,7 +16,7 @@ module DT { printErrorCount = false; constructor(options: ITestRunnerOptions, private print: Print) { - super(options, "Find not required .tscparams files", "New arrival!"); + super(options, 'Find not required .tscparams files', 'New arrival!'); this.testReporter = { printPositiveCharacter: (index: number, testResult: TestResult) => { @@ -28,29 +29,28 @@ module DT { } } - public filterTargetFiles(files: File[]): File[] { - return files.filter((file) => { - return fs.existsSync(file.filePathWithName + '.tscparams'); + public filterTargetFiles(files: File[]): Promise { + return Promise.filter(files, (file) => { + return new Promise((resolve) => { + fs.exists(file.filePathWithName + '.tscparams', resolve); + }); }); } - public runTest(targetFile: File, callback: (result: TestResult) => void): void { + public runTest(targetFile: File): Promise { this.print.clearCurrentLine().out(targetFile.formatName); - new Test(this, targetFile, { + + return new Test(this, targetFile, { tscVersion: this.options.tscVersion, useTscParams: false, checkNoImplicitAny: true - }).run(result=> { + }).run().then((result: TestResult) => { this.testResults.push(result); - callback(result); + this.print.clearCurrentLine(); + return result }); } - public finish(suiteCallback: (suite: ITestSuite)=>void) { - this.print.clearCurrentLine(); - suiteCallback(this); - } - public get ngTests(): TestResult[] { // Do not show ng test results return []; diff --git a/_infrastructure/tests/src/timer.ts b/_infrastructure/tests/src/timer.ts index 1bf965a825..009527109a 100644 --- a/_infrastructure/tests/src/timer.ts +++ b/_infrastructure/tests/src/timer.ts @@ -2,7 +2,7 @@ /// module DT { - 'use-strict'; + 'use strict'; ///////////////////////////////// // Timer.start starts a timer @@ -36,14 +36,14 @@ module DT { } return ( (day_diff == 0 && ( - diff < 60 && (diff + " seconds") || - diff < 120 && "1 minute" || - diff < 3600 && Math.floor(diff / 60) + " minutes" || - diff < 7200 && "1 hour" || - diff < 86400 && Math.floor(diff / 3600) + " hours") || - day_diff == 1 && "Yesterday" || - day_diff < 7 && day_diff + " days" || - day_diff < 31 && Math.ceil(day_diff / 7) + " weeks")); + diff < 60 && (diff + ' seconds') || + diff < 120 && '1 minute' || + diff < 3600 && Math.floor(diff / 60) + ' minutes' || + diff < 7200 && '1 hour' || + diff < 86400 && Math.floor(diff / 3600) + ' hours') || + day_diff == 1 && 'Yesterday' || + day_diff < 7 && day_diff + ' days' || + day_diff < 31 && Math.ceil(day_diff / 7) + ' weeks')); } } } diff --git a/_infrastructure/tests/src/tsc.ts b/_infrastructure/tests/src/tsc.ts index 845b8557fe..16287be532 100644 --- a/_infrastructure/tests/src/tsc.ts +++ b/_infrastructure/tests/src/tsc.ts @@ -1,11 +1,14 @@ -/// -/// -/// +/// +/// +/// module DT { - 'use-strict'; + 'use strict'; + var fs = require('fs'); + var Promise: typeof Promise = require('bluebird'); + export interface TscExecOptions { tscVersion?:string; useTscParams?:boolean; @@ -13,33 +16,31 @@ module DT { } export class Tsc { - public static run(tsfile: string, options: TscExecOptions, callback: (result: ExecResult) => void) { - options = options || {}; - options.tscVersion = options.tscVersion || DEFAULT_TSC_VERSION; - if (typeof options.checkNoImplicitAny === "undefined") { - options.checkNoImplicitAny = true; - } - if (typeof options.useTscParams === "undefined") { - options.useTscParams = true; - } - - if (!fs.existsSync(tsfile)) { - throw new Error(tsfile + " not exists"); - } - - var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js'; - if (!fs.existsSync(tscPath)) { - throw new Error(tscPath + ' is not exists'); - } - var command = 'node ' + tscPath + ' --module commonjs '; - if (options.useTscParams && fs.existsSync(tsfile + '.tscparams')) { - command += '@' + tsfile + '.tscparams'; - } - else if (options.checkNoImplicitAny) { - command += '--noImplicitAny'; - } - Exec.exec(command, [tsfile], (execResult) => { - callback(execResult); + public static run(tsfile: string, options: TscExecOptions): Promise { + return Promise.attempt(() => { + options = options || {}; + options.tscVersion = options.tscVersion || DEFAULT_TSC_VERSION; + if (typeof options.checkNoImplicitAny === 'undefined') { + options.checkNoImplicitAny = true; + } + if (typeof options.useTscParams === 'undefined') { + options.useTscParams = true; + } + if (!fs.existsSync(tsfile)) { + throw new Error(tsfile + ' not exists'); + } + var tscPath = './_infrastructure/tests/typescript/' + options.tscVersion + '/tsc.js'; + if (!fs.existsSync(tscPath)) { + throw new Error(tscPath + ' is not exists'); + } + var command = 'node ' + tscPath + ' --module commonjs '; + if (options.useTscParams && fs.existsSync(tsfile + '.tscparams')) { + command += '@' + tsfile + '.tscparams'; + } + else if (options.checkNoImplicitAny) { + command += '--noImplicitAny'; + } + return exec(command, [tsfile]); }); } } diff --git a/_infrastructure/tests/src/util.ts b/_infrastructure/tests/src/util.ts index 39115b1eb4..a712bb90cd 100644 --- a/_infrastructure/tests/src/util.ts +++ b/_infrastructure/tests/src/util.ts @@ -1,7 +1,11 @@ /// module DT { - 'use-strict'; + 'use strict'; + + var fs = require('fs'); + var Lazy: LazyJS.LazyStatic = require('lazy.js'); + var Promise: typeof Promise = require('bluebird'); var referenceTagExp = //g; @@ -25,4 +29,12 @@ module DT { } return ret; } + + export function fileExists(target: string): Promise { + return new Promise((resolve, reject) => { + fs.exists(target, (bool: boolean) => { + resolve(bool); + }); + }); + } } diff --git a/_infrastructure/tests/typings/bluebird/bluebird.d.ts b/_infrastructure/tests/typings/bluebird/bluebird.d.ts new file mode 100644 index 0000000000..2e8de4ca80 --- /dev/null +++ b/_infrastructure/tests/typings/bluebird/bluebird.d.ts @@ -0,0 +1,655 @@ +// Type definitions for bluebird 1.0.0 +// Project: https://github.com/petkaantonov/bluebird +// Definitions by: Bart van der Schoor +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +// ES6 model with generics overload was sourced and trans-multiplied from es6-promises.d.ts +// By: Campredon + +// Warning: recommended to use `tsc > v1.0.0` (critical bugs in generic code: +// - https://github.com/borisyankov/DefinitelyTyped/issues/1563 +// - https://github.com/borisyankov/DefinitelyTyped/tree/def/bluebird + +// Note: replicate changes to all overloads in both definition and test file +// Note: keep both static and instance members inline (so similar) + +// TODO fix remaining TODO annotations in both definition and test + +// TODO verify support to have no return statement in handlers to get a Promise (more overloads?) + +declare class Promise implements Promise.Thenable { + /** + * Create a new promise. The passed in function will receive functions `resolve` and `reject` as its arguments which can be called to seal the fate of the created promise. + */ + constructor(callback: (resolve: (thenable: Promise.Thenable) => void, reject: (error: any) => void) => void); + constructor(callback: (resolve: (result: R) => void, reject: (error: any) => void) => void); + + /** + * Promises/A+ `.then()` with progress handler. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise. + */ + then(onFulfill: (value: R) => Promise.Thenable, onReject: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + then(onFulfill: (value: R) => Promise.Thenable, onReject?: (error: any) => U, onProgress?: (note: any) => any): Promise; + then(onFulfill: (value: R) => U, onReject: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + then(onFulfill?: (value: R) => U, onReject?: (error: any) => U, onProgress?: (note: any) => any): Promise; + + /** + * This is a catch-all exception handler, shortcut for calling `.then(null, handler)` on this promise. Any exception happening in a `.then`-chain will propagate to nearest `.catch` handler. + * + * Alias `.caught();` for compatibility with earlier ECMAScript version. + */ + catch(onReject?: (error: any) => Promise.Thenable): Promise; + caught(onReject?: (error: any) => Promise.Thenable): Promise; + + catch(onReject?: (error: any) => U): Promise; + caught(onReject?: (error: any) => U): Promise; + + /** + * This extends `.catch` to work more like catch-clauses in languages like Java or C#. Instead of manually checking `instanceof` or `.name === "SomeError"`, you may specify a number of error constructors which are eligible for this catch handler. The catch handler that is first met that has eligible constructors specified, is the one that will be called. + * + * This method also supports predicate-based filters. If you pass a predicate function instead of an error constructor, the predicate will receive the error as an argument. The return result of the predicate will be used determine whether the error handler should be called. + * + * Alias `.caught();` for compatibility with earlier ECMAScript version. + */ + catch(predicate: (error: any) => boolean, onReject: (error: any) => Promise.Thenable): Promise; + caught(predicate: (error: any) => boolean, onReject: (error: any) => Promise.Thenable): Promise; + + catch(predicate: (error: any) => boolean, onReject: (error: any) => U): Promise; + caught(predicate: (error: any) => boolean, onReject: (error: any) => U): Promise; + + catch(ErrorClass: Function, onReject: (error: any) => Promise.Thenable): Promise; + caught(ErrorClass: Function, onReject: (error: any) => Promise.Thenable): Promise; + + catch(ErrorClass: Function, onReject: (error: any) => U): Promise; + caught(ErrorClass: Function, onReject: (error: any) => U): Promise; + + /** + * Like `.catch` but instead of catching all types of exceptions, it only catches those that don't originate from thrown errors but rather from explicit rejections. + */ + error(onReject: (reason: any) => Promise.Thenable): Promise; + error(onReject: (reason: any) => U): Promise; + + /** + * Pass a handler that will be called regardless of this promise's fate. Returns a new promise chained from this promise. There are special semantics for `.finally()` in that the final value cannot be modified from the handler. + * + * Alias `.lastly();` for compatibility with earlier ECMAScript version. + */ + finally(handler: (value: R) => Promise.Thenable): Promise; + finally(handler: (value: R) => R): Promise; + + lastly(handler: (value: R) => Promise.Thenable): Promise; + lastly(handler: (value: R) => R): Promise; + + /** + * Create a promise that follows this promise, but is bound to the given `thisArg` value. A bound promise will call its handlers with the bound value set to `this`. Additionally promises derived from a bound promise will also be bound promises with the same `thisArg` binding as the original promise. + */ + bind(thisArg: any): Promise; + + /** + * Like `.then()`, but any unhandled rejection that ends up here will be thrown as an error. + */ + done(onFulfilled: (value: R) => Promise.Thenable, onRejected: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + done(onFulfilled: (value: R) => Promise.Thenable, onRejected?: (error: any) => U, onProgress?: (note: any) => any): Promise; + done(onFulfilled: (value: R) => U, onRejected: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + done(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U, onProgress?: (note: any) => any): Promise; + + /** + * Shorthand for `.then(null, null, handler);`. Attach a progress handler that will be called if this promise is progressed. Returns a new promise chained from this promise. + */ + progressed(handler: (note: any) => any): Promise; + + /** + * Same as calling `Promise.delay(this, ms)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + delay(ms: number): Promise; + + /** + * Returns a promise that will be fulfilled with this promise's fulfillment value or rejection reason. However, if this promise is not fulfilled or rejected within `ms` milliseconds, the returned promise is rejected with a `Promise.TimeoutError` instance. + * + * You may specify a custom error message with the `message` parameter. + */ + timeout(ms: number, message?: string): Promise; + + /** + * Register a node-style callback on this promise. When this promise is is either fulfilled or rejected, the node callback will be called back with the node.js convention where error reason is the first argument and success value is the second argument. The error argument will be `null` in case of success. + * Returns back this promise instead of creating a new one. If the `callback` argument is not a function, this method does not do anything. + */ + nodeify(callback: (err: any, value?: R) => void): Promise; + nodeify(...sink: any[]): void; + + /** + * Marks this promise as cancellable. Promises by default are not cancellable after v0.11 and must be marked as such for `.cancel()` to have any effect. Marking a promise as cancellable is infectious and you don't need to remark any descendant promise. + */ + cancellable(): Promise; + + /** + * Cancel this promise. The cancellation will propagate to farthest cancellable ancestor promise which is still pending. + * + * That ancestor will then be rejected with a `CancellationError` (get a reference from `Promise.CancellationError`) object as the rejection reason. + * + * In a promise rejection handler you may check for a cancellation by seeing if the reason object has `.name === "Cancel"`. + * + * Promises are by default not cancellable. Use `.cancellable()` to mark a promise as cancellable. + */ + // TODO what to do with this? + cancel(): Promise; + + /** + * Like `.then()`, but cancellation of the the returned promise or any of its descendant will not propagate cancellation to this promise or this promise's ancestors. + */ + fork(onFulfilled: (value: R) => Promise.Thenable, onRejected: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + fork(onFulfilled: (value: R) => Promise.Thenable, onRejected?: (error: any) => U, onProgress?: (note: any) => any): Promise; + fork(onFulfilled: (value: R) => U, onRejected: (error: any) => Promise.Thenable, onProgress?: (note: any) => any): Promise; + fork(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U, onProgress?: (note: any) => any): Promise; + + /** + * Create an uncancellable promise based on this promise. + */ + uncancellable(): Promise; + + /** + * See if this promise can be cancelled. + */ + isCancellable(): boolean; + + /** + * See if this `promise` has been fulfilled. + */ + isFulfilled(): boolean; + + /** + * See if this `promise` has been rejected. + */ + isRejected(): boolean; + + /** + * See if this `promise` is still defer. + */ + isPending(): boolean; + + /** + * See if this `promise` is resolved -> either fulfilled or rejected. + */ + isResolved(): boolean; + + /** + * Synchronously inspect the state of this `promise`. The `PromiseInspection` will represent the state of the promise as snapshotted at the time of calling `.inspect()`. + */ + inspect(): Promise.Inspection; + + /** + * This is a convenience method for doing: + * + * + * promise.then(function(obj){ + * return obj[propertyName].call(obj, arg...); + * }); + * + */ + call(propertyName: string, ...args: any[]): Promise; + + /** + * This is a convenience method for doing: + * + * + * promise.then(function(obj){ + * return obj[propertyName]; + * }); + * + */ + // TODO find way to fix get() + // get(propertyName: string): Promise; + + /** + * Convenience method for: + * + * + * .then(function() { + * return value; + * }); + * + * + * in the case where `value` doesn't change its value. That means `value` is bound at the time of calling `.return()` + * + * Alias `.thenReturn();` for compatibility with earlier ECMAScript version. + */ + return(value: U): Promise; + thenReturn(value: U): Promise; + return(): Promise; + thenReturn(): Promise; + + /** + * Convenience method for: + * + * + * .then(function() { + * throw reason; + * }); + * + * Same limitations apply as with `.return()`. + * + * Alias `.thenThrow();` for compatibility with earlier ECMAScript version. + */ + throw(reason: Error): Promise; + thenThrow(reason: Error): Promise; + + /** + * Convert to String. + */ + toString(): string; + + /** + * This is implicitly called by `JSON.stringify` when serializing the object. Returns a serialized representation of the `Promise`. + */ + toJSON(): Object; + + /** + * Like calling `.then`, but the fulfillment value or rejection reason is assumed to be an array, which is flattened to the formal parameters of the handlers. + */ + // TODO how to model instance.spread()? like Q? + spread(onFulfill: Function, onReject?: (reason: any) => Promise.Thenable): Promise; + spread(onFulfill: Function, onReject?: (reason: any) => U): Promise; + /* + // TODO or something like this? + spread(onFulfill: (...values: W[]) => Promise.Thenable, onReject?: (reason: any) => Promise.Thenable): Promise; + spread(onFulfill: (...values: W[]) => Promise.Thenable, onReject?: (reason: any) => U): Promise; + spread(onFulfill: (...values: W[]) => U, onReject?: (reason: any) => Promise.Thenable): Promise; + spread(onFulfill: (...values: W[]) => U, onReject?: (reason: any) => U): Promise; + */ + /** + * Same as calling `Promise.all(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + all(): Promise; + + /** + * Same as calling `Promise.props(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO how to model instance.props()? + props(): Promise; + + /** + * Same as calling `Promise.settle(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + settle(): Promise[]>; + + /** + * Same as calling `Promise.any(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + any(): Promise; + + /** + * Same as calling `Promise.some(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + some(count: number): Promise; + + /** + * Same as calling `Promise.race(thisPromise, count)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + race(): Promise; + + /** + * Same as calling `Promise.map(thisPromise, mapper)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + map(mapper: (item: Q, index: number, arrayLength: number) => Promise.Thenable): Promise; + map(mapper: (item: Q, index: number, arrayLength: number) => U): Promise; + + /** + * Same as calling `Promise.reduce(thisPromise, Function reducer, initialValue)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + reduce(reducer: (memo: U, item: Q, index: number, arrayLength: number) => Promise.Thenable, initialValue?: U): Promise; + reduce(reducer: (memo: U, item: Q, index: number, arrayLength: number) => U, initialValue?: U): Promise; + + /** + * Same as calling ``Promise.filter(thisPromise, filterer)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too. + */ + // TODO type inference from array-resolving promise? + filter(filterer: (item: U, index: number, arrayLength: number) => Promise.Thenable): Promise; + filter(filterer: (item: U, index: number, arrayLength: number) => boolean): Promise; +} + +declare module Promise { + + export interface Thenable { + then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; + then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; + then(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable): Thenable; + then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable; + } + + export interface Resolver { + /** + * Resolve the underlying promise with `value` as the resolution value. If `value` is a thenable or a promise, the underlying promise will assume its state. + */ + resolve(value: R): void; + + /** + * Reject the underlying promise with `reason` as the rejection reason. + */ + reject(reason: any): void; + + /** + * Progress the underlying promise with `value` as the progression value. + */ + progress(value: any): void; + + /** + * Gives you a callback representation of the `PromiseResolver`. Note that this is not a method but a property. The callback accepts error object in first argument and success values on the 2nd parameter and the rest, I.E. node js conventions. + * + * If the the callback is called with multiple success values, the resolver fullfills its promise with an array of the values. + */ + // TODO specify resolver callback + callback: Function; + } + + export interface Inspection { + /** + * See if the underlying promise was fulfilled at the creation time of this inspection object. + */ + isFulfilled(): boolean; + + /** + * See if the underlying promise was rejected at the creation time of this inspection object. + */ + isRejected(): boolean; + + /** + * See if the underlying promise was defer at the creation time of this inspection object. + */ + isPending(): boolean; + + /** + * Get the fulfillment value of the underlying promise. Throws if the promise wasn't fulfilled at the creation time of this inspection object. + * + * throws `TypeError` + */ + value(): R; + + /** + * Get the rejection reason for the underlying promise. Throws if the promise wasn't rejected at the creation time of this inspection object. + * + * throws `TypeError` + */ + error(): any; + } + + /** + * Start the chain of promises with `Promise.try`. Any synchronous exceptions will be turned into rejections on the returned promise. + * + * Note about second argument: if it's specifically a true array, its values become respective arguments for the function call. Otherwise it is passed as is as the first argument for the function call. + * + * Alias for `attempt();` for compatibility with earlier ECMAScript version. + */ + // TODO find way to enable try() without tsc borking + // see also: https://typescript.codeplex.com/workitem/2194 + /* + export function try(fn: () => Promise.Thenable, args?: any[], ctx?: any): Promise; + export function try(fn: () => R, args?: any[], ctx?: any): Promise; + */ + + export function attempt(fn: () => Promise.Thenable, args?: any[], ctx?: any): Promise; + export function attempt(fn: () => R, args?: any[], ctx?: any): Promise; + + /** + * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function. + * This method is convenient when a function can sometimes return synchronously or throw synchronously. + */ + export function method(fn: Function): Function; + + /** + * Create a promise that is resolved with the given `value`. If `value` is a thenable or promise, the returned promise will assume its state. + */ + export function resolve(value: Promise.Thenable): Promise; + export function resolve(value: R): Promise; + + /** + * Create a promise that is rejected with the given `reason`. + */ + export function reject(reason: any): Promise; + + /** + * Create a promise with undecided fate and return a `PromiseResolver` to control it. See resolution?: Promise(#promise-resolution). + */ + export function defer(): Promise.Resolver; + + /** + * Cast the given `value` to a trusted promise. If `value` is already a trusted `Promise`, it is returned as is. If `value` is not a thenable, a fulfilled is: Promise returned with `value` as its fulfillment value. If `value` is a thenable (Promise-like object, like those returned by jQuery's `$.ajax`), returns a trusted that: Promise assimilates the state of the thenable. + */ + export function cast(value: Promise.Thenable): Promise; + export function cast(value: R): Promise; + + /** + * Sugar for `Promise.resolve(undefined).bind(thisArg);`. See `.bind()`. + */ + export function bind(thisArg: any): Promise; + + /** + * See if `value` is a trusted Promise. + */ + export function is(value: any): boolean; + + /** + * Call this right after the library is loaded to enabled long stack traces. Long stack traces cannot be disabled after being enabled, and cannot be enabled after promises have alread been created. Long stack traces imply a substantial performance penalty, around 4-5x for throughput and 0.5x for latency. + */ + export function longStackTraces(): void; + + /** + * Returns a promise that will be fulfilled with `value` (or `undefined`) after given `ms` milliseconds. If `value` is a promise, the delay will start counting down when it is fulfilled and the returned promise will be fulfilled with the fulfillment value of the `value` promise. + */ + // TODO enable more overloads + export function delay(value: Promise.Thenable, ms: number): Promise; + export function delay(value: R, ms: number): Promise; + export function delay(ms: number): Promise; + + /** + * Returns a function that will wrap the given `nodeFunction`. Instead of taking a callback, the returned function will return a promise whose fate is decided by the callback behavior of the given node function. The node function should conform to node.js convention of accepting a callback as last argument and calling that callback with error as the first argument and success value on the second argument. + * + * If the `nodeFunction` calls its callback with multiple success values, the fulfillment value will be an array of them. + * + * If you pass a `receiver`, the `nodeFunction` will be called as a method on the `receiver`. + */ + // TODO how to model promisify? + export function promisify(nodeFunction: Function, receiver?: any): Function; + + /** + * Promisifies the entire object by going through the object's properties and creating an async equivalent of each function on the object and its prototype chain. The promisified method name will be the original method name postfixed with `Async`. Returns the input object. + * + * Note that the original methods on the object are not overwritten but new methods are created with the `Async`-postfix. For example, if you `promisifyAll()` the node.js `fs` object use `fs.statAsync()` to call the promisified `stat` method. + */ + // TODO how to model promisifyAll? + export function promisifyAll(target: Object): Object; + + /** + * Returns a function that can use `yield` to run asynchronous code synchronously. This feature requires the support of generators which are drafted in the next version of the language. Node version greater than `0.11.2` is required and needs to be executed with the `--harmony-generators` (or `--harmony`) command-line switch. + */ + // TODO fix coroutine GeneratorFunction + export function coroutine(generatorFunction: Function): Function; + + /** + * Spawn a coroutine which may yield promises to run asynchronous code synchronously. This feature requires the support of generators which are drafted in the next version of the language. Node version greater than `0.11.2` is required and needs to be executed with the `--harmony-generators` (or `--harmony`) command-line switch. + */ + // TODO fix spawn GeneratorFunction + export function spawn(generatorFunction: Function): Promise; + + /** + * This is relevant to browser environments with no module loader. + * + * Release control of the `Promise` namespace to whatever it was before this library was loaded. Returns a reference to the library namespace so you can attach it to something else. + */ + export function noConflict(): typeof Promise; + + /** + * Add `handler` as the handler to call when there is a possibly unhandled rejection. The default handler logs the error stack to stderr or `console.error` in browsers. + * + * Passing no value or a non-function will have the effect of removing any kind of handling for possibly unhandled rejections. + */ + export function onPossiblyUnhandledRejection(handler: (reason: any) => any): void; + + /** + * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled when all the items in the array are fulfilled. The promise's fulfillment value is an array with fulfillment values at respective positions to the original array. If any promise in the array rejects, the returned promise is rejected with the rejection reason. + */ + // TODO enable more overloads + // promise of array with promises of value + export function all(values: Thenable[]>): Promise; + // promise of array with values + export function all(values: Thenable): Promise; + // array with promises of value + export function all(values: Thenable[]): Promise; + // array with values + export function all(values: R[]): Promise; + + /** + * Like ``Promise.all`` but for object properties instead of array items. Returns a promise that is fulfilled when all the properties of the object are fulfilled. The promise's fulfillment value is an object with fulfillment values at respective keys to the original object. If any promise in the object rejects, the returned promise is rejected with the rejection reason. + * + * If `object` is a trusted `Promise`, then it will be treated as a promise for object rather than for its properties. All other objects are treated for their properties as is returned by `Object.keys` - the object's own enumerable properties. + * + * *The original object is not modified.* + */ + // TODO verify this is correct + // trusted promise for object + export function props(object: Promise): Promise; + // object + export function props(object: Object): Promise; + + /** + * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled when all the items in the array are either fulfilled or rejected. The fulfillment value is an array of ``PromiseInspection`` instances at respective positions in relation to the input array. + * + * *original: The array is not modified. The input array sparsity is retained in the resulting array.* + */ + // promise of array with promises of value + export function settle(values: Thenable[]>): Promise[]>; + // promise of array with values + export function settle(values: Thenable): Promise[]>; + // array with promises of value + export function settle(values: Thenable[]): Promise[]>; + // array with values + export function settle(values: R[]): Promise[]>; + + /** + * Like `Promise.some()`, with 1 as `count`. However, if the promise fulfills, the fulfillment value is not an array of 1 but the value directly. + */ + // promise of array with promises of value + export function any(values: Thenable[]>): Promise; + // promise of array with values + export function any(values: Thenable): Promise; + // array with promises of value + export function any(values: Thenable[]): Promise; + // array with values + export function any(values: R[]): Promise; + + /** + * Given an array, or a promise of an array, which contains promises (or a mix of promises and values) return a promise that is fulfilled or rejected as soon as a promise in the array is fulfilled or rejected with the respective rejection reason or fulfillment value. + * + * **Note** If you pass empty array or a sparse array with no values, or a promise/thenable for such, it will be forever pending. + */ + // promise of array with promises of value + export function race(values: Thenable[]>): Promise; + // promise of array with values + export function race(values: Thenable): Promise; + // array with promises of value + export function race(values: Thenable[]): Promise; + // array with values + export function race(values: R[]): Promise; + + /** + * Initiate a competetive race between multiple promises or values (values will become immediately fulfilled promises). When `count` amount of promises have been fulfilled, the returned promise is fulfilled with an array that contains the fulfillment values of the winners in order of resolution. + * + * If too many promises are rejected so that the promise can never become fulfilled, it will be immediately rejected with an array of rejection reasons in the order they were thrown in. + * + * *The original array is not modified.* + */ + // promise of array with promises of value + export function some(values: Thenable[]>, count: number): Promise; + // promise of array with values + export function some(values: Thenable, count: number): Promise; + // array with promises of value + export function some(values: Thenable[], count: number): Promise; + // array with values + export function some(values: R[], count: number): Promise; + + /** + * Like `Promise.all()` but instead of having to pass an array, the array is generated from the passed variadic arguments. + */ + // variadic array with promises of value + export function join(...values: Thenable[]): Promise; + // variadic array with values + export function join(...values: R[]): Promise; + + /** + * Map an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `mapper` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well. + * + * If the `mapper` function returns promises or thenables, the returned promise will wait for all the mapped results to be resolved as well. + * + * *The original array is not modified.* + */ + // promise of array with promises of value + export function map(values: Thenable[]>, mapper: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function map(values: Thenable[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise; + + // promise of array with values + export function map(values: Thenable, mapper: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function map(values: Thenable, mapper: (item: R, index: number, arrayLength: number) => U): Promise; + + // array with promises of value + export function map(values: Thenable[], mapper: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function map(values: Thenable[], mapper: (item: R, index: number, arrayLength: number) => U): Promise; + + // array with values + export function map(values: R[], mapper: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function map(values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise; + + /** + * Reduce an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `reducer` function with the signature `(total, current, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well. + * + * If the reducer function returns a promise or a thenable, the result for the promise is awaited for before continuing with next iteration. + * + * *The original array is not modified. If no `intialValue` is given and the array doesn't contain at least 2 items, the callback will not be called and `undefined` is returned. If `initialValue` is given and the array doesn't have at least 1 item, `initialValue` is returned.* + */ + // promise of array with promises of value + export function reduce(values: Thenable[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Thenable, initialValue?: U): Promise; + export function reduce(values: Thenable[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise; + + // promise of array with values + export function reduce(values: Thenable, reducer: (total: U, current: R, index: number, arrayLength: number) => Thenable, initialValue?: U): Promise; + export function reduce(values: Thenable, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise; + + // array with promises of value + export function reduce(values: Thenable[], reducer: (total: U, current: R, index: number, arrayLength: number) => Thenable, initialValue?: U): Promise; + export function reduce(values: Thenable[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise; + + // array with values + export function reduce(values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Thenable, initialValue?: U): Promise; + export function reduce(values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise; + + /** + * Filter an array, or a promise of an array, which contains a promises (or a mix of promises and values) with the given `filterer` function with the signature `(item, index, arrayLength)` where `item` is the resolved value of a respective promise in the input array. If any promise in the input array is rejected the returned promise is rejected as well. + * + * The return values from the filtered functions are coerced to booleans, with the exception of promises and thenables which are awaited for their eventual result. + * + * *The original array is not modified. + */ + // promise of array with promises of value + export function filter(values: Thenable[]>, filterer: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function filter(values: Thenable[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; + + // promise of array with values + export function filter(values: Thenable, filterer: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function filter(values: Thenable, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; + + // array with promises of value + export function filter(values: Thenable[], filterer: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function filter(values: Thenable[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; + + // array with values + export function filter(values: R[], filterer: (item: R, index: number, arrayLength: number) => Thenable): Promise; + export function filter(values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; +} + +declare module 'bluebird' { +export = Promise; +} diff --git a/_infrastructure/tests/typings/lazy.js/lazy.js.d.ts b/_infrastructure/tests/typings/lazy.js/lazy.js.d.ts new file mode 100644 index 0000000000..b9367b73bc --- /dev/null +++ b/_infrastructure/tests/typings/lazy.js/lazy.js.d.ts @@ -0,0 +1,252 @@ +// Type definitions for Lazy.js 0.3.2 +// Project: https://github.com/dtao/lazy.js/ +// Definitions by: Bart van der Schoor +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +declare module LazyJS { + + interface LazyStatic { + (value: string):StringLikeSequence; + + (value: T[]):ArrayLikeSequence; + (value: any[]):ArrayLikeSequence; + (value: Object):ObjectLikeSequence; + (value: Object):ObjectLikeSequence; + + strict():LazyStatic; + + generate(generatorFn: GeneratorCallback, length?: number):GeneratedSequence; + + range(to: number):GeneratedSequence; + range(from: number, to: number, step?: number):GeneratedSequence; + + repeat(value: T, count?: number):GeneratedSequence; + + on(eventType: string):Sequence; + + readFile(path: string):StringLikeSequence; + makeHttpRequest(path: string):StringLikeSequence; + } + + interface ArrayLike { + length:number; + [index:number]:T; + } + + interface Callback { + ():void; + } + + interface ErrorCallback { + (error: any):void; + } + + interface ValueCallback { + (value: T):void; + } + + interface GetKeyCallback { + (value: T):string; + } + + interface TestCallback { + (value: T):boolean; + } + + interface MapCallback { + (value: T):U; + } + + interface MapStringCallback { + (value: string):string; + } + + interface NumberCallback { + (value: T):number; + } + + interface MemoCallback { + (memo: U, value: T):U; + } + + interface GeneratorCallback { + (index: number):T; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + interface Iterator { + new (sequence: Sequence):Iterator; + current():T; + moveNext():boolean; + } + + interface GeneratedSequence extends Sequence { + new(generatorFn: GeneratorCallback, length: number):GeneratedSequence; + length():number; + } + + interface AsyncSequence extends SequenceBase { + each(callback: ValueCallback):AsyncHandle; + } + + interface AsyncHandle { + cancel():void; + onComplete(callback: Callback):void; + onError(callback: ErrorCallback):void; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + module Sequence { + function define(methodName: string[], overrides: Object): Function; + } + + interface Sequence extends SequenceBase { + each(eachFn: ValueCallback):Sequence; + } + + interface SequenceBase extends SequenceBaser { + first():any; + first(count: number):Sequence; + indexOf(value: any, startIndex?: number):Sequence; + + last():any; + last(count: number):Sequence; + lastIndexOf(value: any):Sequence; + + reverse():Sequence; + } + + interface SequenceBaser { + // TODO improve define() (needs ugly overload) + async(interval: number):AsyncSequence; + chunk(size: number):Sequence; + compact():Sequence; + concat(var_args: T[]):Sequence; + consecutive(length: number):Sequence; + contains(value: T):boolean; + countBy(keyFn: GetKeyCallback): ObjectLikeSequence; + countBy(propertyName: string): ObjectLikeSequence; + dropWhile(predicateFn: TestCallback): Sequence; + every(predicateFn: TestCallback): boolean; + filter(predicateFn: TestCallback): Sequence; + find(predicateFn: TestCallback): Sequence; + findWhere(properties: Object): Sequence; + + flatten(): Sequence; + groupBy(keyFn: GetKeyCallback): ObjectLikeSequence; + initial(count?: number): Sequence; + intersection(var_args: T[]): Sequence; + invoke(methodName: string): Sequence; + isEmpty(): boolean; + join(delimiter?: string): string; + map(mapFn: MapCallback): Sequence; + + max(valueFn?: NumberCallback): T; + min(valueFn?: NumberCallback): T; + pluck(propertyName: string): Sequence; + reduce(aggregatorFn: MemoCallback, memo?: U): U; + reduceRight(aggregatorFn: MemoCallback, memo: U): U; + reject(predicateFn: TestCallback): Sequence; + rest(count?: number): Sequence; + shuffle(): Sequence; + some(predicateFn?: TestCallback): boolean; + sortBy(sortFn: NumberCallback): Sequence; + sortedIndex(value: T): Sequence; + sum(valueFn?: NumberCallback): Sequence; + takeWhile(predicateFn: TestCallback): Sequence; + union(var_args: T[]): Sequence; + uniq(): Sequence; + where(properties: Object): Sequence; + without(var_args: T[]): Sequence; + zip(var_args: T[]): Sequence; + + toArray(): T[]; + toObject(): Object; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + module ArrayLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } + + interface ArrayLikeSequence extends Sequence { + // define()X; + concat(): ArrayLikeSequence; + first(count?: number): ArrayLikeSequence; + get(index: number): T; + length(): number; + map(mapFn: MapCallback): ArrayLikeSequence; + pop(): ArrayLikeSequence; + rest(count?: number): ArrayLikeSequence; + reverse(): ArrayLikeSequence; + shift(): ArrayLikeSequence; + slice(begin: number, end?: number): ArrayLikeSequence; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + module ObjectLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } + + interface ObjectLikeSequence extends Sequence { + assign(other: Object): ObjectLikeSequence; + // throws error + //async(): X; + defaults(defaults: Object): ObjectLikeSequence; + functions(): Sequence; + get(property: string): ObjectLikeSequence; + invert(): ObjectLikeSequence; + keys(): StringLikeSequence; + omit(properties: string[]): ObjectLikeSequence; + pairs(): Sequence; + pick(properties: string[]): ObjectLikeSequence; + toArray(): T[]; + toObject(): Object; + values(): Sequence; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + module StringLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } + + interface StringLikeSequence extends SequenceBaser { + charAt(index: number): string; + charCodeAt(index: number): number; + contains(value: string): boolean; + endsWith(suffix: string): boolean; + + first(): string; + first(count: number): StringLikeSequence; + + indexOf(substring: string, startIndex?: number): number; + + last(): string; + last(count: number): StringLikeSequence; + + lastIndexOf(substring: string, startIndex?: number): number; + mapString(mapFn: MapStringCallback): StringLikeSequence; + match(pattern: RegExp): StringLikeSequence; + reverse(): StringLikeSequence; + + split(delimiter: string): StringLikeSequence; + split(delimiter: RegExp): StringLikeSequence; + + startsWith(prefix: string): boolean; + substring(start: number, stop?: number): StringLikeSequence; + toLowerCase(): StringLikeSequence; + toUpperCase(): StringLikeSequence; + } +} + +declare var Lazy: LazyJS.LazyStatic; + +declare module 'lazy.js' { +export = Lazy; +} + diff --git a/_infrastructure/tests/typings/node/node.d.ts b/_infrastructure/tests/typings/node/node.d.ts new file mode 100644 index 0000000000..dca0164b08 --- /dev/null +++ b/_infrastructure/tests/typings/node/node.d.ts @@ -0,0 +1,1258 @@ +// Type definitions for Node.js v0.10.1 +// Project: http://nodejs.org/ +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/************************************************ +* * +* Node.js v0.10.1 API * +* * +************************************************/ + +/************************************************ +* * +* GLOBAL * +* * +************************************************/ +declare var process: NodeProcess; +declare var global: any; + +declare var __filename: string; +declare var __dirname: string; + +declare function setTimeout(callback: (...args: any[]) => void , ms: number , ...args: any[]): NodeTimer; +declare function clearTimeout(timeoutId: NodeTimer): void; +declare function setInterval(callback: (...args: any[]) => void , ms: number , ...args: any[]): NodeTimer; +declare function clearInterval(intervalId: NodeTimer): void; +declare function setImmediate(callback: (...args: any[]) => void , ...args: any[]): any; +declare function clearImmediate(immediateId: any): void; + +declare var require: { + (id: string): any; + resolve(id:string): string; + cache: any; + extensions: any; + main: any; +} + +declare var module: { + exports: any; + require(id: string): any; + id: string; + filename: string; + loaded: boolean; + parent: any; + children: any[]; +} + +// Same as module.exports +declare var exports: any; +declare var SlowBuffer: { + new (str: string, encoding?: string): NodeBuffer; + new (size: number): NodeBuffer; + new (array: any[]): NodeBuffer; + prototype: NodeBuffer; + isBuffer(obj: any): boolean; + byteLength(string: string, encoding?: string): number; + concat(list: NodeBuffer[], totalLength?: number): NodeBuffer; +}; +declare var Buffer: { + new (str: string, encoding?: string): NodeBuffer; + new (size: number): NodeBuffer; + new (array: any[]): NodeBuffer; + prototype: NodeBuffer; + isBuffer(obj: any): boolean; + byteLength(string: string, encoding?: string): number; + concat(list: NodeBuffer[], totalLength?: number): NodeBuffer; +} + +/************************************************ +* * +* INTERFACES * +* * +************************************************/ + +interface ErrnoException extends Error { + errno?: any; + code?: string; + path?: string; + syscall?: string; +} + +interface NodeEventEmitter { + addListener(event: string, listener: Function): NodeEventEmitter; + on(event: string, listener: Function): NodeEventEmitter; + once(event: string, listener: Function): NodeEventEmitter; + removeListener(event: string, listener: Function): NodeEventEmitter; + removeAllListeners(event?: string): NodeEventEmitter; + setMaxListeners(n: number): void; + listeners(event: string): Function[]; + emit(event: string, ...args: any[]): boolean; +} + +interface ReadableStream extends NodeEventEmitter { + readable: boolean; + read(size?: number): any; + setEncoding(encoding: string): void; + pause(): void; + resume(): void; + pipe(destination: T, options?: { end?: boolean; }): T; + unpipe(destination?: T): void; + unshift(chunk: string): void; + unshift(chunk: NodeBuffer): void; + wrap(oldStream: ReadableStream): ReadableStream; +} + +interface WritableStream extends NodeEventEmitter { + writable: boolean; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; +} + +interface ReadWriteStream extends ReadableStream, WritableStream { } + +interface NodeProcess extends NodeEventEmitter { + stdout: WritableStream; + stderr: WritableStream; + stdin: ReadableStream; + argv: string[]; + execPath: string; + abort(): void; + chdir(directory: string): void; + cwd(): string; + env: any; + exit(code?: number): void; + getgid(): number; + setgid(id: number): void; + setgid(id: string): void; + getuid(): number; + setuid(id: number): void; + setuid(id: string): void; + version: string; + versions: { http_parser: string; node: string; v8: string; ares: string; uv: string; zlib: string; openssl: string; }; + config: { + target_defaults: { + cflags: any[]; + default_configuration: string; + defines: string[]; + include_dirs: string[]; + libraries: string[]; + }; + variables: { + clang: number; + host_arch: string; + node_install_npm: boolean; + node_install_waf: boolean; + node_prefix: string; + node_shared_openssl: boolean; + node_shared_v8: boolean; + node_shared_zlib: boolean; + node_use_dtrace: boolean; + node_use_etw: boolean; + node_use_openssl: boolean; + target_arch: string; + v8_no_strict_aliasing: number; + v8_use_snapshot: boolean; + visibility: string; + }; + }; + kill(pid: number, signal?: string): void; + pid: number; + title: string; + arch: string; + platform: string; + memoryUsage(): { rss: number; heapTotal: number; heapUsed: number; }; + nextTick(callback: Function): void; + umask(mask?: number): number; + uptime(): number; + hrtime(time?:number[]): number[]; + + // Worker + send?(message: any, sendHandle?: any): void; +} + +// Buffer class +interface NodeBuffer { + [index: number]: number; + write(string: string, offset?: number, length?: number, encoding?: string): number; + toString(encoding?: string, start?: number, end?: number): string; + length: number; + copy(targetBuffer: NodeBuffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number; + slice(start?: number, end?: number): NodeBuffer; + readUInt8(offset: number, noAsset?: boolean): number; + readUInt16LE(offset: number, noAssert?: boolean): number; + readUInt16BE(offset: number, noAssert?: boolean): number; + readUInt32LE(offset: number, noAssert?: boolean): number; + readUInt32BE(offset: number, noAssert?: boolean): number; + readInt8(offset: number, noAssert?: boolean): number; + readInt16LE(offset: number, noAssert?: boolean): number; + readInt16BE(offset: number, noAssert?: boolean): number; + readInt32LE(offset: number, noAssert?: boolean): number; + readInt32BE(offset: number, noAssert?: boolean): number; + readFloatLE(offset: number, noAssert?: boolean): number; + readFloatBE(offset: number, noAssert?: boolean): number; + readDoubleLE(offset: number, noAssert?: boolean): number; + readDoubleBE(offset: number, noAssert?: boolean): number; + writeUInt8(value: number, offset: number, noAssert?: boolean): void; + writeUInt16LE(value: number, offset: number, noAssert?: boolean): void; + writeUInt16BE(value: number, offset: number, noAssert?: boolean): void; + writeUInt32LE(value: number, offset: number, noAssert?: boolean): void; + writeUInt32BE(value: number, offset: number, noAssert?: boolean): void; + writeInt8(value: number, offset: number, noAssert?: boolean): void; + writeInt16LE(value: number, offset: number, noAssert?: boolean): void; + writeInt16BE(value: number, offset: number, noAssert?: boolean): void; + writeInt32LE(value: number, offset: number, noAssert?: boolean): void; + writeInt32BE(value: number, offset: number, noAssert?: boolean): void; + writeFloatLE(value: number, offset: number, noAssert?: boolean): void; + writeFloatBE(value: number, offset: number, noAssert?: boolean): void; + writeDoubleLE(value: number, offset: number, noAssert?: boolean): void; + writeDoubleBE(value: number, offset: number, noAssert?: boolean): void; + fill(value: any, offset?: number, end?: number): void; +} + +interface NodeTimer { + ref() : void; + unref() : void; +} + +/************************************************ +* * +* MODULES * +* * +************************************************/ +declare module "querystring" { + export function stringify(obj: any, sep?: string, eq?: string): string; + export function parse(str: string, sep?: string, eq?: string, options?: { maxKeys?: number; }): any; + export function escape(): any; + export function unescape(): any; +} + +declare module "events" { + export class EventEmitter implements NodeEventEmitter { + static listenerCount(emitter: EventEmitter, event: string): number; + + addListener(event: string, listener: Function): EventEmitter; + on(event: string, listener: Function): EventEmitter; + once(event: string, listener: Function): EventEmitter; + removeListener(event: string, listener: Function): EventEmitter; + removeAllListeners(event?: string): EventEmitter; + setMaxListeners(n: number): void; + listeners(event: string): Function[]; + emit(event: string, ...args: any[]): boolean; + } +} + +declare module "http" { + import events = require("events"); + import net = require("net"); + import stream = require("stream"); + + export interface Server extends NodeEventEmitter { + listen(port: number, hostname?: string, backlog?: number, callback?: Function): void; + listen(path: string, callback?: Function): void; + listen(handle: any, listeningListener?: Function): void; + close(cb?: any): void; + maxHeadersCount: number; + } + export interface ServerRequest extends NodeEventEmitter, ReadableStream { + method: string; + url: string; + headers: any; + trailers: string; + httpVersion: string; + setEncoding(encoding?: string): void; + pause(): void; + resume(): void; + connection: net.NodeSocket; + } + export interface ServerResponse extends NodeEventEmitter, WritableStream { + // Extended base methods + write(buffer: NodeBuffer): boolean; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + write(str: string, encoding?: string, fd?: string): boolean; + + writeContinue(): void; + writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void; + writeHead(statusCode: number, headers?: any): void; + statusCode: number; + setHeader(name: string, value: string): void; + sendDate: boolean; + getHeader(name: string): string; + removeHeader(name: string): void; + write(chunk: any, encoding?: string): any; + addTrailers(headers: any): void; + + // Extended base methods + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + end(data?: any, encoding?: string): void; + } + export interface ClientRequest extends NodeEventEmitter, WritableStream { + // Extended base methods + write(buffer: NodeBuffer): boolean; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + write(str: string, encoding?: string, fd?: string): boolean; + + write(chunk: any, encoding?: string): void; + abort(): void; + setTimeout(timeout: number, callback?: Function): void; + setNoDelay(noDelay?: Function): void; + setSocketKeepAlive(enable?: boolean, initialDelay?: number): void; + + // Extended base methods + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + end(data?: any, encoding?: string): void; + } + export interface ClientResponse extends NodeEventEmitter, ReadableStream { + statusCode: number; + httpVersion: string; + headers: any; + trailers: any; + setEncoding(encoding?: string): void; + pause(): void; + resume(): void; + } + export interface Agent { maxSockets: number; sockets: any; requests: any; } + + export var STATUS_CODES: any; + export function createServer(requestListener?: (request: ServerRequest, response: ServerResponse) =>void ): Server; + export function createClient(port?: number, host?: string): any; + export function request(options: any, callback?: Function): ClientRequest; + export function get(options: any, callback?: Function): ClientRequest; + export var globalAgent: Agent; +} + +declare module "cluster" { + import child = require("child_process"); + import events = require("events"); + + export interface ClusterSettings { + exec?: string; + args?: string[]; + silent?: boolean; + } + + export class Worker extends events.EventEmitter { + id: string; + process: child.ChildProcess; + suicide: boolean; + send(message: any, sendHandle?: any): void; + kill(signal?: string): void; + destroy(signal?: string): void; + disconnect(): void; + } + + export var settings: ClusterSettings; + export var isMaster: boolean; + export var isWorker: boolean; + export function setupMaster(settings?: ClusterSettings): void; + export function fork(env?: any): Worker; + export function disconnect(callback?: Function): void; + export var worker: Worker; + export var workers: Worker[]; + + // Event emitter + export function addListener(event: string, listener: Function): void; + export function on(event: string, listener: Function): any; + export function once(event: string, listener: Function): void; + export function removeListener(event: string, listener: Function): void; + export function removeAllListeners(event?: string): void; + export function setMaxListeners(n: number): void; + export function listeners(event: string): Function[]; + export function emit(event: string, ...args: any[]): boolean; +} + +declare module "zlib" { + import stream = require("stream"); + export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; } + + export interface Gzip extends ReadWriteStream { } + export interface Gunzip extends ReadWriteStream { } + export interface Deflate extends ReadWriteStream { } + export interface Inflate extends ReadWriteStream { } + export interface DeflateRaw extends ReadWriteStream { } + export interface InflateRaw extends ReadWriteStream { } + export interface Unzip extends ReadWriteStream { } + + export function createGzip(options?: ZlibOptions): Gzip; + export function createGunzip(options?: ZlibOptions): Gunzip; + export function createDeflate(options?: ZlibOptions): Deflate; + export function createInflate(options?: ZlibOptions): Inflate; + export function createDeflateRaw(options?: ZlibOptions): DeflateRaw; + export function createInflateRaw(options?: ZlibOptions): InflateRaw; + export function createUnzip(options?: ZlibOptions): Unzip; + + export function deflate(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function deflateRaw(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function gzip(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function gunzip(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function inflate(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function inflateRaw(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + export function unzip(buf: NodeBuffer, callback: (error: Error, result: any) =>void ): void; + + // Constants + export var Z_NO_FLUSH: number; + export var Z_PARTIAL_FLUSH: number; + export var Z_SYNC_FLUSH: number; + export var Z_FULL_FLUSH: number; + export var Z_FINISH: number; + export var Z_BLOCK: number; + export var Z_TREES: number; + export var Z_OK: number; + export var Z_STREAM_END: number; + export var Z_NEED_DICT: number; + export var Z_ERRNO: number; + export var Z_STREAM_ERROR: number; + export var Z_DATA_ERROR: number; + export var Z_MEM_ERROR: number; + export var Z_BUF_ERROR: number; + export var Z_VERSION_ERROR: number; + export var Z_NO_COMPRESSION: number; + export var Z_BEST_SPEED: number; + export var Z_BEST_COMPRESSION: number; + export var Z_DEFAULT_COMPRESSION: number; + export var Z_FILTERED: number; + export var Z_HUFFMAN_ONLY: number; + export var Z_RLE: number; + export var Z_FIXED: number; + export var Z_DEFAULT_STRATEGY: number; + export var Z_BINARY: number; + export var Z_TEXT: number; + export var Z_ASCII: number; + export var Z_UNKNOWN: number; + export var Z_DEFLATED: number; + export var Z_NULL: number; +} + +declare module "os" { + export function tmpDir(): string; + export function hostname(): string; + export function type(): string; + export function platform(): string; + export function arch(): string; + export function release(): string; + export function uptime(): number; + export function loadavg(): number[]; + export function totalmem(): number; + export function freemem(): number; + export function cpus(): { model: string; speed: number; times: { user: number; nice: number; sys: number; idle: number; irq: number; }; }[]; + export function networkInterfaces(): any; + export var EOL: string; +} + +declare module "https" { + import tls = require("tls"); + import events = require("events"); + import http = require("http"); + + export interface ServerOptions { + pfx?: any; + key?: any; + passphrase?: string; + cert?: any; + ca?: any; + crl?: any; + ciphers?: string; + honorCipherOrder?: boolean; + requestCert?: boolean; + rejectUnauthorized?: boolean; + NPNProtocols?: any; + SNICallback?: (servername: string) => any; + } + + export interface RequestOptions { + host?: string; + hostname?: string; + port?: number; + path?: string; + method?: string; + headers?: any; + auth?: string; + agent?: any; + pfx?: any; + key?: any; + passphrase?: string; + cert?: any; + ca?: any; + ciphers?: string; + rejectUnauthorized?: boolean; + } + + export interface NodeAgent { + maxSockets: number; + sockets: any; + requests: any; + } + export var Agent: { + new (options?: RequestOptions): NodeAgent; + }; + export interface Server extends tls.Server { } + export function createServer(options: ServerOptions, requestListener?: Function): Server; + export function request(options: RequestOptions, callback?: (res: NodeEventEmitter) =>void ): http.ClientRequest; + export function get(options: RequestOptions, callback?: (res: NodeEventEmitter) =>void ): http.ClientRequest; + export var globalAgent: NodeAgent; +} + +declare module "punycode" { + export function decode(string: string): string; + export function encode(string: string): string; + export function toUnicode(domain: string): string; + export function toASCII(domain: string): string; + export var ucs2: ucs2; + interface ucs2 { + decode(string: string): string; + encode(codePoints: number[]): string; + } + export var version: any; +} + +declare module "repl" { + import stream = require("stream"); + import events = require("events"); + + export interface ReplOptions { + prompt?: string; + input?: ReadableStream; + output?: WritableStream; + terminal?: boolean; + eval?: Function; + useColors?: boolean; + useGlobal?: boolean; + ignoreUndefined?: boolean; + writer?: Function; + } + export function start(options: ReplOptions): NodeEventEmitter; +} + +declare module "readline" { + import events = require("events"); + import stream = require("stream"); + + export interface ReadLine extends NodeEventEmitter { + setPrompt(prompt: string, length: number): void; + prompt(preserveCursor?: boolean): void; + question(query: string, callback: Function): void; + pause(): void; + resume(): void; + close(): void; + write(data: any, key?: any): void; + } + export interface ReadLineOptions { + input: ReadableStream; + output: WritableStream; + completer?: Function; + terminal?: boolean; + } + export function createInterface(options: ReadLineOptions): ReadLine; +} + +declare module "vm" { + export interface Context { } + export interface Script { + runInThisContext(): void; + runInNewContext(sandbox?: Context): void; + } + export function runInThisContext(code: string, filename?: string): void; + export function runInNewContext(code: string, sandbox?: Context, filename?: string): void; + export function runInContext(code: string, context: Context, filename?: string): void; + export function createContext(initSandbox?: Context): Context; + export function createScript(code: string, filename?: string): Script; +} + +declare module "child_process" { + import events = require("events"); + import stream = require("stream"); + + export interface ChildProcess extends NodeEventEmitter { + stdin: WritableStream; + stdout: ReadableStream; + stderr: ReadableStream; + pid: number; + kill(signal?: string): void; + send(message: any, sendHandle: any): void; + disconnect(): void; + } + + export function spawn(command: string, args?: string[], options?: { + cwd?: string; + stdio?: any; + custom?: any; + env?: any; + detached?: boolean; + }): ChildProcess; + export function exec(command: string, options: { + cwd?: string; + stdio?: any; + customFds?: any; + env?: any; + encoding?: string; + timeout?: number; + maxBuffer?: number; + killSignal?: string; + }, callback: (error: Error, stdout: NodeBuffer, stderr: NodeBuffer) =>void ): ChildProcess; + export function exec(command: string, callback: (error: Error, stdout: NodeBuffer, stderr: NodeBuffer) =>void ): ChildProcess; + export function execFile(file: string, args: string[], options: { + cwd?: string; + stdio?: any; + customFds?: any; + env?: any; + encoding?: string; + timeout?: number; + maxBuffer?: string; + killSignal?: string; + }, callback: (error: Error, stdout: NodeBuffer, stderr: NodeBuffer) =>void ): ChildProcess; + export function fork(modulePath: string, args?: string[], options?: { + cwd?: string; + env?: any; + encoding?: string; + }): ChildProcess; +} + +declare module "url" { + export interface Url { + href: string; + protocol: string; + auth: string; + hostname: string; + port: string; + host: string; + pathname: string; + search: string; + query: string; + slashes: boolean; + } + + export interface UrlOptions { + protocol?: string; + auth?: string; + hostname?: string; + port?: string; + host?: string; + pathname?: string; + search?: string; + query?: any; + } + + export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url; + export function format(url: UrlOptions): string; + export function resolve(from: string, to: string): string; +} + +declare module "dns" { + export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string; + export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string; + export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; + export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[]; +} + +declare module "net" { + import stream = require("stream"); + + export interface NodeSocket extends ReadWriteStream { + // Extended base methods + write(buffer: NodeBuffer): boolean; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + write(str: string, encoding?: string, fd?: string): boolean; + + connect(port: number, host?: string, connectionListener?: Function): void; + connect(path: string, connectionListener?: Function): void; + bufferSize: number; + setEncoding(encoding?: string): void; + write(data: any, encoding?: string, callback?: Function): void; + destroy(): void; + pause(): void; + resume(): void; + setTimeout(timeout: number, callback?: Function): void; + setNoDelay(noDelay?: boolean): void; + setKeepAlive(enable?: boolean, initialDelay?: number): void; + address(): { port: number; family: string; address: string; }; + remoteAddress: string; + remotePort: number; + bytesRead: number; + bytesWritten: number; + + // Extended base methods + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + end(data?: any, encoding?: string): void; + } + + export var Socket: { + new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): NodeSocket; + }; + + export interface Server extends NodeSocket { + listen(port: number, host?: string, backlog?: number, listeningListener?: Function): void; + listen(path: string, listeningListener?: Function): void; + listen(handle: any, listeningListener?: Function): void; + close(callback?: Function): void; + address(): { port: number; family: string; address: string; }; + maxConnections: number; + connections: number; + } + export function createServer(connectionListener?: (socket: NodeSocket) =>void ): Server; + export function createServer(options?: { allowHalfOpen?: boolean; }, connectionListener?: (socket: NodeSocket) =>void ): Server; + export function connect(options: { allowHalfOpen?: boolean; }, connectionListener?: Function): NodeSocket; + export function connect(port: number, host?: string, connectionListener?: Function): NodeSocket; + export function connect(path: string, connectionListener?: Function): NodeSocket; + export function createConnection(options: { allowHalfOpen?: boolean; }, connectionListener?: Function): NodeSocket; + export function createConnection(port: number, host?: string, connectionListener?: Function): NodeSocket; + export function createConnection(path: string, connectionListener?: Function): NodeSocket; + export function isIP(input: string): number; + export function isIPv4(input: string): boolean; + export function isIPv6(input: string): boolean; +} + +declare module "dgram" { + import events = require("events"); + + export function createSocket(type: string, callback?: Function): Socket; + + interface Socket extends NodeEventEmitter { + send(buf: NodeBuffer, offset: number, length: number, port: number, address: string, callback?: Function): void; + bind(port: number, address?: string): void; + close(): void; + address: { address: string; family: string; port: number; }; + setBroadcast(flag: boolean): void; + setMulticastTTL(ttl: number): void; + setMulticastLoopback(flag: boolean): void; + addMembership(multicastAddress: string, multicastInterface?: string): void; + dropMembership(multicastAddress: string, multicastInterface?: string): void; + } +} + +declare module "fs" { + import stream = require("stream"); + + interface Stats { + isFile(): boolean; + isDirectory(): boolean; + isBlockDevice(): boolean; + isCharacterDevice(): boolean; + isSymbolicLink(): boolean; + isFIFO(): boolean; + isSocket(): boolean; + dev: number; + ino: number; + mode: number; + nlink: number; + uid: number; + gid: number; + rdev: number; + size: number; + blksize: number; + blocks: number; + atime: Date; + mtime: Date; + ctime: Date; + } + + interface FSWatcher extends NodeEventEmitter { + close(): void; + } + + export interface ReadStream extends ReadableStream { } + export interface WriteStream extends WritableStream { } + + export function rename(oldPath: string, newPath: string, callback?: (err?: ErrnoException) => void): void; + export function renameSync(oldPath: string, newPath: string): void; + export function truncate(path: string, callback?: (err?: ErrnoException) => void): void; + export function truncate(path: string, len: number, callback?: (err?: ErrnoException) => void): void; + export function truncateSync(path: string, len?: number): void; + export function ftruncate(fd: number, callback?: (err?: ErrnoException) => void): void; + export function ftruncate(fd: number, len: number, callback?: (err?: ErrnoException) => void): void; + export function ftruncateSync(fd: number, len?: number): void; + export function chown(path: string, uid: number, gid: number, callback?: (err?: ErrnoException) => void): void; + export function chownSync(path: string, uid: number, gid: number): void; + export function fchown(fd: number, uid: number, gid: number, callback?: (err?: ErrnoException) => void): void; + export function fchownSync(fd: number, uid: number, gid: number): void; + export function lchown(path: string, uid: number, gid: number, callback?: (err?: ErrnoException) => void): void; + export function lchownSync(path: string, uid: number, gid: number): void; + export function chmod(path: string, mode: number, callback?: (err?: ErrnoException) => void): void; + export function chmod(path: string, mode: string, callback?: (err?: ErrnoException) => void): void; + export function chmodSync(path: string, mode: number): void; + export function chmodSync(path: string, mode: string): void; + export function fchmod(fd: number, mode: number, callback?: (err?: ErrnoException) => void): void; + export function fchmod(fd: number, mode: string, callback?: (err?: ErrnoException) => void): void; + export function fchmodSync(fd: number, mode: number): void; + export function fchmodSync(fd: number, mode: string): void; + export function lchmod(path: string, mode: number, callback?: (err?: ErrnoException) => void): void; + export function lchmod(path: string, mode: string, callback?: (err?: ErrnoException) => void): void; + export function lchmodSync(path: string, mode: number): void; + export function lchmodSync(path: string, mode: string): void; + export function stat(path: string, callback?: (err: ErrnoException, stats: Stats) => any): void; + export function lstat(path: string, callback?: (err: ErrnoException, stats: Stats) => any): void; + export function fstat(fd: number, callback?: (err: ErrnoException, stats: Stats) => any): void; + export function statSync(path: string): Stats; + export function lstatSync(path: string): Stats; + export function fstatSync(fd: number): Stats; + export function link(srcpath: string, dstpath: string, callback?: (err?: ErrnoException) => void): void; + export function linkSync(srcpath: string, dstpath: string): void; + export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: ErrnoException) => void): void; + export function symlinkSync(srcpath: string, dstpath: string, type?: string): void; + export function readlink(path: string, callback?: (err: ErrnoException, linkString: string) => any): void; + export function readlinkSync(path: string): string; + export function realpath(path: string, callback?: (err: ErrnoException, resolvedPath: string) => any): void; + export function realpath(path: string, cache: {[path: string]: string}, callback: (err: ErrnoException, resolvedPath: string) =>any): void; + export function realpathSync(path: string, cache?: {[path: string]: string}): void; + export function unlink(path: string, callback?: (err?: ErrnoException) => void): void; + export function unlinkSync(path: string): void; + export function rmdir(path: string, callback?: (err?: ErrnoException) => void): void; + export function rmdirSync(path: string): void; + export function mkdir(path: string, callback?: (err?: ErrnoException) => void): void; + export function mkdir(path: string, mode: number, callback?: (err?: ErrnoException) => void): void; + export function mkdir(path: string, mode: string, callback?: (err?: ErrnoException) => void): void; + export function mkdirSync(path: string, mode?: number): void; + export function mkdirSync(path: string, mode?: string): void; + export function readdir(path: string, callback?: (err: ErrnoException, files: string[]) => void): void; + export function readdirSync(path: string): string[]; + export function close(fd: number, callback?: (err?: ErrnoException) => void): void; + export function closeSync(fd: number): void; + export function open(path: string, flags: string, callback?: (err: ErrnoException, fd: number) => any): void; + export function open(path: string, flags: string, mode: number, callback?: (err: ErrnoException, fd: number) => any): void; + export function open(path: string, flags: string, mode: string, callback?: (err: ErrnoException, fd: number) => any): void; + export function openSync(path: string, flags: string, mode?: number): number; + export function openSync(path: string, flags: string, mode?: string): number; + export function utimes(path: string, atime: number, mtime: number, callback?: (err?: ErrnoException) => void): void; + export function utimesSync(path: string, atime: number, mtime: number): void; + export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: ErrnoException) => void): void; + export function futimesSync(fd: number, atime: number, mtime: number): void; + export function fsync(fd: number, callback?: (err?: ErrnoException) => void): void; + export function fsyncSync(fd: number): void; + export function write(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: ErrnoException, written: number, buffer: NodeBuffer) => void): void; + export function writeSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number; + export function read(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number, callback?: (err: ErrnoException, bytesRead: number, buffer: NodeBuffer) => void): void; + export function readSync(fd: number, buffer: NodeBuffer, offset: number, length: number, position: number): number; + export function readFile(filename: string, options: { encoding?: string; flag?: string; }, callback: (err: ErrnoException, data: any) => void): void; + export function readFile(filename: string, callback: (err: ErrnoException, data: NodeBuffer) => void ): void; + export function readFileSync(filename: string, options?: { flag?: string; }): NodeBuffer; + export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string; + export function writeFile(filename: string, data: any, callback?: (err: ErrnoException) => void): void; + export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: ErrnoException) => void): void; + export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: ErrnoException) => void): void; + export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void; + export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void; + export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: ErrnoException) => void): void; + export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: ErrnoException) => void): void; + export function appendFile(filename: string, data: any, callback?: (err: ErrnoException) => void): void; + export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void; + export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void; + export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void; + export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void; + export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void; + export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher; + export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher; + export function exists(path: string, callback?: (exists: boolean) => void): void; + export function existsSync(path: string): boolean; + export function createReadStream(path: string, options?: { + flags?: string; + encoding?: string; + fd?: string; + mode?: number; + bufferSize?: number; + }): ReadStream; + export function createReadStream(path: string, options?: { + flags?: string; + encoding?: string; + fd?: string; + mode?: string; + bufferSize?: number; + }): ReadStream; + export function createWriteStream(path: string, options?: { + flags?: string; + encoding?: string; + string?: string; + }): WriteStream; +} + +declare module "path" { + export function normalize(p: string): string; + export function join(...paths: any[]): string; + export function resolve(...pathSegments: any[]): string; + export function relative(from: string, to: string): string; + export function dirname(p: string): string; + export function basename(p: string, ext?: string): string; + export function extname(p: string): string; + export var sep: string; +} + +declare module "string_decoder" { + export interface NodeStringDecoder { + write(buffer: NodeBuffer): string; + detectIncompleteChar(buffer: NodeBuffer): number; + } + export var StringDecoder: { + new (encoding: string): NodeStringDecoder; + }; +} + +declare module "tls" { + import crypto = require("crypto"); + import net = require("net"); + import stream = require("stream"); + + var CLIENT_RENEG_LIMIT: number; + var CLIENT_RENEG_WINDOW: number; + + export interface TlsOptions { + pfx?: any; //string or buffer + key?: any; //string or buffer + passphrase?: string; + cert?: any; + ca?: any; //string or buffer + crl?: any; //string or string array + ciphers?: string; + honorCipherOrder?: any; + requestCert?: boolean; + rejectUnauthorized?: boolean; + NPNProtocols?: any; //array or Buffer; + SNICallback?: (servername: string) => any; + } + + export interface ConnectionOptions { + host?: string; + port?: number; + socket?: net.NodeSocket; + pfx?: any; //string | Buffer + key?: any; //string | Buffer + passphrase?: string; + cert?: any; //string | Buffer + ca?: any; //Array of string | Buffer + rejectUnauthorized?: boolean; + NPNProtocols?: any; //Array of string | Buffer + servername?: string; + } + + export interface Server extends net.Server { + // Extended base methods + listen(port: number, host?: string, backlog?: number, listeningListener?: Function): void; + listen(path: string, listeningListener?: Function): void; + listen(handle: any, listeningListener?: Function): void; + + listen(port: number, host?: string, callback?: Function): void; + close(): void; + address(): { port: number; family: string; address: string; }; + addContext(hostName: string, credentials: { + key: string; + cert: string; + ca: string; + }): void; + maxConnections: number; + connections: number; + } + + export interface ClearTextStream extends ReadWriteStream { + authorized: boolean; + authorizationError: Error; + getPeerCertificate(): any; + getCipher: { + name: string; + version: string; + }; + address: { + port: number; + family: string; + address: string; + }; + remoteAddress: string; + remotePort: number; + } + + export interface SecurePair { + encrypted: any; + cleartext: any; + } + + export function createServer(options: TlsOptions, secureConnectionListener?: (cleartextStream: ClearTextStream) =>void ): Server; + export function connect(options: TlsOptions, secureConnectionListener?: () =>void ): ClearTextStream; + export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream; + export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream; + export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair; +} + +declare module "crypto" { + export interface CredentialDetails { + pfx: string; + key: string; + passphrase: string; + cert: string; + ca: any; //string | string array + crl: any; //string | string array + ciphers: string; + } + export interface Credentials { context?: any; } + export function createCredentials(details: CredentialDetails): Credentials; + export function createHash(algorithm: string): Hash; + export function createHmac(algorithm: string, key: string): Hmac; + interface Hash { + update(data: any, input_encoding?: string): Hash; + digest(encoding?: string): string; + } + interface Hmac { + update(data: any): void; + digest(encoding?: string): void; + } + export function createCipher(algorithm: string, password: any): Cipher; + export function createCipheriv(algorithm: string, key: any, iv: any): Cipher; + interface Cipher { + update(data: any, input_encoding?: string, output_encoding?: string): string; + final(output_encoding?: string): string; + setAutoPadding(auto_padding: boolean): void; + createDecipher(algorithm: string, password: any): Decipher; + createDecipheriv(algorithm: string, key: any, iv: any): Decipher; + } + interface Decipher { + update(data: any, input_encoding?: string, output_encoding?: string): void; + final(output_encoding?: string): string; + setAutoPadding(auto_padding: boolean): void; + } + export function createSign(algorithm: string): Signer; + interface Signer { + update(data: any): void; + sign(private_key: string, output_format: string): string; + } + export function createVerify(algorith: string): Verify; + interface Verify { + update(data: any): void; + verify(object: string, signature: string, signature_format?: string): boolean; + } + export function createDiffieHellman(prime_length: number): DiffieHellman; + export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman; + interface DiffieHellman { + generateKeys(encoding?: string): string; + computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string; + getPrime(encoding?: string): string; + getGenerator(encoding: string): string; + getPublicKey(encoding?: string): string; + getPrivateKey(encoding?: string): string; + setPublicKey(public_key: string, encoding?: string): void; + setPrivateKey(public_key: string, encoding?: string): void; + } + export function getDiffieHellman(group_name: string): DiffieHellman; + export function pbkdf2(password: string, salt: string, iterations: number, keylen: number, callback: (err: Error, derivedKey: string) => any): void; + export function randomBytes(size: number): NodeBuffer; + export function randomBytes(size: number, callback: (err: Error, buf: NodeBuffer) =>void ): void; + export function pseudoRandomBytes(size: number): NodeBuffer; + export function pseudoRandomBytes(size: number, callback: (err: Error, buf: NodeBuffer) =>void ): void; +} + +declare module "stream" { + import events = require("events"); + + export interface ReadableOptions { + highWaterMark?: number; + encoding?: string; + objectMode?: boolean; + } + + export class Readable extends events.EventEmitter implements ReadableStream { + readable: boolean; + constructor(opts?: ReadableOptions); + _read(size: number): void; + read(size?: number): any; + setEncoding(encoding: string): void; + pause(): void; + resume(): void; + pipe(destination: T, options?: { end?: boolean; }): T; + unpipe(destination?: T): void; + unshift(chunk: string): void; + unshift(chunk: NodeBuffer): void; + wrap(oldStream: ReadableStream): ReadableStream; + push(chunk: any, encoding?: string): boolean; + } + + export interface WritableOptions { + highWaterMark?: number; + decodeStrings?: boolean; + } + + export class Writable extends events.EventEmitter implements WritableStream { + writable: boolean; + constructor(opts?: WritableOptions); + _write(data: NodeBuffer, encoding: string, callback: Function): void; + _write(data: string, encoding: string, callback: Function): void; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + } + + export interface DuplexOptions extends ReadableOptions, WritableOptions { + allowHalfOpen?: boolean; + } + + // Note: Duplex extends both Readable and Writable. + export class Duplex extends Readable implements ReadWriteStream { + writable: boolean; + constructor(opts?: DuplexOptions); + _write(data: NodeBuffer, encoding: string, callback: Function): void; + _write(data: string, encoding: string, callback: Function): void; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + } + + export interface TransformOptions extends ReadableOptions, WritableOptions {} + + // Note: Transform lacks the _read and _write methods of Readable/Writable. + export class Transform extends events.EventEmitter implements ReadWriteStream { + readable: boolean; + writable: boolean; + constructor(opts?: TransformOptions); + _transform(chunk: NodeBuffer, encoding: string, callback: Function): void; + _transform(chunk: string, encoding: string, callback: Function): void; + _flush(callback: Function): void; + read(size?: number): any; + setEncoding(encoding: string): void; + pause(): void; + resume(): void; + pipe(destination: T, options?: { end?: boolean; }): T; + unpipe(destination?: T): void; + unshift(chunk: string): void; + unshift(chunk: NodeBuffer): void; + wrap(oldStream: ReadableStream): ReadableStream; + push(chunk: any, encoding?: string): boolean; + write(buffer: NodeBuffer, cb?: Function): boolean; + write(str: string, cb?: Function): boolean; + write(str: string, encoding?: string, cb?: Function): boolean; + end(): void; + end(buffer: NodeBuffer, cb?: Function): void; + end(str: string, cb?: Function): void; + end(str: string, encoding?: string, cb?: Function): void; + } + + export class PassThrough extends Transform {} +} + +declare module "util" { + export interface InspectOptions { + showHidden?: boolean; + depth?: number; + colors?: boolean; + customInspect?: boolean; + } + + export function format(format: any, ...param: any[]): string; + export function debug(string: string): void; + export function error(...param: any[]): void; + export function puts(...param: any[]): void; + export function print(...param: any[]): void; + export function log(string: string): void; + export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string; + export function inspect(object: any, options: InspectOptions): string; + export function isArray(object: any): boolean; + export function isRegExp(object: any): boolean; + export function isDate(object: any): boolean; + export function isError(object: any): boolean; + export function inherits(constructor: any, superConstructor: any): void; +} + +declare module "assert" { + function internal (value: any, message?: string): void; + module internal { + export class AssertionError implements Error { + name: string; + message: string; + actual: any; + expected: any; + operator: string; + generatedMessage: boolean; + + constructor(options?: {message?: string; actual?: any; expected?: any; + operator?: string; stackStartFunction?: Function}); + } + + export function fail(actual?: any, expected?: any, message?: string, operator?: string): void; + export function ok(value: any, message?: string): void; + export function equal(actual: any, expected: any, message?: string): void; + export function notEqual(actual: any, expected: any, message?: string): void; + export function deepEqual(actual: any, expected: any, message?: string): void; + export function notDeepEqual(acutal: any, expected: any, message?: string): void; + export function strictEqual(actual: any, expected: any, message?: string): void; + export function notStrictEqual(actual: any, expected: any, message?: string): void; + export var throws: { + (block: Function, message?: string): void; + (block: Function, error: Function, message?: string): void; + (block: Function, error: RegExp, message?: string): void; + (block: Function, error: (err: any) => boolean, message?: string): void; + } + + export var doesNotThrow: { + (block: Function, message?: string): void; + (block: Function, error: Function, message?: string): void; + (block: Function, error: RegExp, message?: string): void; + (block: Function, error: (err: any) => boolean, message?: string): void; + } + + export function ifError(value: any): void; + } + + export = internal; +} + +declare module "tty" { + import net = require("net"); + + export function isatty(fd: number): boolean; + export interface ReadStream extends net.NodeSocket { + isRaw: boolean; + setRawMode(mode: boolean): void; + } + export interface WriteStream extends net.NodeSocket { + columns: number; + rows: number; + } +} + +declare module "domain" { + import events = require("events"); + + export class Domain extends events.EventEmitter { + run(fn: Function): void; + add(emitter: NodeEventEmitter): void; + remove(emitter: NodeEventEmitter): void; + bind(cb: (err: Error, data: any) => any): any; + intercept(cb: (data: any) => any): any; + dispose(): void; + + addListener(event: string, listener: Function): Domain; + on(event: string, listener: Function): Domain; + once(event: string, listener: Function): Domain; + removeListener(event: string, listener: Function): Domain; + removeAllListeners(event?: string): Domain; + } + + export function create(): Domain; +} diff --git a/_infrastructure/tests/typings/tsd.d.ts b/_infrastructure/tests/typings/tsd.d.ts new file mode 100644 index 0000000000..717e8e49a3 --- /dev/null +++ b/_infrastructure/tests/typings/tsd.d.ts @@ -0,0 +1,3 @@ +/// +/// +/// diff --git a/package.json b/package.json index bb4c816f6e..a18c4fcd70 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,8 @@ "dependencies": { "git-wrapper": "~0.1.1", "glob": "~3.2.9", - "source-map-support": "~0.2.5" + "source-map-support": "~0.2.5", + "bluebird": "~1.0.7", + "lazy.js": "~0.3.2" } } diff --git a/tsd.json b/tsd.json new file mode 100644 index 0000000000..60f508161b --- /dev/null +++ b/tsd.json @@ -0,0 +1,15 @@ +{ + "version": "v4", + "repo": "borisyankov/DefinitelyTyped", + "ref": "master", + "path": "_infrastructure/tests/typings", + "bundle": "_infrastructure/tests/typings/tsd.d.ts", + "installed": { + "bluebird/bluebird.d.ts": { + "commit": "bac5b4311465c7052467ec315d0cbb1c640a69d6" + }, + "node/node.d.ts": { + "commit": "bac5b4311465c7052467ec315d0cbb1c640a69d6" + } + } +}