Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/compiler/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ module ts {
/* @internal */ export var emitTime = 0;
/* @internal */ export var ioReadTime = 0;

/** The version of the TypeScript compiler release */
export var version = "1.5.0.0";

export function createCompilerHost(options: CompilerOptions): CompilerHost {
var currentDirectory: string;
var existingDirectories: Map<boolean> = {};
Expand Down
6 changes: 2 additions & 4 deletions src/compiler/tsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
/// <reference path="commandLineParser.ts"/>

module ts {
var version = "1.5.0.0";

export interface SourceFile {
fileWatcher: FileWatcher;
}
Expand Down Expand Up @@ -178,7 +176,7 @@ module ts {
}

if (commandLine.options.version) {
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, version));
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version));
return sys.exit(ExitStatus.Success);
}

Expand Down Expand Up @@ -419,7 +417,7 @@ module ts {
}

function printVersion() {
sys.write(getDiagnosticText(Diagnostics.Version_0, version) + sys.newLine);
sys.write(getDiagnosticText(Diagnostics.Version_0, ts.version) + sys.newLine);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need this namespace qualifier? You should have access to all the exports in the ts module.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't NEED it, I just LIKE it 😄

The main reason however, is that 'version' is a really common identifier throughout our code base. I just wanted to make it clear this was the top-level module property, and not some local or closure reference.

}

function printHelp() {
Expand Down
1 change: 1 addition & 0 deletions src/services/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
/// <reference path='formatting\smartIndenter.ts' />

module ts {
/** The version of the language service API */
export var servicesVersion = "0.4"

export interface Node {
Expand Down
3 changes: 3 additions & 0 deletions tests/baselines/reference/APISample_compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -1472,12 +1472,15 @@ declare module "typescript" {
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
function createCompilerHost(options: CompilerOptions): CompilerHost;
function getPreEmitDiagnostics(program: Program): Diagnostic[];
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
interface Node {
getSourceFile(): SourceFile;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/APISample_compile.types
Original file line number Diff line number Diff line change
Expand Up @@ -4716,6 +4716,10 @@ declare module "typescript" {
>TypeChecker : TypeChecker
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
>version : string

function createCompilerHost(options: CompilerOptions): CompilerHost;
>createCompilerHost : (options: CompilerOptions) => CompilerHost
>options : CompilerOptions
Expand Down Expand Up @@ -4744,6 +4748,7 @@ declare module "typescript" {
>Program : Program
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
>servicesVersion : string

Expand Down
3 changes: 3 additions & 0 deletions tests/baselines/reference/APISample_linter.js
Original file line number Diff line number Diff line change
Expand Up @@ -1503,12 +1503,15 @@ declare module "typescript" {
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
function createCompilerHost(options: CompilerOptions): CompilerHost;
function getPreEmitDiagnostics(program: Program): Diagnostic[];
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
interface Node {
getSourceFile(): SourceFile;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/APISample_linter.types
Original file line number Diff line number Diff line change
Expand Up @@ -4862,6 +4862,10 @@ declare module "typescript" {
>TypeChecker : TypeChecker
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
>version : string

function createCompilerHost(options: CompilerOptions): CompilerHost;
>createCompilerHost : (options: CompilerOptions) => CompilerHost
>options : CompilerOptions
Expand Down Expand Up @@ -4890,6 +4894,7 @@ declare module "typescript" {
>Program : Program
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
>servicesVersion : string

Expand Down
3 changes: 3 additions & 0 deletions tests/baselines/reference/APISample_transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -1504,12 +1504,15 @@ declare module "typescript" {
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
function createCompilerHost(options: CompilerOptions): CompilerHost;
function getPreEmitDiagnostics(program: Program): Diagnostic[];
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
interface Node {
getSourceFile(): SourceFile;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/APISample_transform.types
Original file line number Diff line number Diff line change
Expand Up @@ -4812,6 +4812,10 @@ declare module "typescript" {
>TypeChecker : TypeChecker
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
>version : string

function createCompilerHost(options: CompilerOptions): CompilerHost;
>createCompilerHost : (options: CompilerOptions) => CompilerHost
>options : CompilerOptions
Expand Down Expand Up @@ -4840,6 +4844,7 @@ declare module "typescript" {
>Program : Program
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
>servicesVersion : string

Expand Down
3 changes: 3 additions & 0 deletions tests/baselines/reference/APISample_watcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -1541,12 +1541,15 @@ declare module "typescript" {
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
function createCompilerHost(options: CompilerOptions): CompilerHost;
function getPreEmitDiagnostics(program: Program): Diagnostic[];
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
interface Node {
getSourceFile(): SourceFile;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/APISample_watcher.types
Original file line number Diff line number Diff line change
Expand Up @@ -4985,6 +4985,10 @@ declare module "typescript" {
>TypeChecker : TypeChecker
}
declare module "typescript" {
/** The version of the TypeScript compiler release */
var version: string;
>version : string

function createCompilerHost(options: CompilerOptions): CompilerHost;
>createCompilerHost : (options: CompilerOptions) => CompilerHost
>options : CompilerOptions
Expand Down Expand Up @@ -5013,6 +5017,7 @@ declare module "typescript" {
>Program : Program
}
declare module "typescript" {
/** The version of the language service API */
var servicesVersion: string;
>servicesVersion : string

Expand Down