microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-30 04:16:48 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

use commandlineParser's optionDeclarations to parse compiler options instead of doing it explicitlly

Browse Source
This commit is contained in:
Mohamed Hegazy
2015-08-21 19:17:09 -07:00
parent b911dc3faf
commit 60e25a7e1d
57 changed files with 127 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

262
src/harness/harness.ts
View File

@@ -838,9 +838,9 @@ module Harness {
}
export function createSourceFileAndAssertInvariants(
fileName: string,
sourceText: string,
languageVersion: ts.ScriptTarget) {
fileName: string,
sourceText: string,
languageVersion: ts.ScriptTarget) {
// We'll only assert inletiants outside of light mode.
const shouldAssertInvariants = !Harness.lightMode;
@@ -870,13 +870,13 @@ module Harness {
}
export function createCompilerHost(
inputFiles: { unitName: string; content: string; }[],
writeFile: (fn: string, contents: string, writeByteOrderMark: boolean) => void,
scriptTarget: ts.ScriptTarget,
useCaseSensitiveFileNames: boolean,
// the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host
currentDirectory?: string,
newLineKind?: ts.NewLineKind): ts.CompilerHost {
inputFiles: { unitName: string; content: string; }[],
writeFile: (fn: string, contents: string, writeByteOrderMark: boolean) => void,
scriptTarget: ts.ScriptTarget,
useCaseSensitiveFileNames: boolean,
// the currentDirectory is needed for rwcRunner to passed in specified current directory to compiler host
currentDirectory?: string,
newLineKind?: ts.NewLineKind): ts.CompilerHost {
// Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames
function getCanonicalFileName(fileName: string): string {
@@ -894,7 +894,7 @@ module Harness {
}
};
inputFiles.forEach(register);
function getSourceFile(fn: string, languageVersion: ts.ScriptTarget) {
fn = ts.normalizePath(fn);
if (Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(fn))) {
@@ -938,200 +938,64 @@ module Harness {
interface HarnesOptions {
useCaseSensitiveFileNames?: boolean;
includeBuiltFileNames?: string[];
includeBuiltFile?: string;
baselineFile?: string;
}
// Additional options not already in ts.optionDeclarations
const harnessOptionDeclarations: ts.CommandLineOption[] = [
{ name: "allowNonTsExtensions", type: "boolean" },
{ name: "useCaseSensitiveFileNames", type: "boolean" },
{ name: "baselineFile", type: "string" },
{ name: "includeBuiltFile", type: "string" },
{ name: "fileName", type: "string" },
{ name: "noErrorTruncation", type: "boolean" }
];
let optionsIndex: ts.Map<ts.CommandLineOption>;
function getCommandLineOption(name: string): ts.CommandLineOption {
if (!optionsIndex) {
optionsIndex = {};
let optionDeclarations = harnessOptionDeclarations.concat(ts.optionDeclarations);
for (let option of optionDeclarations) {
optionsIndex[option.name.toLowerCase()] = option;
}
}
return ts.lookUp(optionsIndex, name.toLowerCase());
}
export function setCompilerOptionsFromHarnessSetting(settings: Harness.TestCaseParser.CompilerSettings, options: ts.CompilerOptions & HarnesOptions): void {
for (let name in settings) {
if (settings.hasOwnProperty(name)) {
let value = settings[name] ? settings[name].toLowerCase() : settings[name];
switch (name.toLowerCase()) {
case "module":
if (value === "amd") {
options.module = ts.ModuleKind.AMD;
} else if (value === "umd") {
options.module = ts.ModuleKind.UMD;
} else if (value === "commonjs") {
options.module = ts.ModuleKind.CommonJS;
} else if (value === "system") {
options.module = ts.ModuleKind.System;
} else if (value === "unspecified") {
options.module = ts.ModuleKind.None;
} else {
throw new Error("Unknown module type " + value);
}
break;
case "target":
if (value === "es3") {
options.target = ts.ScriptTarget.ES3;
} else if (value === "es5") {
options.target = ts.ScriptTarget.ES5;
} else if (value === "es6") {
options.target = ts.ScriptTarget.ES6;
} else {
throw new Error("Unknown compile target " + value);
}
break;
case "experimentaldecorators":
options.experimentalDecorators = value === "true";
break;
case "emitdecoratormetadata":
options.emitDecoratorMetadata = value === "true";
break;
case "experimentalasyncfunctions":
options.experimentalAsyncFunctions = value === "true";
break;
case "noemithelpers":
options.noEmitHelpers = value === "true";
break;
case "noemitonerror":
options.noEmitOnError = value === "true";
break;
case "noresolve":
options.noResolve = value === "true";
break;
case "noimplicitany":
options.noImplicitAny = value === "true";
break;
case "nolib":
options.noLib = value === "true";
break;
case "out":
options.out = settings[name];
break;
case "outfile":
options.outFile = settings[name];
break;
case "outdir":
options.outDir = settings[name];
break;
case "skipdefaultlibcheck":
options.skipDefaultLibCheck = value === "true";
break;
case "sourceroot":
options.sourceRoot = settings[name];
break;
case "maproot":
options.mapRoot = settings[name];
break;
case "sourcemap":
options.sourceMap = value === "true";
break;
case "declaration":
options.declaration = value === "true";
break;
case "newline":
if (value === "crlf") {
options.newLine = ts.NewLineKind.CarriageReturnLineFeed;
}
else if (value === "lf") {
options.newLine = ts.NewLineKind.LineFeed;
}
else {
throw new Error("Unknown option for newLine: " + value);
}
break;
case "comments":
options.removeComments = value === "false";
break;
case "stripinternal":
options.stripInternal = value === "true";
break;
case "usecasesensitivefilenames":
options.useCaseSensitiveFileNames = value === "true";
break;
case "filename":
// Not supported yet
break;
case "emitbom":
options.emitBOM = value === "true";
break;
case "errortruncation":
options.noErrorTruncation = value === "false";
break;
case "preserveconstenums":
options.preserveConstEnums = value === "true";
break;
case "isolatedmodules":
options.isolatedModules = value === "true";
break;
case "suppressimplicitanyindexerrors":
options.suppressImplicitAnyIndexErrors = value === "true";
break;
case "includebuiltfile":
if (!options.includeBuiltFileNames) {
options.includeBuiltFileNames = [];
}
options.includeBuiltFileNames.push(settings[name]);
break;
case "inlinesourcemap":
options.inlineSourceMap = value === "true";
break;
case "inlinesources":
options.inlineSources = value === "true";
break;
case "jsx":
if (value === "react") {
options.jsx = ts.JsxEmit.React;
}
else if (value === "preserve") {
options.jsx = ts.JsxEmit.Preserve;
}
else if (value === "none") {
options.jsx = ts.JsxEmit.None;
}
else {
throw new Error("Unknown option for jsx: " + value);
}
break;
case "allownontsextensions":
options.allowNonTsExtensions = value === "true";
break;
case "baselinefile":
options.baselineFile = settings[name];
break;
default:
throw new Error("Unsupported compiler setting " + value);
let value = settings[name];
let option = getCommandLineOption(name);
if (option) {
switch (option.type) {
case "boolean":
options[option.name] = value.toLowerCase() === "true";
break;
case "string":
options[option.name] = value;
break;
// If not a primitive, the possible types are specified in what is effectively a map of options.
default:
let map = <ts.Map<number>>option.type;
let key = (value).toLowerCase();
if (ts.hasProperty(map, key)) {
options[option.name] = map[key];
}
else {
throw new Error(`Unkown value '${value}' for compiler option '${name}'.`);
}
}
}
else {
throw new Error(`Unkown compiler option '${name}'.`);
}
}
}
}
export class HarnessCompiler {
private inputFiles: { unitName: string; content: string }[] = [];
private compileOptions: ts.CompilerOptions;
@@ -1194,13 +1058,13 @@ module Harness {
options.module = options.module || ts.ModuleKind.None;
options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
options.noErrorTruncation = true;
options.skipDefaultLibCheck = true;
if (settingsCallback) {
settingsCallback(null);
}
let newLine = "\r\n";
options.skipDefaultLibCheck = true;
// Parse settings
setCompilerOptionsFromHarnessSetting(this.settings, options);
@@ -1208,10 +1072,10 @@ module Harness {
// Files from built\local that are requested by test "@includeBuiltFiles" to be in the context.
// Treat them as library files, so include them in build, but not in baselines.
let includeBuiltFiles: { unitName: string; content: string }[] = [];
ts.forEach(options.includeBuiltFileNames, fileName => {
let builtFileName = libFolder + fileName;
if (options.includeBuiltFile) {
let builtFileName = libFolder + options.includeBuiltFile;
includeBuiltFiles.push({ unitName: builtFileName, content: normalizeLineEndings(IO.readFile(builtFileName), newLine) });
});
}
let useCaseSensitiveFileNames = options.useCaseSensitiveFileNames !== undefined ? options.useCaseSensitiveFileNames : Harness.IO.useCaseSensitiveFileNames();

2
tests/cases/compiler/commentInEmptyParameterList1.ts
View File

@@ -1,3 +1,3 @@
// @comments:true
// @removeComments: false
function foo(/** nothing */) {
}

2
tests/cases/compiler/commentOnClassMethod1.ts
View File

@@ -1,4 +1,4 @@
// @comments:true
// @removeComments: false
class WebControls {
/**
* Render a control

2
tests/cases/compiler/commentOnExpressionStatement1.ts
View File

@@ -1,3 +1,3 @@
// @comments: true
// @removeComments: false
1 + 1; // Comment.

2
tests/cases/compiler/commentOnIfStatement1.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
// Test
if (true) {

4
tests/cases/compiler/commentOnImportStatement1.ts
View File

@@ -1,5 +1,5 @@
//@module: amd
// @comments: true
// @module: amd
// @removeComments: false
/* Copyright */
import foo = require('./foo');

4
tests/cases/compiler/commentOnImportStatement2.ts
View File

@@ -1,4 +1,4 @@
//@module: commonjs
// @comments: true
// @module: commonjs
// @removeComments: false
/* not copyright */
import foo = require('./foo');

4
tests/cases/compiler/commentOnImportStatement3.ts
View File

@@ -1,5 +1,5 @@
//@module: commonjs
// @comments: true
// @module: commonjs
// @removeComments: false
/* copyright */
/* not copyright */

2
tests/cases/compiler/commentOnSimpleArrowFunctionBody1.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
function Foo(x: any)
{
}

2
tests/cases/compiler/commentsBeforeFunctionExpression1.ts
View File

@@ -1,4 +1,4 @@
// @comments:true
// @removeComments: false
var v = {
f: /**own f*/ (a) => 0
}

4
tests/cases/compiler/commentsBeforeVariableStatement1.ts
View File

@@ -1,4 +1,4 @@
//@module: amd
// @comments: true
// @module: amd
// @removeComments: false
/** b's comment*/
export var b: number;

2
tests/cases/compiler/commentsClass.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** This is class c2 without constuctor*/
class c2 {

2
tests/cases/compiler/commentsClassMembers.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** This is comment for c1*/
class c1 {

2
tests/cases/compiler/commentsCommentParsing.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/// This is simple /// comments
function simple() {

4
tests/cases/compiler/commentsDottedModuleName.ts
View File

@@ -1,7 +1,7 @@
//@module: amd
// @module: amd
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** this is multi declare module*/
export module outerModule.InnerModule {

2
tests/cases/compiler/commentsEnums.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** Enum of colors*/
enum Colors {

4
tests/cases/compiler/commentsExternalModules.ts
View File

@@ -1,7 +1,7 @@
//@module: amd
// @module: amd
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @Filename: commentsExternalModules_0.ts
/** Module comment*/

4
tests/cases/compiler/commentsExternalModules2.ts
View File

@@ -1,7 +1,7 @@
//@module: amd
// @module: amd
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @Filename: commentsExternalModules2_0.ts
/** Module comment*/

4
tests/cases/compiler/commentsExternalModules3.ts
View File

@@ -1,7 +1,7 @@
//@module: commonjs
// @module: commonjs
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @Filename: commentsExternalModules2_0.ts
/** Module comment*/

2
tests/cases/compiler/commentsFormatting.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
module m {
/** this is first line - aligned to class declaration

2
tests/cases/compiler/commentsFunction.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** This comment should appear for foo*/
function foo() {

2
tests/cases/compiler/commentsInheritance.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** i1 is interface with properties*/
interface i1 {

2
tests/cases/compiler/commentsInterface.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** this is interface 1*/
interface i1 {
}

2
tests/cases/compiler/commentsModules.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** Module comment*/
module m1 {
/** b's comment*/

4
tests/cases/compiler/commentsMultiModuleMultiFile.ts
View File

@@ -1,7 +1,7 @@
//@module: amd
// @module: amd
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @Filename: commentsMultiModuleMultiFile_0.ts
/** this is multi declare module*/

2
tests/cases/compiler/commentsMultiModuleSingleFile.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** this is multi declare module*/
module multiM {

2
tests/cases/compiler/commentsOnObjectLiteral1.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
var Person = makeClass(
/**
@scope Person

2
tests/cases/compiler/commentsOnObjectLiteral2.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
var Person = makeClass(
{
/**

2
tests/cases/compiler/commentsOnObjectLiteral3.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
// @target: ES5
var v = {

2
tests/cases/compiler/commentsOnObjectLiteral4.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
// @target: ES5
var v = {

2
tests/cases/compiler/commentsOnReturnStatement1.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
class DebugClass {
public static debugFunc() {
// Start Debugger Test Code

2
tests/cases/compiler/commentsOnStaticMembers.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
class test {
/**

2
tests/cases/compiler/commentsOverloads.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** this is signature 1*/
function f1(/**param a*/a: number): number;
function f1(b: string): number;

2
tests/cases/compiler/commentsPropertySignature1.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
var a = {
/** own x*/
x: 0

2
tests/cases/compiler/commentsTypeParameters.ts
View File

@@ -1,5 +1,5 @@
// @declaration: true
// @comments: true
// @removeComments: false
class C</**docComment for type parameter*/ T> {
method</**docComment of method type parameter */ U extends T>(a: U) {
}

2
tests/cases/compiler/commentsVarDecl.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** Variable comments*/
var myVariable = 10; // This trailing Comment1

2
tests/cases/compiler/commentsVariableStatement1.ts
View File

@@ -1,5 +1,5 @@
// @declaration: true
// @comments: true
// @removeComments: false
/** Comment */
var v = 1;

2
tests/cases/compiler/commentsdoNotEmitComments.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: false
// @removeComments: true
/** Variable comments*/
var myVariable = 10;

2
tests/cases/compiler/commentsemitComments.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
/** Variable comments*/
var myVariable = 10;

2
tests/cases/compiler/constEnumToStringNoComments.ts
View File

@@ -1,4 +1,4 @@
// @comments: false
// @removeComments: true
const enum Foo {
X = 100,
Y = 0.5,

2
tests/cases/compiler/constEnumToStringWithComments.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
const enum Foo {
X = 100,
Y = 0.5,

2
tests/cases/compiler/declFileAccessors.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileAccessors_0.ts

2
tests/cases/compiler/declFileCallSignatures.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileCallSignatures_0.ts

2
tests/cases/compiler/declFileConstructSignatures.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileConstructSignatures_0.ts

2
tests/cases/compiler/declFileConstructors.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileConstructors_0.ts

2
tests/cases/compiler/declFileFunctions.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileFunctions_0.ts

2
tests/cases/compiler/declFileIndexSignatures.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileIndexSignatures_0.ts

2
tests/cases/compiler/declFileMethods.ts
View File

@@ -1,6 +1,6 @@
// @target: ES5
// @declaration: true
// @comments: true
// @removeComments: false
// @module: commonjs
// @Filename: declFileMethods_0.ts

2
tests/cases/compiler/emitCommentsOnlyFile.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
/**
* @name Foo

2
tests/cases/compiler/emitPostComments.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
var y = 10;
/**

2
tests/cases/compiler/emitPreComments.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
// This is pre comment
var y = 10;

2
tests/cases/compiler/errorWithTruncatedType.ts
View File

@@ -1,4 +1,4 @@
// @errortruncation: true
// @noErrorTruncation: false
var x: {
propertyWithAnExceedinglyLongName1: string;

1
tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts
View File

@@ -1,4 +1,3 @@
// @module: unspecified
// Not on line 0 because we want to verify the error is placed in the appropriate location.
export module M {

2
tests/cases/compiler/lambdaASIEmit.ts
View File

@@ -1,4 +1,4 @@
// @comments: true
// @removeComments: false
function Foo(x: any)
{

2
tests/cases/compiler/out-flag.ts
View File

@@ -3,7 +3,7 @@
// @declaration: true
// @module: commonjs
//// @out: bin\
// @comments: true
// @removeComments: false
// my class comments
class MyClass

2
tests/cases/compiler/pinnedComments1.ts
View File

@@ -1,4 +1,4 @@
// @comments: false
// @removeComments: true
/* unpinned comment */
/*! pinned comment */

2
tests/cases/compiler/sourceMap-FileWithComments.ts
View File

@@ -1,5 +1,5 @@
// @sourcemap: true
// @comments: true
// @removeComments: false
// Interface
interface IPoint {