1.1.1

README.md

@@ -2,10 +2,10 @@
 dropin replacement for q
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartq)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartq)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartq)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartq/)
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartq)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartq)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartq)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartq/)
 
 ## Status for master
 [![build status](https://GitLab.com/pushrocks/smartq/badges/master/build.svg)](https://GitLab.com/pushrocks/smartq/commits/master)
@@ -22,14 +22,17 @@ dropin replacement for q
 Use TypeScript for best in class instellisense.
 
 > Note: smartq uses native ES6 promises
+> smartq does not repeat any native functions, so for things like .all() simply use Promise.all()
 
 ```javascript
 import * as q from 'smartq'
 
+// Deferred
+// -----------------------------------------------
 let myAsyncFunction = (): Promise<string> => {
-    let done = q.defer() // returns your typical Deferred object
+    let done = q.defer<string>() // returns your typical Deferred object
     setTimeout(() => {
-        done.resolve('hi')
+        done.resolve('hi') // will throw type error for other types than string as argument ;)
     },6000)
     return done.promise
 }
@@ -40,16 +43,10 @@ let myAsyncFunction2 = async () => {
 }
 
 myAsyncFunction2();
-q.all(myAsyncFunction(), myAsyncFunction2())
-    .then(() => {
-        console.log('all promises for q.all have been fullfilled')
-    })
 
-q.race(/* some promises here */)
-    .then(() => {
-        console.log('at least one promise for q.race is fullfilled')
-    })
 
+// Resolved and Rejected promises
+// ------------------------------------------------
 q.resolvedPromise(`I'll get logged to console soon`)
     .then(x => {
         console.log(x)
@@ -63,6 +60,27 @@ q.rejectedPromise(`what a lovely error message`)
         console.log(err)
     })
 
+// Promisify (typed)
+// ------------------------------------------------
+
+let myCallbackedFunction = (someString: string, someNumber: number, cb) => {
+    cb(null, someString)
+}
+
+let myPromisedFunction = q.promisify(myCallbackFunction)
+myPromisedFunction('helloThere', 2).then(x => {
+    console.log(x) // will log 'helloThere' to console
+})
+
 ```
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+## Dependency Credits:
+who | made what
+-- | --
+[notenoughneon](https://www.npmjs.com/~notenoughneon) | [typed-promisify](https://www.npmjs.com/package/typed-promisify)
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.d.ts

@@ -1,4 +1,5 @@
 import 'typings-global';
+import * as typedPromisify from 'typed-promisify';
 export interface IResolve<T> {
     (value?: T | Promise<T>): void;
 }
@@ -12,49 +13,13 @@ export declare class Deferred<T> {
     constructor();
 }
 export declare let defer: <T>() => Deferred<T>;
-/**
- * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
- */
-export declare let all: {
-    <TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
-    <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    <T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    <T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    <T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    <T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    <T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    <T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<[T1, T2, T3, T4]>;
-    <T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
-    <T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
-    <T>(values: (T | PromiseLike<T>)[]): Promise<T[]>;
-};
-/**
- * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
- */
-export declare let race: {
-    <T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-    <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>;
-    <T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
-    <T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
-    <T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
-    <T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<T1 | T2 | T3 | T4 | T5 | T6>;
-    <T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<T1 | T2 | T3 | T4 | T5>;
-    <T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<T1 | T2 | T3 | T4>;
-    <T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<T1 | T2 | T3>;
-    <T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<T1 | T2>;
-    <T>(values: (T | PromiseLike<T>)[]): Promise<T>;
-};
 /**
  * Creates a new resolved promise for the provided value.
  */
-export declare let resolvedPromise: {
-    <T>(value: T | PromiseLike<T>): Promise<T>;
-    (): Promise<void>;
-};
+export declare let resolvedPromise: <T>(value?: T) => Promise<T>;
 /**
  * Creates a new rejected promise for the provided reason.
  */
-export declare let rejectedPromise: {
-    (reason: any): Promise<never>;
-    <T>(reason: any): Promise<T>;
-};
+export declare let rejectedPromise: (err: any) => Promise<never>;
+export declare let promisify: typeof typedPromisify.promisify;
+export declare let map: typeof typedPromisify.map;

dist/index.js

@@ -1,5 +1,6 @@
 "use strict";
 require("typings-global");
+const typedPromisify = require("typed-promisify");
 class Deferred {
     constructor() {
         this.promise = new Promise((resolve, reject) => {
@@ -12,20 +13,18 @@ exports.Deferred = Deferred;
 exports.defer = () => {
     return new Deferred();
 };
-/**
- * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
- */
-exports.all = Promise.all;
-/**
- * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
- */
-exports.race = Promise.race;
 /**
  * Creates a new resolved promise for the provided value.
  */
-exports.resolvedPromise = Promise.resolve;
+exports.resolvedPromise = (value) => {
+    return Promise.resolve(value);
+};
 /**
  * Creates a new rejected promise for the provided reason.
  */
-exports.rejectedPromise = Promise.reject;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBVXZCO0lBSUk7UUFDSSxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksT0FBTyxDQUFJLENBQUMsT0FBTyxFQUFFLE1BQU07WUFDMUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUE7WUFDdEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUE7UUFDeEIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDO0NBQ0o7QUFWRCw0QkFVQztBQUVVLFFBQUEsS0FBSyxHQUFHO0lBQ2YsTUFBTSxDQUFDLElBQUksUUFBUSxFQUFLLENBQUE7QUFDNUIsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDUSxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFBO0FBRTVCOztHQUVHO0FBQ1EsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQTtBQUU5Qjs7R0FFRztBQUNRLFFBQUEsZUFBZSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7QUFFNUM7O0dBRUc7QUFDUSxRQUFBLGVBQWUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFBIn0=
+exports.rejectedPromise = (err) => {
+    return Promise.reject(err);
+};
+exports.promisify = typedPromisify.promisify;
+exports.map = typedPromisify.map;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBRXZCLGtEQUFpRDtBQVVqRDtJQUlJO1FBQ0ksSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBSSxDQUFDLE9BQU8sRUFBRSxNQUFNO1lBQzFDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFBO1lBQ3RCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1FBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQztDQUNKO0FBVkQsNEJBVUM7QUFFVSxRQUFBLEtBQUssR0FBRztJQUNmLE1BQU0sQ0FBQyxJQUFJLFFBQVEsRUFBSyxDQUFBO0FBQzVCLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxlQUFlLEdBQUcsQ0FBSSxLQUFTO0lBQ3RDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQ2pDLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxlQUFlLEdBQUcsQ0FBQyxHQUFHO0lBQzdCLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQzlCLENBQUMsQ0FBQTtBQUVVLFFBQUEsU0FBUyxHQUFHLGNBQWMsQ0FBQyxTQUFTLENBQUE7QUFDcEMsUUFBQSxHQUFHLEdBQUcsY0FBYyxDQUFDLEdBQUcsQ0FBQSJ9

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartq",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "description": "dropin replacement for q",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -18,11 +18,11 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartq#README",
   "dependencies": {
+    "typed-promisify": "^0.3.0",
     "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.1.2",
+    "smartchai": "^1.0.1",
     "typings-test": "^1.0.3"
   }
 }

test/test.js

@@ -1,23 +1,34 @@
 "use strict";
 require("typings-test");
-const should = require("should");
+const smartchai_1 = require("smartchai");
 const q = require("../dist/index");
+let myCallback = (someValue1, cb) => {
+    cb(null, someValue1);
+};
 describe('smartq', function () {
-    it('should return a Deferred for .defer()', function (done) {
+    it('should return a Deferred for .defer()', function () {
         let myDeferred = q.defer();
-        myDeferred.promise.then(() => {
-            done();
-        });
+        let expectPromise = smartchai_1.expect(myDeferred.promise).to.eventually.be.fulfilled;
         myDeferred.resolve();
+        return expectPromise;
     });
-    it('should let types flow through the Promise', function (done) {
+    it('should let types flow through the Promise', function () {
         let myString = 'someString';
         let myDeferred = q.defer();
-        myDeferred.promise.then(x => {
-            should(x).equal('someString');
-            done();
-        });
+        let expectPromise = smartchai_1.expect(myDeferred.promise).to.eventually.equal('someString');
         myDeferred.resolve(myString);
+        return expectPromise;
+    });
+    it('should promisify a callback', function () {
+        let myPromisified = q.promisify(myCallback);
+        let expectPromise = smartchai_1.expect(myPromisified('hi')).to.eventually.equal('hi');
+        return expectPromise;
+    });
+    it('should map callbacks', function () {
+        let inputArray = ['hi', 'awesome'];
+        let myPromisified = q.promisify(myCallback);
+        let expectPromise = smartchai_1.expect(q.map(inputArray, myPromisified)).to.eventually.deep.equal(inputArray);
+        return expectPromise;
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQixpQ0FBZ0M7QUFDaEMsbUNBQWtDO0FBRWxDLFFBQVEsQ0FBQyxRQUFRLEVBQUU7SUFDZixFQUFFLENBQUMsdUNBQXVDLEVBQUUsVUFBUyxJQUFJO1FBQ3JELElBQUksVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUMxQixVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNwQixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO1FBQ0YsVUFBVSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDJDQUEyQyxFQUFFLFVBQVMsSUFBSTtRQUN6RCxJQUFJLFFBQVEsR0FBRyxZQUFZLENBQUE7UUFDM0IsSUFBSSxVQUFVLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBVSxDQUFBO1FBQ2xDLFVBQVUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDckIsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQTtZQUM3QixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO1FBQ0YsVUFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNoQyxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQix5Q0FBa0M7QUFDbEMsbUNBQWtDO0FBRWxDLElBQUksVUFBVSxHQUFHLENBQUMsVUFBa0IsRUFBRSxFQUFHO0lBQ3JDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUE7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsUUFBUSxDQUFDLFFBQVEsRUFBRTtJQUNmLEVBQUUsQ0FBQyx1Q0FBdUMsRUFBRTtRQUN4QyxJQUFJLFVBQVUsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDMUIsSUFBSSxhQUFhLEdBQUcsa0JBQU0sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFBO1FBQ3pFLFVBQVUsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNwQixNQUFNLENBQUMsYUFBYSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDJDQUEyQyxFQUFFO1FBQzVDLElBQUksUUFBUSxHQUFHLFlBQVksQ0FBQTtRQUMzQixJQUFJLFVBQVUsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFVLENBQUE7UUFDbEMsSUFBSSxhQUFhLEdBQUcsa0JBQU0sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUE7UUFDaEYsVUFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM1QixNQUFNLENBQUMsYUFBYSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDZCQUE2QixFQUFFO1FBQzlCLElBQUksYUFBYSxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDM0MsSUFBSSxhQUFhLEdBQUcsa0JBQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUN6RSxNQUFNLENBQUMsYUFBYSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLHNCQUFzQixFQUFFO1FBQ3ZCLElBQUksVUFBVSxHQUFHLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFBO1FBQ2xDLElBQUksYUFBYSxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDM0MsSUFBSSxhQUFhLEdBQUcsa0JBQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNqRyxNQUFNLENBQUMsYUFBYSxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==

test/test.ts

@@ -1,24 +1,38 @@
 import 'typings-test'
 
-import * as should from 'should'
+import { expect } from 'smartchai'
 import * as q from '../dist/index'
 
+let myCallback = (someValue1: string, cb?) => {
+    cb(null, someValue1)
+}
+
 describe('smartq', function () {
-    it('should return a Deferred for .defer()', function(done) {
+    it('should return a Deferred for .defer()', function () {
         let myDeferred = q.defer()
-        myDeferred.promise.then(() => {
-            done()
-        })
+        let expectPromise = expect(myDeferred.promise).to.eventually.be.fulfilled
         myDeferred.resolve()
+        return expectPromise
     })
 
-    it('should let types flow through the Promise', function(done) {
+    it('should let types flow through the Promise', function () {
         let myString = 'someString'
         let myDeferred = q.defer<string>()
-        myDeferred.promise.then(x => {
-            should(x).equal('someString')
-            done()
-        })
+        let expectPromise = expect(myDeferred.promise).to.eventually.equal('someString')
         myDeferred.resolve(myString)
+        return expectPromise
+    })
+
+    it('should promisify a callback', function () {
+        let myPromisified = q.promisify(myCallback)
+        let expectPromise = expect(myPromisified('hi')).to.eventually.equal('hi')
+        return expectPromise
+    })
+
+    it('should map callbacks', function() {
+        let inputArray = ['hi', 'awesome']
+        let myPromisified = q.promisify(myCallback)
+        let expectPromise = expect(q.map(inputArray, myPromisified)).to.eventually.deep.equal(inputArray)
+        return expectPromise
     })
 })

ts/index.ts

@@ -1,5 +1,7 @@
 import 'typings-global'
 
+import * as typedPromisify from 'typed-promisify'
+
 export interface IResolve<T> {
     (value?: T | Promise<T>): void
 }
@@ -24,22 +26,20 @@ export let defer = <T>() => {
     return new Deferred<T>()
 }
 
-/**
- * Creates a Promise that is resolved with an array of results when all of the provided Promises resolve, or rejected when any Promise is rejected.
- */
-export let all = Promise.all
-
-/**
- * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved or rejected.
- */
-export let race = Promise.race
-
 /**
  * Creates a new resolved promise for the provided value.
  */
-export let resolvedPromise = Promise.resolve
+export let resolvedPromise = <T>(value?: T): Promise<T> => {
+    return Promise.resolve(value)
+}
 
 /**
  * Creates a new rejected promise for the provided reason.
  */
-export let rejectedPromise = Promise.reject
+export let rejectedPromise = (err) => {
+    return Promise.reject(err)
+}
+
+export let promisify = typedPromisify.promisify
+export let map = typedPromisify.map
+export let _try = typedPromisify._try