update to TS v1.5.0-alpha (#39,#56)

Author: Claus Reinke

CHANGES.txt

@@ -1,6 +1,6 @@
-0.3.1 to 0.4.x:
+0.3.1 to 0.4.5:
 
-  - get it to compile and run with github version of TypeScript (1.5), see #39
+  - get it to compile and run with github version of TypeScript (1.5-alpha), see #39
 
   - 'type' command renamed to 'quickInfo' (follows LS API naming)
     (old version is still accepted, but deprecated)

bin/lib.d.ts

@@ -179,19 +179,19 @@ interface ObjectConstructor {
       * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes. 
       */
-    seal(o: any): any;
+    seal<T>(o: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze(o: any): any;
+    freeze<T>(o: T): T;
 
     /**
       * Prevents the addition of new properties to an object.
       * @param o Object to make non-extensible. 
       */
-    preventExtensions(o: any): any;
+    preventExtensions<T>(o: T): T;
 
     /**
       * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
@@ -425,6 +425,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -477,6 +480,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {
@@ -1165,6 +1171,20 @@ interface ArrayConstructor {
 
 declare var Array: ArrayConstructor;
 
+interface TypedPropertyDescriptor<T> {
+    enumerable?: boolean;
+    configurable?: boolean;
+    writable?: boolean;
+    value?: T;
+    get?: () => T;
+    set?: (value: T) => void;
+}
+
+declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
+declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
+declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
+declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;
+
 /////////////////////////////
 /// IE10 ECMAScript Extensions
 /////////////////////////////
@@ -14203,19 +14223,169 @@ declare function importScripts(...urls: string[]): void;
 /// Windows Script Host APIS
 /////////////////////////////
 
-declare var ActiveXObject: { new (s: string): any; };
+
+interface ActiveXObject {
+    new (s: string): any;
+}
+declare var ActiveXObject: ActiveXObject;
 
 interface ITextWriter {
     Write(s: string): void;
     WriteLine(s: string): void;
     Close(): void;
 }
 
+interface TextStreamBase {
+    /**
+     * The column number of the current character position in an input stream.
+     */
+    Column: number;
+    /**
+     * The current line number in an input stream.
+     */
+    Line: number;
+    /**
+     * Closes a text stream.
+     * It is not necessary to close standard streams; they close automatically when the process ends. If you close a standard stream, be aware that any other pointers to that standard stream become invalid.
+     */
+    Close(): void;
+}
+
+interface TextStreamWriter extends TextStreamBase {
+    /**
+     * Sends a string to an output stream.
+     */
+    Write(s: string): void;
+    /**
+     * Sends a specified number of blank lines (newline characters) to an output stream.
+     */
+    WriteBlankLines(intLines: number): void;
+    /**
+     * Sends a string followed by a newline character to an output stream.
+     */
+    WriteLine(s: string): void;
+}
+
+interface TextStreamReader extends TextStreamBase {
+    /**
+     * Returns a specified number of characters from an input stream, beginning at the current pointer position.
+     * Does not return until the ENTER key is pressed.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    Read(characters: number): string;
+    /**
+     * Returns all characters from an input stream.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    ReadAll(): string;
+    /**
+     * Returns an entire line from an input stream.
+     * Although this method extracts the newline character, it does not add it to the returned string.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    ReadLine(): string;
+    /**
+     * Skips a specified number of characters when reading from an input text stream.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
+     */
+    Skip(characters: number): void;
+    /**
+     * Skips the next line when reading from an input text stream.
+     * Can only be used on a stream in reading mode, not writing or appending mode.
+     */
+    SkipLine(): void;
+    /**
+     * Indicates whether the stream pointer position is at the end of a line.
+     */
+    AtEndOfLine: boolean;
+    /**
+     * Indicates whether the stream pointer position is at the end of a stream.
+     */
+    AtEndOfStream: boolean;
+}
+
 declare var WScript: {
+    /**
+    * Outputs text to either a message box (under WScript.exe) or the command console window followed by a newline (under CScript.ext).
+    */
     Echo(s: any): void;
-    StdErr: ITextWriter;
-    StdOut: ITextWriter;
+    /**
+     * Exposes the write-only error output stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdErr: TextStreamWriter;
+    /**
+     * Exposes the write-only output stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdOut: TextStreamWriter;
     Arguments: { length: number; Item(n: number): string; };
+    /**
+     *  The full path of the currently running script.
+     */
     ScriptFullName: string;
+    /**
+     * Forces the script to stop immediately, with an optional exit code.
+     */
     Quit(exitCode?: number): number;
-}
+    /**
+     * The Windows Script Host build version number.
+     */
+    BuildVersion: number;
+    /**
+     * Fully qualified path of the host executable.
+     */
+    FullName: string;
+    /**
+     * Gets/sets the script mode - interactive(true) or batch(false).
+     */
+    Interactive: boolean;
+    /**
+     * The name of the host executable (WScript.exe or CScript.exe).
+     */
+    Name: string;
+    /**
+     * Path of the directory containing the host executable.
+     */
+    Path: string;
+    /**
+     * The filename of the currently running script.
+     */
+    ScriptName: string;
+    /**
+     * Exposes the read-only input stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdIn: TextStreamReader;
+    /**
+     * Windows Script Host version
+     */
+    Version: string;
+    /**
+     * Connects a COM object's event sources to functions named with a given prefix, in the form prefix_event.
+     */
+    ConnectObject(objEventSource: any, strPrefix: string): void;
+    /**
+     * Creates a COM object.
+     * @param strProgiID
+     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
+     */
+    CreateObject(strProgID: string, strPrefix?: string): any;
+    /**
+     * Disconnects a COM object from its event sources.
+     */
+    DisconnectObject(obj: any): void;
+    /**
+     * Retrieves an existing object with the specified ProgID from memory, or creates a new one from a file.
+     * @param strPathname Fully qualified path to the file containing the object persisted to disk. For objects in memory, pass a zero-length string.
+     * @param strProgID
+     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
+     */
+    GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any;
+    /**
+     * Suspends script execution for a specified length of time, then continues execution.
+     * @param intTime Interval (in milliseconds) to suspend script execution.
+     */
+    Sleep(intTime: number): void;
+};

bin/tss.js

@@ -558,7 +558,7 @@ function findConfigFile() {
 var fileNames;
 var configFile, configObject, configObjectParsed;
 // NOTE: partial options support only
-var commandLine = ts.parseCommandLine(ts.sys.args);
+var commandLine = ts["parseCommandLine"](ts.sys.args);
 if (commandLine.options.version) {
     console.log(require("../package.json").version);
     process.exit(0);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-tools",
-  "version": "v0.4.4-testing-ts1.4",
+  "version": "v0.4.5-testing-ts1.5",
   "description": "TypeScript Services commandline server",
   "bin": {
     "tss": "bin/tss"
@@ -19,6 +19,6 @@
   "author": "Claus Reinke",
   "license": "Apache License, Version 2.0",
   "dependencies": {
-    "typescript": "Microsoft/TypeScript"
+    "typescript": "1.5.0-alpha"
   }
 }

tests/script.out

@@ -25,14 +25,14 @@ node ../bin/tss.js test.ts
   ,"textSpan":{"start":32
   ,"length":1}
   ,"documentation":[]
-  ,"type":"(var) s: string"
+  ,"type":"var s: string"
   ,"docComment":""}
 {"kind":"var"
   ,"kindModifiers":""
   ,"textSpan":{"start":38
   ,"length":1}
   ,"documentation":[]
-  ,"type":"(var) x: {\n    a: number;\n    b: number;\n}"
+  ,"type":"var x: {\n    a: number;\n    b: number;\n}"
   ,"docComment":""}
 {"def":{"fileName":"PREFIX/test.ts"
   ,"textSpan":{"start":23
@@ -157,7 +157,12 @@ node ../bin/tss.js test.ts
   ,"kind":"method"
   ,"kindModifiers":"declare"
   ,"type":"(method) String.substr(from: number, length?: number): string"
-  ,"docComment":"Gets a substring beginning at the specified location and having the specified length."}]}
+  ,"docComment":"Gets a substring beginning at the specified location and having the specified length."}
+  ,{"name":"valueOf"
+  ,"kind":"method"
+  ,"kindModifiers":"declare"
+  ,"type":"(method) String.valueOf(): string"
+  ,"docComment":"Returns the primitive value of the specified object. "}]}
 {"isMemberCompletion":true
   ,"isNewIdentifierLocation":false
   ,"entries":[{"name":"a"
@@ -306,7 +311,12 @@ var a = [];
   ,"kind":"method"
   ,"kindModifiers":"declare"
   ,"type":"(method) String.substr(from: number, length?: number): string"
-  ,"docComment":"Gets a substring beginning at the specified location and having the specified length."}]}
+  ,"docComment":"Gets a substring beginning at the specified location and having the specified length."}
+  ,{"name":"valueOf"
+  ,"kind":"method"
+  ,"kindModifiers":"declare"
+  ,"type":"(method) String.valueOf(): string"
+  ,"docComment":"Returns the primitive value of the specified object. "}]}
 {"isMemberCompletion":true
   ,"isNewIdentifierLocation":false
   ,"entries":[{"name":"a"
@@ -634,12 +644,12 @@ node ../bin/tss.js empty.ts
   ,{"name":"blur"
   ,"kind":"function"
   ,"kindModifiers":"declare"
-  ,"type":"(function) blur(): void"
+  ,"type":"function blur(): void"
   ,"docComment":""}
   ,{"name":"btoa"
   ,"kind":"function"
   ,"kindModifiers":"declare"
-  ,"type":"(function) btoa(rawString: string): string"
+  ,"type":"function btoa(rawString: string): string"
   ,"docComment":""}
   ,{"name":"break"
   ,"kind":"keyword"
@@ -663,12 +673,12 @@ node ../bin/tss.js empty.ts
   ,{"name":"blur"
   ,"kind":"function"
   ,"kindModifiers":"declare"
-  ,"type":"(function) blur(): void"
+  ,"type":"function blur(): void"
   ,"docComment":""}
   ,{"name":"btoa"
   ,"kind":"function"
   ,"kindModifiers":"declare"
-  ,"type":"(function) btoa(rawString: string): string"
+  ,"type":"function btoa(rawString: string): string"
   ,"docComment":""}
   ,{"name":"break"
   ,"kind":"keyword"
@@ -832,18 +842,16 @@ node ../bin/tss.js -m commonjs issue-15.ts
   ,"entries":[{"name":"Class"
   ,"kind":"constructor"
   ,"kindModifiers":"export"
-  ,"type":"(constructor) Background.Class(): Background.Class"
+  ,"type":"constructor Background.Class(): Background.Class"
   ,"docComment":""}]}
 {"isMemberCompletion":true
   ,"isNewIdentifierLocation":false
   ,"entries":[{"name":"Class"
   ,"kind":"constructor"
   ,"kindModifiers":"export"
-  ,"type":"(constructor) Background.Class(): Background.Class"
+  ,"type":"constructor Background.Class(): Background.Class"
   ,"docComment":""}]}
-{"isMemberCompletion":true
-  ,"isNewIdentifierLocation":false
-  ,"entries":[]}
+null
 {"isMemberCompletion":true
   ,"isNewIdentifierLocation":false
   ,"entries":[{"name":"a"

tss.ts

@@ -673,7 +673,7 @@ var fileNames;
 var configFile, configObject, configObjectParsed;
 
 // NOTE: partial options support only
-var commandLine = ts.parseCommandLine(ts.sys.args);
+var commandLine = ts["parseCommandLine"](ts.sys.args);
 
 if (commandLine.options.version) {
   console.log(require("../package.json").version);