replace es6-promise by bluebird

fdecampredon · fdecampredon · commit cdc4aa66e44b · 2014-04-26T16:53:18.000+02:00
diff --git a/package.json b/package.json
@@ -23,8 +23,8 @@
     "grunt-contrib-compress": "~0.5.3",
     "grunt-browserify": "~1.3.0",
     "istanbulify": "~0.1.0",
-    "es6-promise": "~0.1.1",
     "grunt-typescript": "~0.3.0",
-    "grunt-template-jasmine-istanbul": "~0.2.6"
+    "grunt-template-jasmine-istanbul": "~0.2.6",
+    "bluebird": "~1.2.3"
   }
 }
diff --git a/src/commons/completion.ts b/src/commons/completion.ts
@@ -13,8 +13,8 @@
 //   limitations under the License.
 
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+
+import Promise = require('bluebird');
 
 /**
  * An Enum representing the different kind of hint
diff --git a/src/commons/definition.ts b/src/commons/definition.ts
@@ -1,6 +1,4 @@
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
-
+import Promise = require('bluebird');
 
 /**
  * Represent definition info of a symbol
diff --git a/src/commons/errorService.ts b/src/commons/errorService.ts
@@ -1,5 +1,4 @@
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 /**
  * A service allowing to retrieve typescript errors
diff --git a/src/commons/fileSystem.ts b/src/commons/fileSystem.ts
@@ -13,8 +13,7 @@
 //   limitations under the License.
 
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import signal = require('./signal');
 
 
diff --git a/src/commons/lexicalStructure.ts b/src/commons/lexicalStructure.ts
@@ -16,8 +16,7 @@
 'use strict';
 
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 /**
  * Represent a Lexical Structure item
diff --git a/src/commons/preferencesManager.ts b/src/commons/preferencesManager.ts
@@ -16,8 +16,7 @@
 
 import TypeScriptProjectConfig = require('./projectConfig');
 import signal = require('./signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 
 /**
diff --git a/src/commons/promiseQueue.ts b/src/commons/promiseQueue.ts
@@ -15,8 +15,7 @@
 'use strict';
 
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 /**
  * A simple Promise Queue
diff --git a/src/commons/workerBridge.ts b/src/commons/workerBridge.ts
@@ -24,8 +24,7 @@
 import utils = require('./utils');
 import collections = require('./collections');
 import signal = require('./signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 /**
  * list of operations that can be requested
diff --git a/src/commons/workingSet.ts b/src/commons/workingSet.ts
@@ -14,8 +14,7 @@
 
 'use strict';
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import signal = require('./signal');
 
 
diff --git a/src/declarations/bluebird.d.ts b/src/declarations/bluebird.d.ts
@@ -4,15 +4,8 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /*tslint:disable unused*/
-declare module 'es6-promise' {
-    export interface Thenable<R> {
-        then<U>(onFulfilled: (value: R) => Thenable<U>,  onRejected: (error: any) => Thenable<U>): Thenable<U>;
-        then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
-        then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
-    }
-
-    export class Promise<R> implements Thenable<R> {
+declare module 'bluebird' {
+    class Promise<R> implements Promise.Thenable<R> {
         /**
          * If you call resolve in the body of the callback passed to the constructor, 
          * your promise is fulfilled with result object passed to resolve.
@@ -28,7 +21,7 @@ declare module 'es6-promise' {
          * For consistency and debugging (eg stack traces), obj should be an instanceof Error. 
          * Any errors thrown in the constructor callback will be implicitly passed to reject().
          */
-        constructor(callback: (resolve: (thenable: Thenable<R>) => void, reject: (error: any) => void) => void);
+        constructor(callback: (resolve: (thenable: Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
 
 
         /**
@@ -42,7 +35,7 @@ declare module 'es6-promise' {
          * @param onFulFill called when/if "promise" resolves
          * @param onReject called when/if "promise" rejects
          */
-        then<U>(onFulfill: (value: R) => Thenable<U>,  onReject: (error: any) => Thenable<U>): Promise<U>;
+        then<U>(onFulfill: (value: R) => Promise.Thenable<U>,  onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
         /**
          * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects. 
          * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called. 
@@ -54,7 +47,7 @@ declare module 'es6-promise' {
          * @param onFulFill called when/if "promise" resolves
          * @param onReject called when/if "promise" rejects
          */
-        then<U>(onFulfill: (value: R) => Thenable<U>, onReject?: (error: any) => U): Promise<U>;
+        then<U>(onFulfill: (value: R) => Promise.Thenable<U>, onReject?: (error: any) => U): Promise<U>;
         /**
          * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects. 
          * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called. 
@@ -66,7 +59,7 @@ declare module 'es6-promise' {
          * @param onFulFill called when/if "promise" resolves
          * @param onReject called when/if "promise" rejects
          */
-        then<U>(onFulfill: (value: R) => U, onReject: (error: any) => Thenable<U>): Promise<U>;
+        then<U>(onFulfill: (value: R) => U, onReject: (error: any) => Promise.Thenable<U>): Promise<U>;
         /**
          * onFulFill is called when/if "promise" resolves. onRejected is called when/if "promise" rejects. 
          * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called. 
@@ -86,7 +79,7 @@ declare module 'es6-promise' {
          * 
          * @param onReject called when/if "promise" rejects
          */
-        catch<U>(onReject?: (error: any) => Thenable<U>): Promise<U>;
+        catch<U>(onReject?: (error: any) => Promise.Thenable<U>): Promise<U>;
         /**
          * Sugar for promise.then(undefined, onRejected)
          * 
@@ -95,7 +88,14 @@ declare module 'es6-promise' {
         catch<U>(onReject?: (error: any) => U): Promise<U>;
     }
 
-    export module Promise {
+    module Promise {
+        
+        export interface Thenable<R> {
+            then<U>(onFulfilled: (value: R) => Thenable<U>,  onRejected: (error: any) => Thenable<U>): Thenable<U>;
+            then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+            then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+            then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
+        }
 
         /**
          * Returns promise (only if promise.constructor == Promise)
@@ -113,7 +113,7 @@ declare module 'es6-promise' {
          * This also creates a new promise if you pass it a genuine JavaScript promise, 
          * making it less efficient for casting than Promise.cast.
          */
-        function resolve<R>(thenable: Thenable<R>): Promise<R>;
+        function resolve<R>(thenable: Promise.Thenable<R>): Promise<R>;
         /**
          * Make a promise that fulfills to obj. Same as Promise.cast(obj) in this situation.
          */
@@ -135,7 +135,8 @@ declare module 'es6-promise' {
          * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
          */
         function race<R>(promises: Promise<R>[]): Promise<R>;
-        
-        
     }
+    
+    
+    export = Promise;
 }
diff --git a/src/main/fileSystem.ts b/src/main/fileSystem.ts
@@ -18,8 +18,7 @@
 
 import collections = require('../commons/collections');
 import signal = require('../commons/signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import fs = require('../commons/fileSystem');
 
 
diff --git a/src/main/preferencesManager.ts b/src/main/preferencesManager.ts
@@ -14,8 +14,7 @@
 
 'use strict';
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import TypeScriptProjectConfig = require('../commons/projectConfig');
 import tsUtils = require('../commons/typeScriptUtils');
 import utils = require('../commons/utils');
diff --git a/src/main/serviceConsumer.ts b/src/main/serviceConsumer.ts
@@ -14,8 +14,7 @@
 
 'use strict';
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 /**
  * a class implementing logic to stack operations until a service 
diff --git a/src/main/workingSet.ts b/src/main/workingSet.ts
@@ -18,8 +18,7 @@
 import signal = require('../commons/signal');
 import collections = require('../commons/collections');
 import ws = require('../commons/workingSet');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 
 
diff --git a/src/test/fileSystemMock.ts b/src/test/fileSystemMock.ts
@@ -18,8 +18,7 @@
 
 import fs = require('../commons/fileSystem');
 import signal = require('../commons/signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 class FileSystem implements fs.IFileSystem {
     
diff --git a/src/test/projectManagerTest.ts b/src/test/projectManagerTest.ts
@@ -23,9 +23,7 @@ import utils = require('../commons/utils');
 import collections = require('../commons/collections');
 import signal = require('../commons/signal');
 import FileSystemMock = require('./fileSystemMock');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
-
+import Promise = require('bluebird');
 
 describe('TypeScriptProjectManager', function () {
     var typeScriptProjectManager: TypeScriptProjectManager,
diff --git a/src/test/workerBridgeTest.ts b/src/test/workerBridgeTest.ts
@@ -18,8 +18,7 @@
 
 import WorkerBridge = require('../commons/workerBridge');
 import signal = require('../commons/signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 class FakeWorker {
     private initialized: boolean;
diff --git a/src/test/workingSetMock.ts b/src/test/workingSetMock.ts
@@ -18,8 +18,7 @@
 
 import ws = require('../commons/workingSet');
 import signal = require('../commons/signal');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 
 class WorkingSetMock implements ws.IWorkingSet {
     files: string [] = [];
diff --git a/src/ts-worker/completionService.ts b/src/ts-worker/completionService.ts
@@ -14,8 +14,7 @@
 
 'use strict';
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import TypeScriptProjectManager = require('./projectManager');
 import completion = require('../commons/completion');
 import logger = require('../commons/logger');
diff --git a/src/ts-worker/definitionService.ts b/src/ts-worker/definitionService.ts
@@ -16,9 +16,8 @@
 
 
 import TypeScriptProjectManager = require('./projectManager');
-import es6Promise = require('es6-promise');
+import Promise = require('bluebird');
 import definition = require('../commons/definition');
-import Promise = es6Promise.Promise;
 
 
 /**
diff --git a/src/ts-worker/errorService.ts b/src/ts-worker/errorService.ts
@@ -16,8 +16,7 @@
 
 
 import TypeScriptProjectManager = require('./projectManager');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import IErrorService = require('../commons/errorService');
 
 /**
diff --git a/src/ts-worker/lexicalStructureService.ts b/src/ts-worker/lexicalStructureService.ts
@@ -16,8 +16,7 @@
 
 
 import TypeScriptProjectManager = require('./projectManager');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import ls = require('../commons/lexicalStructure');
 
 /**
diff --git a/src/ts-worker/project.ts b/src/ts-worker/project.ts
@@ -16,8 +16,7 @@
 
 import path = require('path');
 import minimatch = require('minimatch');
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import PromiseQueue = require('../commons/promiseQueue');
 import Services = TypeScript.Services;
 
diff --git a/src/ts-worker/projectManager.ts b/src/ts-worker/projectManager.ts
@@ -15,8 +15,7 @@
 'use strict';
 
 
-import es6Promise = require('es6-promise');
-import Promise = es6Promise.Promise;
+import Promise = require('bluebird');
 import path = require('path');
 import PromiseQueue = require('../commons/promiseQueue');
 import ws = require('../commons/workingSet');

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`"grunt-contrib-compress": "~0.5.3",`
`24`	`24`	`"grunt-browserify": "~1.3.0",`
`25`	`25`	`"istanbulify": "~0.1.0",`
`26`		`- "es6-promise": "~0.1.1",`
`27`	`26`	`"grunt-typescript": "~0.3.0",`
`28`		`- "grunt-template-jasmine-istanbul": "~0.2.6"`
	`27`	`+ "grunt-template-jasmine-istanbul": "~0.2.6",`
	`28`	`+ "bluebird": "~1.2.3"`
`29`	`29`	`}`
`30`	`30`	`}`