Skip to content

Commit 24141f0

Browse files
billtibillti
committed
Merge pull request microsoft#2245 from billti/ExportVersion
Made the 'version' string an exported property
2 parents f351916 + a6816fc commit 24141f0

11 files changed

Lines changed: 38 additions & 4 deletions

‎src/compiler/program.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ module ts {
55
/* @internal */ export var emitTime = 0;
66
/* @internal */ export var ioReadTime = 0;
77

8+
/** The version of the TypeScript compiler release */
9+
export var version = "1.5.0.0";
10+
811
export function createCompilerHost(options: CompilerOptions): CompilerHost {
912
var currentDirectory: string;
1013
var existingDirectories: Map<boolean> = {};

‎src/compiler/tsc.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
/// <reference path="commandLineParser.ts"/>
33

44
module ts {
5-
var version = "1.5.0.0";
6-
75
export interface SourceFile {
86
fileWatcher: FileWatcher;
97
}
@@ -178,7 +176,7 @@ module ts {
178176
}
179177

180178
if (commandLine.options.version) {
181-
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, version));
179+
reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version));
182180
return sys.exit(ExitStatus.Success);
183181
}
184182

@@ -419,7 +417,7 @@ module ts {
419417
}
420418

421419
function printVersion() {
422-
sys.write(getDiagnosticText(Diagnostics.Version_0, version) + sys.newLine);
420+
sys.write(getDiagnosticText(Diagnostics.Version_0, ts.version) + sys.newLine);
423421
}
424422

425423
function printHelp() {

‎src/services/services.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/// <reference path='formatting\smartIndenter.ts' />
1212

1313
module ts {
14+
/** The version of the language service API */
1415
export var servicesVersion = "0.4"
1516

1617
export interface Node {

‎tests/baselines/reference/APISample_compile.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,12 +1474,15 @@ declare module "typescript" {
14741474
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
14751475
}
14761476
declare module "typescript" {
1477+
/** The version of the TypeScript compiler release */
1478+
var version: string;
14771479
function createCompilerHost(options: CompilerOptions): CompilerHost;
14781480
function getPreEmitDiagnostics(program: Program): Diagnostic[];
14791481
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
14801482
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
14811483
}
14821484
declare module "typescript" {
1485+
/** The version of the language service API */
14831486
var servicesVersion: string;
14841487
interface Node {
14851488
getSourceFile(): SourceFile;

‎tests/baselines/reference/APISample_compile.types‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4721,6 +4721,10 @@ declare module "typescript" {
47214721
>TypeChecker : TypeChecker
47224722
}
47234723
declare module "typescript" {
4724+
/** The version of the TypeScript compiler release */
4725+
var version: string;
4726+
>version : string
4727+
47244728
function createCompilerHost(options: CompilerOptions): CompilerHost;
47254729
>createCompilerHost : (options: CompilerOptions) => CompilerHost
47264730
>options : CompilerOptions
@@ -4749,6 +4753,7 @@ declare module "typescript" {
47494753
>Program : Program
47504754
}
47514755
declare module "typescript" {
4756+
/** The version of the language service API */
47524757
var servicesVersion: string;
47534758
>servicesVersion : string
47544759

‎tests/baselines/reference/APISample_linter.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,12 +1505,15 @@ declare module "typescript" {
15051505
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
15061506
}
15071507
declare module "typescript" {
1508+
/** The version of the TypeScript compiler release */
1509+
var version: string;
15081510
function createCompilerHost(options: CompilerOptions): CompilerHost;
15091511
function getPreEmitDiagnostics(program: Program): Diagnostic[];
15101512
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
15111513
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
15121514
}
15131515
declare module "typescript" {
1516+
/** The version of the language service API */
15141517
var servicesVersion: string;
15151518
interface Node {
15161519
getSourceFile(): SourceFile;

‎tests/baselines/reference/APISample_linter.types‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4867,6 +4867,10 @@ declare module "typescript" {
48674867
>TypeChecker : TypeChecker
48684868
}
48694869
declare module "typescript" {
4870+
/** The version of the TypeScript compiler release */
4871+
var version: string;
4872+
>version : string
4873+
48704874
function createCompilerHost(options: CompilerOptions): CompilerHost;
48714875
>createCompilerHost : (options: CompilerOptions) => CompilerHost
48724876
>options : CompilerOptions
@@ -4895,6 +4899,7 @@ declare module "typescript" {
48954899
>Program : Program
48964900
}
48974901
declare module "typescript" {
4902+
/** The version of the language service API */
48984903
var servicesVersion: string;
48994904
>servicesVersion : string
49004905

‎tests/baselines/reference/APISample_transform.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,12 +1506,15 @@ declare module "typescript" {
15061506
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
15071507
}
15081508
declare module "typescript" {
1509+
/** The version of the TypeScript compiler release */
1510+
var version: string;
15091511
function createCompilerHost(options: CompilerOptions): CompilerHost;
15101512
function getPreEmitDiagnostics(program: Program): Diagnostic[];
15111513
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
15121514
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
15131515
}
15141516
declare module "typescript" {
1517+
/** The version of the language service API */
15151518
var servicesVersion: string;
15161519
interface Node {
15171520
getSourceFile(): SourceFile;

‎tests/baselines/reference/APISample_transform.types‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4817,6 +4817,10 @@ declare module "typescript" {
48174817
>TypeChecker : TypeChecker
48184818
}
48194819
declare module "typescript" {
4820+
/** The version of the TypeScript compiler release */
4821+
var version: string;
4822+
>version : string
4823+
48204824
function createCompilerHost(options: CompilerOptions): CompilerHost;
48214825
>createCompilerHost : (options: CompilerOptions) => CompilerHost
48224826
>options : CompilerOptions
@@ -4845,6 +4849,7 @@ declare module "typescript" {
48454849
>Program : Program
48464850
}
48474851
declare module "typescript" {
4852+
/** The version of the language service API */
48484853
var servicesVersion: string;
48494854
>servicesVersion : string
48504855

‎tests/baselines/reference/APISample_watcher.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,12 +1543,15 @@ declare module "typescript" {
15431543
function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
15441544
}
15451545
declare module "typescript" {
1546+
/** The version of the TypeScript compiler release */
1547+
var version: string;
15461548
function createCompilerHost(options: CompilerOptions): CompilerHost;
15471549
function getPreEmitDiagnostics(program: Program): Diagnostic[];
15481550
function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
15491551
function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost): Program;
15501552
}
15511553
declare module "typescript" {
1554+
/** The version of the language service API */
15521555
var servicesVersion: string;
15531556
interface Node {
15541557
getSourceFile(): SourceFile;

0 commit comments

Comments
 (0)