updating typescript.

vitaly-t · Jun 26, 2016 · 43349e4 · 43349e4
1 parent 708085a
commit 43349e4
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ benchmarks/node_modules/
 out/
 coverage/
 /spex.js
+test/typescript/*.js
+test/typescript/*.map
diff --git a/test/typescript/batch.js.map b/test/typescript/batch.js.map
diff --git a/test/typescript/build.bat b/test/typescript/build.bat
@@ -2,6 +2,7 @@
 
 SET PARAMS=--target es6 --module commonjs --noImplicitAny
 
+call tsc entry %PARAMS%
 call tsc batch %PARAMS%
 call tsc page %PARAMS%
 call tsc sequence %PARAMS%

diff --git a/test/typescript/entry.ts b/test/typescript/entry.ts
@@ -0,0 +1,7 @@
+/// <reference path='../../typescript/spex' />
+
+import * as spexLib from 'spex';
+
+var main: spexLib.ISpex;
+
+main = spexLib(Promise);
diff --git a/test/typescript/page.js b/test/typescript/page.js
diff --git a/test/typescript/page.js.map b/test/typescript/page.js.map
diff --git a/test/typescript/sequence.js b/test/typescript/sequence.js
diff --git a/test/typescript/sequence.js.map b/test/typescript/sequence.js.map
diff --git a/test/typescript/stream.js b/test/typescript/stream.js
diff --git a/test/typescript/stream.js.map b/test/typescript/stream.js.map
diff --git a/typescript/spex.d.ts b/typescript/spex.d.ts
@@ -100,38 +100,38 @@ declare module "spex" {
         read(stream:any, receiver:(index:number, data:Array<any>, delay:number)=>any, options?:{closable?:boolean, readSize?:number}):XPromise<IStreamRead>;
     }
 
-    interface IMain {
+    namespace spex {
 
-        // API: http://vitaly-t.github.io/spex/global.html#batch
-        batch(values:Array<any>, cb?:(index:number, success:boolean, result:any, delay:number)=>any):XPromise<Array<any>>;
-        batch(values:Array<any>, options:{cb?:(index:number, success:boolean, result:any, delay:number)=>any}):XPromise<Array<any>>;
+        // PromiseAdapter class;
+        // API: http://vitaly-t.github.io/spex/PromiseAdapter.html
+        class PromiseAdapter {
+            constructor(create:(cb:any)=>Object, resolve:(data:any)=>void, reject:(reason:any)=>void);
+        }
 
-        // API: http://vitaly-t.github.io/spex/global.html#page
-        page(source:(index:number, data:any, delay:number)=>any, dest?:(index:number, data:any, delay:number)=>any, limit?:number):XPromise<{pages:number, total:number, duration:number}>;
-        page(source:(index:number, data:any, delay:number)=>any, options:{dest?:(index:number, data:any, delay:number)=>any, limit?:number}):XPromise<{pages:number, total:number, duration:number}>;
+        interface ISpex {
 
-        // API: http://vitaly-t.github.io/spex/global.html#sequence
-        sequence(source:(index:number, data:any, delay:number)=>any, dest?:(index:number, data:any, delay:number)=>any, limit?:number, track?:boolean):XPromise<any>;
-        sequence(source:(index:number, data:any, delay:number)=>any, options:{dest?:(index:number, data:any, delay:number)=>any, limit?:number, track?:boolean}):XPromise<any>;
+            // API: http://vitaly-t.github.io/spex/global.html#batch
+            batch(values:Array<any>, cb?:(index:number, success:boolean, result:any, delay:number)=>any):XPromise<Array<any>>;
+            batch(values:Array<any>, options:{cb?:(index:number, success:boolean, result:any, delay:number)=>any}):XPromise<Array<any>>;
 
-        // API: http://vitaly-t.github.io/spex/stream.html
-        stream:IStream;
+            // API: http://vitaly-t.github.io/spex/global.html#page
+            page(source:(index:number, data:any, delay:number)=>any, dest?:(index:number, data:any, delay:number)=>any, limit?:number):XPromise<{pages:number, total:number, duration:number}>;
+            page(source:(index:number, data:any, delay:number)=>any, options:{dest?:(index:number, data:any, delay:number)=>any, limit?:number}):XPromise<{pages:number, total:number, duration:number}>;
 
-        // API: http://vitaly-t.github.io/spex/errors.html
-        errors:IErrors;
-    }
+            // API: http://vitaly-t.github.io/spex/global.html#sequence
+            sequence(source:(index:number, data:any, delay:number)=>any, dest?:(index:number, data:any, delay:number)=>any, limit?:number, track?:boolean):XPromise<any>;
+            sequence(source:(index:number, data:any, delay:number)=>any, options:{dest?:(index:number, data:any, delay:number)=>any, limit?:number, track?:boolean}):XPromise<any>;
 
-    namespace spex {
+            // API: http://vitaly-t.github.io/spex/stream.html
+            stream:IStream;
 
-        // PromiseAdapter class;
-        // API: http://vitaly-t.github.io/spex/PromiseAdapter.html
-        class PromiseAdapter {
-            constructor(create:(cb:any)=>Object, resolve:(data:any)=>void, reject:(reason:any)=>void);
+            // API: http://vitaly-t.github.io/spex/errors.html
+            errors:IErrors;
         }
 
     }
 
-    function spex(promise:any):IMain;
+    function spex(promise:any):spex.ISpex;
 
     export = spex;
 }