diff --git a/src/compiler/core.ts b/src/compiler/core.ts index f6bef5ebca9..e4c22752fc9 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -1120,6 +1120,18 @@ namespace ts { } } + export function getEnvironmentVariable(name: string, host?: CompilerHost) { + if (host && host.getEnvironmentVariable) { + return host.getEnvironmentVariable(name); + } + + if (sys && sys.getEnvironmentVariable) { + return sys.getEnvironmentVariable(name); + } + + return ""; + } + export function copyListRemovingItem(item: T, list: T[]) { const copiedList: T[] = []; for (const e of list) { @@ -1141,7 +1153,6 @@ namespace ts { export namespace performance { let counters: Map; let measures: Map; - let enabled = false; /** * Increments a counter with the specified name. @@ -1149,7 +1160,7 @@ namespace ts { * @param counterName The name of the counter. */ export function increment(counterName: string) { - if (enabled) { + if (counters) { counters[counterName] = (getProperty(counters, counterName) || 0) + 1; } } @@ -1160,14 +1171,14 @@ namespace ts { * @param counterName The name of the counter. */ export function getCount(counterName: string) { - return enabled && getProperty(counters, counterName) || 0; + return counters && getProperty(counters, counterName) || 0; } /** * Marks the start of a performance measurement. */ export function mark() { - return enabled ? Date.now() : 0; + return measures ? Date.now() : 0; } /** @@ -1177,7 +1188,7 @@ namespace ts { * @param marker The timestamp of the starting mark. */ export function measure(measureName: string, marker: number) { - if (enabled) { + if (measures) { measures[measureName] = (getProperty(measures, measureName) || 0) + (mark() - marker); } } @@ -1188,35 +1199,29 @@ namespace ts { * @param measureName The name of the measure whose durations should be accumulated. */ export function getDuration(measureName: string) { - return enabled && getProperty(measures, measureName) || 0; + return measures && getProperty(measures, measureName) || 0; } - /** Enables performance measurements for the compiler. */ + /** Enables (and resets) performance measurements for the compiler. */ export function enable() { - if (!enabled) { - enabled = true; - counters = { }; - measures = { - programTime: 0, - parseTime: 0, - bindTime: 0, - emitTime: 0, - ioReadTime: 0, - ioWriteTime: 0, - printTime: 0, - commentTime: 0, - sourceMapTime: 0 - }; - } + counters = { }; + measures = { + programTime: 0, + parseTime: 0, + bindTime: 0, + emitTime: 0, + ioReadTime: 0, + ioWriteTime: 0, + printTime: 0, + commentTime: 0, + sourceMapTime: 0 + }; } - /** Disables performance measurements for the compiler. */ + /** Disables (and clears) performance measurements for the compiler. */ export function disable() { - if (enabled) { - enabled = false; - counters = undefined; - measures = undefined; - } + counters = undefined; + measures = undefined; } } } diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 8dffc341ec4..d4a03468ca0 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -3,8 +3,6 @@ /* @internal */ namespace ts { - const synthesizedLocation: TextRange = { pos: -1, end: -1 }; - let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; @@ -146,7 +144,8 @@ namespace ts { name.text = ""; name.originalKeywordKind = SyntaxKind.Unknown; name.autoGenerateKind = GeneratedIdentifierKind.Auto; - name.autoGenerateId = nextAutoGenerateId++; + name.autoGenerateId = nextAutoGenerateId; + nextAutoGenerateId++; if (recordTempVariable) { recordTempVariable(name); } @@ -158,7 +157,8 @@ namespace ts { name.text = ""; name.originalKeywordKind = SyntaxKind.Unknown; name.autoGenerateKind = GeneratedIdentifierKind.Loop; - name.autoGenerateId = nextAutoGenerateId++; + name.autoGenerateId = nextAutoGenerateId; + nextAutoGenerateId++; return name; } @@ -167,7 +167,8 @@ namespace ts { name.text = text; name.originalKeywordKind = SyntaxKind.Unknown; name.autoGenerateKind = GeneratedIdentifierKind.Unique; - name.autoGenerateId = nextAutoGenerateId++; + name.autoGenerateId = nextAutoGenerateId; + nextAutoGenerateId++; return name; } @@ -177,7 +178,8 @@ namespace ts { name.text = ""; name.originalKeywordKind = SyntaxKind.Unknown; name.autoGenerateKind = GeneratedIdentifierKind.Node; - name.autoGenerateId = nextAutoGenerateId++; + name.autoGenerateId = nextAutoGenerateId; + nextAutoGenerateId++; return name; } diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index 93676c1181d..123b658cd90 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -508,10 +508,6 @@ namespace ts { return skipTrivia(currentSourceText, rangeHasDecorators ? (range as Node).decorators.end : range.pos); } - function getStartPos(range: TextRange) { - return skipTrivia(currentSourceText, range.pos); - } - /** * Emits a mapping for the start of a range. * diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts index 3775ec348f7..70a73ea90e0 100644 --- a/src/compiler/transformer.ts +++ b/src/compiler/transformer.ts @@ -23,6 +23,100 @@ namespace ts { EmitNotifications = 1 << 1, } + /* @internal */ + export interface TransformationContext extends LexicalEnvironment { + getCompilerOptions(): CompilerOptions; + getEmitResolver(): EmitResolver; + getEmitHost(): EmitHost; + + /** + * Gets flags used to customize later transformations or emit. + */ + getNodeEmitFlags(node: Node): NodeEmitFlags; + + /** + * Sets flags used to customize later transformations or emit. + */ + setNodeEmitFlags(node: T, flags: NodeEmitFlags): T; + + /** + * Gets the TextRange to use for source maps for the node. + */ + getSourceMapRange(node: Node): TextRange; + + /** + * Sets the TextRange to use for source maps for the node. + */ + setSourceMapRange(node: T, range: TextRange): T; + + /** + * Gets the TextRange to use for source maps for a token of a node. + */ + getTokenSourceMapRange(node: Node, token: SyntaxKind): TextRange; + + /** + * Sets the TextRange to use for source maps for a token of a node. + */ + setTokenSourceMapRange(node: T, token: SyntaxKind, range: TextRange): T; + + /** + * Gets the TextRange to use for comments for the node. + */ + getCommentRange(node: Node): TextRange; + + /** + * Sets the TextRange to use for comments for the node. + */ + setCommentRange(node: T, range: TextRange): T; + + /** + * Hoists a function declaration to the containing scope. + */ + hoistFunctionDeclaration(node: FunctionDeclaration): void; + + /** + * Hoists a variable declaration to the containing scope. + */ + hoistVariableDeclaration(node: Identifier): void; + + /** + * Enables expression substitutions in the pretty printer for the provided SyntaxKind. + */ + enableSubstitution(kind: SyntaxKind): void; + + /** + * Determines whether expression substitutions are enabled for the provided node. + */ + isSubstitutionEnabled(node: Node): boolean; + + /** + * Hook used by transformers to substitute expressions just before they + * are emitted by the pretty printer. + */ + onSubstituteNode?: (node: Node, isExpression: boolean) => Node; + + /** + * Enables before/after emit notifications in the pretty printer for the provided + * SyntaxKind. + */ + enableEmitNotification(kind: SyntaxKind): void; + + /** + * Determines whether before/after emit notifications should be raised in the pretty + * printer when it emits a node. + */ + isEmitNotificationEnabled(node: Node): boolean; + + /** + * Hook used to allow transformers to capture state before or after + * the printer emits a node. + */ + onEmitNode?: (node: Node, emit: (node: Node) => void) => void; + } + + /* @internal */ + export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile; + export function getTransformers(compilerOptions: CompilerOptions) { const jsx = compilerOptions.jsx; const languageVersion = getEmitScriptTarget(compilerOptions); @@ -62,7 +156,9 @@ namespace ts { * @param transforms An array of Transformers. */ export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]) { - const transformId = nextTransformId++; + const transformId = nextTransformId; + nextTransformId++; + const tokenSourceMapRanges: Map = { }; const lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = []; const lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = []; diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts index 40054fd59c2..b2e79c67df7 100644 --- a/src/compiler/transformers/es6.ts +++ b/src/compiler/transformers/es6.ts @@ -2920,20 +2920,6 @@ namespace ts { return getDeclarationName(node, allowComments, allowSourceMaps, NodeEmitFlags.LocalName); } - /** - * Gets the export name for a declaration for use in expressions. - * - * An export name will *always* be prefixed with an module or namespace export modifier - * like "exports." if one is required. - * - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getExportName(node: ClassDeclaration | ClassExpression | FunctionDeclaration, allowComments?: boolean, allowSourceMaps?: boolean) { - return getDeclarationName(node, allowComments, allowSourceMaps, NodeEmitFlags.ExportName); - } - /** * Gets the name of a declaration, without source map or comments. * diff --git a/src/compiler/transformers/module/es6.ts b/src/compiler/transformers/module/es6.ts index 742f208d61c..5bf8a972aff 100644 --- a/src/compiler/transformers/module/es6.ts +++ b/src/compiler/transformers/module/es6.ts @@ -50,7 +50,7 @@ namespace ts { return undefined; // do not emit export equals for ES6 } const original = getOriginalNode(node); - return nodeIsSynthesized(original) || resolver.isValueAliasDeclaration(original) ? node: undefined; + return nodeIsSynthesized(original) || resolver.isValueAliasDeclaration(original) ? node : undefined; } function visitExportDeclaration(node: ExportDeclaration): ExportDeclaration { @@ -64,7 +64,7 @@ namespace ts { if (node.exportClause === newExportClause) { return node; } - return newExportClause + return newExportClause ? createExportDeclaration(newExportClause, node.moduleSpecifier) : undefined; } @@ -106,12 +106,12 @@ namespace ts { const newNamedBindings = visitNode(node.namedBindings, visitor, isNamedImportBindings, /*optional*/ true); return newDefaultImport !== node.name || newNamedBindings !== node.namedBindings ? createImportClause(newDefaultImport, newNamedBindings) - : node; + : node; } function visitNamedBindings(node: NamedImportBindings): VisitResult { if (node.kind === SyntaxKind.NamespaceImport) { - return resolver.isReferencedAliasDeclaration(node) ? node: undefined; + return resolver.isReferencedAliasDeclaration(node) ? node : undefined; } else { const newNamedImportElements = visitNodes((node).elements, visitor, isImportSpecifier); diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index af214a608cd..b3074e4f98a 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -620,7 +620,7 @@ namespace ts { if (hasModifier(node, ModifierFlags.Export)) { const variables = getInitializedVariables(node.declarationList); if (variables.length > 0) { - let inlineAssignments = createStatement( + const inlineAssignments = createStatement( inlineExpressions( map(variables, transformInitializedVariable) ), @@ -649,7 +649,7 @@ namespace ts { function addExportMemberAssignmentsForBindingName(resultStatements: Statement[], name: BindingName): void { if (isBindingPattern(name)) { for (const element of name.elements) { - addExportMemberAssignmentsForBindingName(resultStatements, element.name) + addExportMemberAssignmentsForBindingName(resultStatements, element.name); } } else { diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts index 5519923333d..1f601ae4b55 100644 --- a/src/compiler/transformers/module/system.ts +++ b/src/compiler/transformers/module/system.ts @@ -12,10 +12,6 @@ namespace ts { const { getNodeEmitFlags, setNodeEmitFlags, - getCommentRange, - setCommentRange, - getSourceMapRange, - setSourceMapRange, startLexicalEnvironment, endLexicalEnvironment, hoistVariableDeclaration, diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index b1e85b2f4ef..eddb7de3a0b 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -2993,19 +2993,6 @@ namespace ts { } } - function getDeclarationNameExpression(node: DeclarationStatement) { - const name = getDeclarationName(node); - if (isNamespaceExport(node)) { - return getNamespaceMemberName(name); - } - else { - // We set the "ExportName" flag to indicate to any module transformer - // downstream that any `exports.` prefix should be added. - setNodeEmitFlags(name, getNodeEmitFlags(name) | NodeEmitFlags.ExportName); - return name; - } - } - function getClassPrototype(node: ClassExpression | ClassDeclaration) { return createPropertyAccess(getDeclarationName(node), "prototype"); } @@ -3109,7 +3096,7 @@ namespace ts { currentDecoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAliases[getOriginalNodeId(node)]; } else if (node.kind === SyntaxKind.Identifier) { - const declaration = resolver.getReferencedValueDeclaration(node) + const declaration = resolver.getReferencedValueDeclaration(node); if (declaration && isClassWithDecorators(declaration)) { currentDecoratedClassAliases[getOriginalNodeId(declaration)] = decoratedClassAliases[getOriginalNodeId(declaration)]; } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 21b89707460..528093e8050 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3023,99 +3023,6 @@ namespace ts { endLexicalEnvironment(): Statement[]; } - /* @internal */ - export interface TransformationContext extends LexicalEnvironment { - getCompilerOptions(): CompilerOptions; - getEmitResolver(): EmitResolver; - getEmitHost(): EmitHost; - - /** - * Gets flags used to customize later transformations or emit. - */ - getNodeEmitFlags(node: Node): NodeEmitFlags; - - /** - * Sets flags used to customize later transformations or emit. - */ - setNodeEmitFlags(node: T, flags: NodeEmitFlags): T; - - /** - * Gets the TextRange to use for source maps for the node. - */ - getSourceMapRange(node: Node): TextRange; - - /** - * Sets the TextRange to use for source maps for the node. - */ - setSourceMapRange(node: T, range: TextRange): T; - - /** - * Gets the TextRange to use for source maps for a token of a node. - */ - getTokenSourceMapRange(node: Node, token: SyntaxKind): TextRange; - - /** - * Sets the TextRange to use for source maps for a token of a node. - */ - setTokenSourceMapRange(node: T, token: SyntaxKind, range: TextRange): T; - - /** - * Gets the TextRange to use for comments for the node. - */ - getCommentRange(node: Node): TextRange; - - /** - * Sets the TextRange to use for comments for the node. - */ - setCommentRange(node: T, range: TextRange): T; - - /** - * Hoists a function declaration to the containing scope. - */ - hoistFunctionDeclaration(node: FunctionDeclaration): void; - - /** - * Hoists a variable declaration to the containing scope. - */ - hoistVariableDeclaration(node: Identifier): void; - - /** - * Enables expression substitutions in the pretty printer for the provided SyntaxKind. - */ - enableSubstitution(kind: SyntaxKind): void; - - /** - * Determines whether expression substitutions are enabled for the provided node. - */ - isSubstitutionEnabled(node: Node): boolean; - - /** - * Hook used by transformers to substitute expressions just before they - * are emitted by the pretty printer. - */ - onSubstituteNode?: (node: Node, isExpression: boolean) => Node; - - /** - * Enables before/after emit notifications in the pretty printer for the provided - * SyntaxKind. - */ - enableEmitNotification(kind: SyntaxKind): void; - - /** - * Determines whether before/after emit notifications should be raised in the pretty - * printer when it emits a node. - */ - isEmitNotificationEnabled(node: Node): boolean; - - /** - * Hook used to allow transformers to capture state before or after - * the printer emits a node. - */ - onEmitNode?: (node: Node, emit: (node: Node) => void) => void; - } - - /* @internal */ - export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile; export interface TextSpan { start: number; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 2744d6b549f..bb5a37f5166 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -226,18 +226,6 @@ namespace ts { return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`; } - export function getEnvironmentVariable(name: string, host?: CompilerHost) { - if (host && host.getEnvironmentVariable) { - return host.getEnvironmentVariable(name); - } - - if (sys && sys.getEnvironmentVariable) { - return sys.getEnvironmentVariable(name); - } - - return ""; - } - export function getStartPosOfNode(node: Node): number { return node.pos; }