microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #9006 from Microsoft/transforms-removeLegacyEmitter

Browse Source 
[Transforms] Replace legacy emitter with tree transforming emitter.
This commit is contained in:
Ron Buckton 2016-06-07 16:28:27 -07:00
commit ede7692620
9 changed files with 2866 additions and 11522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
Jakefile.js
View File

@ -5,7 +5,6 @@ var os = require("os");
var path = require("path");
var child_process = require("child_process");
var Linter = require("tslint");
var readline = require("readline");
// Variables
var compilerDirectory = "src/compiler/";
@ -54,7 +53,6 @@ var compilerSources = [
"transformer.ts",
"sourcemap.ts",
"comments.ts",
"printer.ts",
"declarationEmitter.ts",
"emitter.ts",
"program.ts",
@ -87,7 +85,6 @@ var servicesSources = [
"transformer.ts",
"sourcemap.ts",
"comments.ts",
"printer.ts",
"declarationEmitter.ts",
"emitter.ts",
"program.ts",
@ -193,17 +190,6 @@ var harnessSources = harnessCoreSources.concat([
return path.join(serverDirectory, f);
}));
var librarySourceMap = [
{ target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
{ target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"] },
{ target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"] },
{ target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"] },
{ target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
{ target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"] },
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
{ target: "lib.core.es7.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts", "es7.d.ts"] },
{ target: "lib.es7.d.ts", sources: ["header.d.ts", "es6.d.ts", "es7.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
];
var es2015LibrarySources = [
"es2015.core.d.ts",
"es2015.collection.d.ts",
@ -314,6 +300,10 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
*/
function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts, callback) {
file(outFile, prereqs, function() {
if (process.env.USE_TRANSFORMS === "false") {
useBuiltCompiler = false;
}
var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
var options = "--noImplicitAny --noEmitOnError --pretty";
opts = opts || {};
@ -357,10 +347,6 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
options += " --stripInternal";
}
if (useBuiltCompiler && !environmentVariableIsDisabled("USE_TRANSFORMS")) {
console.warn("\u001b[93mwarning: 'USE_TRANSFORMS' environment variable is not set to 'false'. Experimental transforms will be enabled by default.\u001b[0m");
}
var cmd = host + " " + compilerPath + " " + options + " ";
cmd = cmd + sources.join(" ");
console.log(cmd + "\n");
@ -723,33 +709,16 @@ function cleanTestDirs() {
}
// used to pass data from jake command line directly to run.js
function writeTestConfigFile(tests, light, taskConfigFolder, workerCount, stackTraceLimit) {
var testConfig;
if (tests) {
(testConfig || (testConfig = {})).test = [tests];
}
if (light) {
(testConfig || (testConfig = {})).light = light;
}
if (workerCount) {
(testConfig || (testConfig = {})).workerCount = workerCount;
}
if (taskConfigFolder) {
(testConfig || (testConfig = {})).taskConfigFolder = taskConfigFolder;
}
if (/^(\d+|full)$/.test(stackTraceLimit)) {
(testConfig || (testConfig = {})).stackTraceLimit = stackTraceLimit;
}
if (testConfig) {
var testConfigContents = JSON.stringify(testConfig);
console.log('Running tests with config: ' + testConfigContents);
fs.writeFileSync('test.config', testConfigContents);
}
function writeTestConfigFile(tests, light, taskConfigsFolder, workerCount, stackTraceLimit) {
var testConfigContents = JSON.stringify({
test: tests ? [tests] : undefined,
light: light,
workerCount: workerCount,
taskConfigsFolder: taskConfigsFolder,
stackTraceLimit: stackTraceLimit
});
console.log('Running tests with config: ' + testConfigContents);
fs.writeFileSync('test.config', testConfigContents);
}
function deleteTemporaryProjectOutput() {
@ -758,257 +727,8 @@ function deleteTemporaryProjectOutput() {
}
}
function runTestsAndWriteOutput(file, defaultSubsets) {
cleanTestDirs();
var tests = process.env.test || process.env.tests || process.env.t;
var light = process.env.light || false;
var testConfigFile = 'test.config';
if (fs.existsSync(testConfigFile)) {
fs.unlinkSync(testConfigFile);
}
writeTestConfigFile(testConfigFile, tests, light, 10);
if (tests && tests.toLocaleLowerCase() === "rwc") {
testTimeout = 100000;
}
var subsetRegexes;
var subsets;
if (tests || defaultSubsets.length === 0) {
subsetRegexes = [tests];
subsets = [tests];
}
else {
subsets = [];
subsetRegexes = [];
negations = [];
for (var i = 0; i < defaultSubsets.length; ++i) {
var subset = defaultSubsets[i];
subsets.push(subset.name);
subsetRegexes.push(subset.pattern);
negations.push(subset.pattern);
}
subsets.push("other");
subsetRegexes.push("^(?!" + negations.join("|") + ")");
}
var out = fs.createWriteStream(file);
var outFileNames = subsetRegexes.length !== 1 ? [] : undefined;
var tapRange = /^(\d+)\.\.(\d+)(?:$|\r\n?|\n)/;
var tapOk = /^ok\s/;
var tapNotOk = /^not\sok\s/;
var tapComment = /^#(?: (tests|pass|fail) (\d+)$)?/;
var typeError = /^\s+TypeError:/;
var debugError = /^\s+Error:\sDebug\sFailure\./;
var progress = new ProgressBar();
var totalTypeErrorCount = 0;
var totalDebugErrorCount = 0;
var totalReportedTestCount = 0;
var totalReportedPassCount = 0;
var totalReportedFailCount = 0;
var counter = subsetRegexes.length;
var errorStatus;
subsetRegexes.forEach(function (subsetRegex, i) {
var expectedTestCount = 0;
var testCount = 0;
var failureCount = 0;
var successCount = 0;
var reportedTestCount = 0;
var reportedPassCount = 0;
var reportedFailCount = 0;
var comments = [];
var typeErrorCount = 0;
var debugErrorCount = 0;
var outFileName;
var outFile;
if (subsetRegexes.length === 1) {
outFile = out;
}
else {
outFileName = path.join(os.tmpdir(), path.basename(file) + "." + i);
outFileNames[i] = outFileName;
outFile = fs.createWriteStream(outFileName);
}
var args = [];
args.push("-R", "tap");
args.push("--no-colors");
args.push("-t", testTimeout);
if (subsetRegex) {
args.push("-g", '"' + subsetRegex + '"');
}
args.push(run);
var cmd = "mocha " + args.join(" ");
if (subsetRegexes.length === 1) {
console.log(cmd);
}
updateProgress(0);
var p = child_process.spawn(
process.platform === "win32" ? "cmd" : "/bin/sh",
process.platform === "win32" ? ["/c", cmd] : ["-c", cmd], {
windowsVerbatimArguments: true,
env: { NODE_ENV: "development" }
});
var rl = readline.createInterface({
input: p.stdout,
terminal: false
});
var start;
var end;
rl.on("line", function (line) {
if (!start) start = Date.now();
var m = tapRange.exec(line);
if (m) {
expectedTestCount = parseInt(m[2]);
return;
}
if (tapOk.test(line)) {
outFile.write(line.replace(/^ok\s+\d+\s+/, "ok ") + os.EOL);
successCount++;
}
else if (tapNotOk.test(line)) {
outFile.write(line.replace(/^not\s+ok\s+\d+\s+/, "not ok ") + os.EOL);
failureCount++;
}
else {
m = tapComment.exec(line);
if (m) {
if (m[1] === "tests") {
end = Date.now();
reportedTestCount = parseInt(m[2]);
}
else if (m[1] === "pass") {
reportedPassCount = parseInt(m[2]);
}
else if (m[1] === "fail") {
reportedFailCount = parseInt(m[2]);
}
else {
outFile.write(line + os.EOL);
}
}
else {
outFile.write(line + os.EOL);
if (typeError.test(line)) {
typeErrorCount++;
}
else if (debugError.test(line)) {
debugErrorCount++;
}
}
return;
}
testCount++;
var percentComplete = testCount * 100 / expectedTestCount;
updateProgress(percentComplete);
});
p.on("exit", function (status) {
totalReportedTestCount += reportedTestCount;
totalReportedPassCount += reportedPassCount;
totalReportedFailCount += reportedFailCount;
totalTypeErrorCount += typeErrorCount;
totalDebugErrorCount += debugErrorCount;
var duration = end - start;
var summary =
"pass: " + reportedPassCount + "/" + reportedTestCount +
", duration: " + (duration / 1000).toFixed(2) + "s";
updateProgress(100, summary);
if (subsetRegexes.length !== 1) {
outFile.close();
}
if (status && !errorStatus) {
errorStatus = status;
}
counter--;
if (counter === 0) {
if (subsetRegexes.length !== 1) {
concatenate();
}
else {
finish();
}
}
});
function updateProgress(percentComplete, status) {
var title = status || (percentComplete < 100 ? "running..." : "done");
if (subsetRegexes.length !== 1) {
title = "[" + subsets[i] + "] " + title;
}
progress.update(percentComplete,
/*foregroundColor*/ failureCount > 0
? "red"
: successCount === expectedTestCount
? "green"
: "cyan",
/*backgroundColor*/ "gray",
title,
i
);
}
});
function concatenate() {
if (outFileNames.length > 0) {
var outFileName = outFileNames.shift();
var outFile = fs.createReadStream(outFileName);
outFile.pipe(out, { end: false });
outFile.on("end", function () {
fs.unlinkSync(outFileName);
concatenate();
});
return;
}
finish();
}
function finish() {
out.write(
"# tests " + totalReportedTestCount + os.EOL +
"# pass " + totalReportedPassCount + os.EOL +
"# fail " + totalReportedFailCount + os.EOL);
console.log("# tests " + totalReportedTestCount);
console.log("# pass " + totalReportedPassCount);
console.log("# fail " + totalReportedFailCount);
if (totalTypeErrorCount) {
console.log("# type errors " + totalTypeErrorCount);
}
if (totalDebugErrorCount) {
console.log("# debug errors " + totalDebugErrorCount);
}
deleteTemporaryProjectOutput();
if (totalReportedFailCount) {
fail("Test failures reported: " + totalReportedFailCount);
}
else {
complete();
}
}
}
function runConsoleTests(defaultReporter, runInParallel, dirty) {
function runConsoleTests(defaultReporter, runInParallel) {
var dirty = process.env.dirty;
if (!dirty) {
cleanTestDirs();
}
@ -1016,7 +736,7 @@ function runConsoleTests(defaultReporter, runInParallel, dirty) {
var debug = process.env.debug || process.env.d;
tests = process.env.test || process.env.tests || process.env.t;
var light = process.env.light || false;
var stackTraceLimit = process.env.stackTraceLimit || 1;
var stackTraceLimit = process.env.stackTraceLimit;
var testConfigFile = 'test.config';
if (fs.existsSync(testConfigFile)) {
fs.unlinkSync(testConfigFile);
@ -1134,33 +854,11 @@ task("runtests-parallel", ["build-rules", "tests", builtLocalDirectory], functio
runConsoleTests('min', /*runInParallel*/ true);
}, {async: true});
desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false lint=true.");
desc("Runs the tests using the built run.js file. Optional arguments are: t[ests]=regex r[eporter]=[list|spec|json|<more>] d[ebug]=true color[s]=false lint=true dirty=false.");
task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
runConsoleTests('mocha-fivemat-progress-reporter', /*runInParallel*/ false);
}, {async: true});
task("runtests-file", ["build-rules", "tests", builtLocalDirectory], function () {
var subsets = [];
var cores = os.cpus().length;
if (cores > 1) {
subsets.push({ name: "conformance", pattern: "^conformance\\b" });
subsets.push({ name: "compiler", pattern: "^compiler\\b" });
subsets.push({ name: "projects", pattern: "^Projects\\b" });
if (cores > 4) {
subsets.push({ name: "fourslash", pattern: "^fourslash\\b" });
subsets.push({ name: "fourslash (shims, shims-pp, server)", pattern: "^fourslash-" });
}
else {
subsets.push({ name: "fourslash", pattern: "^fourslash" });
}
}
runTestsAndWriteOutput("tests/baselines/local/testresults.tap", subsets);
}, { async: true });
task("runtests-dirty", ["build-rules", "tests", builtLocalDirectory], function () {
runConsoleTests("mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*dirty*/ true);
}, { async: true });
desc("Generates code coverage data via instanbul");
task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run;
@ -1442,94 +1140,6 @@ task("lint-server", ["build-rules"], function() {
}
});
function ProgressBar() {
this._progress = [];
this._lineCount = 0;
}
ProgressBar.prototype = {
progressChars: ["\u0020", "\u2591", "\u2592", "\u2593", "\u2588"],
colors: {
foreground: {
black: "\u001b[90m",
red: "\u001b[91m",
green: "\u001b[92m",
yellow: "\u001b[93m",
blue: "\u001b[94m",
magenta: "\u001b[95m",
cyan: "\u001b[96m",
white: "\u001b[97m",
gray: "\u001b[37m"
},
background: {
black: "\u001b[40m",
red: "\u001b[41m",
green: "\u001b[42m",
yellow: "\u001b[43m",
blue: "\u001b[44m",
magenta: "\u001b[45m",
cyan: "\u001b[46m",
white: "\u001b[47m",
gray: "\u001b[100m"
},
reset: "\u001b[0m"
},
update: function (percentComplete, foregroundColor, backgroundColor, title, index) {
if (index === undefined) index = 0;
var progress = "";
for (var i = 0; i < 100; i += 4) {
progress += this.progressChars[Math.floor(Math.max(0, Math.min(4, percentComplete - i)))];
}
foregroundColor = foregroundColor && this.colors.foreground[foregroundColor];
backgroundColor = backgroundColor && this.colors.background[backgroundColor];
if (foregroundColor || backgroundColor) {
if (foregroundColor) {
progress = foregroundColor + progress;
}
if (backgroundColor) {
progress = backgroundColor + progress;
}
progress += this.colors.reset;
}
if (title) {
progress += " " + title;
}
if (this._progress[index] !== progress) {
this._progress[index] = progress;
this._print(index);
}
},
clear: function () {
if (this._lastProgress) {
readline.moveCursor(process.stdout, -process.stdout.columns, 0);
readline.clearLine(process.stdout, 1);
this._lastProgress = undefined;
this.visible = false;
}
},
_print: function (index) {
readline.moveCursor(process.stdout, -process.stdout.columns, -this._lineCount);
var lineCount = 0;
for (var i = 0; i < this._progress.length; i++) {
if (i === index) {
readline.clearLine(process.stdout, 1);
process.stdout.write(this._progress[i] + os.EOL);
}
else {
readline.moveCursor(process.stdout, -process.stdout.columns, +1);
}
lineCount++;
}
this._lineCount = lineCount;
}
};
function environmentVariableIsEnabled(name) {
return /^(y(es)?|t(rue)?|on|enabled?|1|\+)$/.test(process.env[name]);
}

6
src/compiler/commandLineParser.ts
View File

@ -374,12 +374,6 @@ namespace ts {
type: "boolean",
description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
},
{
name: "useLegacyEmitter",
type: "boolean",
experimental: true,
description: Diagnostics.Use_the_legacy_emitter_instead_of_the_transforming_emitter
},
{
name: "listEmittedFiles",
type: "boolean"

4
src/compiler/diagnosticMessages.json
View File

@ -2773,10 +2773,6 @@
"code": 6131
},
"Use the legacy emitter instead of the transforming emitter.": {
"category": "Message",
"code": 6132
},
"Variable '{0}' implicitly has an '{1}' type.": {
"category": "Error",
"code": 7005

10989
src/compiler/emitter.ts
View File

File diff suppressed because it is too large Load Diff

2918
src/compiler/printer.ts
View File

File diff suppressed because it is too large Load Diff

10
src/compiler/program.ts
View File

@ -1,7 +1,6 @@
/// <reference path="sys.ts" />
/// <reference path="emitter.ts" />
/// <reference path="core.ts" />
/// <reference path="printer.ts" />
namespace ts {
/** The version of the TypeScript compiler release */
@ -1337,14 +1336,7 @@ namespace ts {
const emitStart = performance.mark();
// TODO(rbuckton): remove USE_TRANSFORMS condition when we switch to transforms permanently.
let useLegacyEmitter = options.useLegacyEmitter;
if (/^(no?|f(alse)?|0|-)$/i.test(getEnvironmentVariable("USE_TRANSFORMS", host))) {
useLegacyEmitter = true;
}
const fileEmitter = useLegacyEmitter ? emitFiles : printFiles;
const emitResult = fileEmitter(
const emitResult = emitFiles(
emitResolver,
getEmitHost(writeFileCallback),
sourceFile);

10
src/compiler/tsconfig.json
View File

@ -18,9 +18,17 @@
"checker.ts",
"factory.ts",
"visitor.ts",
"transformers/ts.ts",
"transformers/jsx.ts",
"transformers/es7.ts",
"transformers/es6.ts",
"transformers/destructuring.ts",
"transformers/module/module.ts",
"transformers/module/system.ts",
"transformers/module/es6.ts",
"transformer.ts",
"comments.ts",
"printer.ts",
"sourcemap.ts",
"declarationEmitter.ts",
"emitter.ts",
"program.ts",

12
src/compiler/utilities.ts
View File

@ -2433,6 +2433,18 @@ namespace ts {
};
}
export function getResolvedExternalModuleName(host: EmitHost, file: SourceFile): string {
return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
}
export function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration): string {
const file = resolver.getExternalModuleFileFromDeclaration(declaration);
if (!file || isDeclarationFile(file)) {
return undefined;
}
return getResolvedExternalModuleName(host, file);
}
/**
* Resolves a local path to a path which is absolute to the base of the emit
*/

13
src/services/tsconfig.json
View File

@ -15,6 +15,19 @@
"../compiler/utilities.ts",
"../compiler/binder.ts",
"../compiler/checker.ts",
"../compiler/factory.ts",
"../compiler/visitor.ts",
"../compiler/transformers/ts.ts",
"../compiler/transformers/jsx.ts",
"../compiler/transformers/es7.ts",
"../compiler/transformers/es6.ts",
"../compiler/transformers/destructuring.ts",
"../compiler/transformers/module/module.ts",
"../compiler/transformers/module/system.ts",
"../compiler/transformers/module/es6.ts",
"../compiler/transformer.ts",
"../compiler/comments.ts",
"../compiler/sourcemap.ts",
"../compiler/emitter.ts",
"../compiler/program.ts",
"../compiler/declarationEmitter.ts",