3.1.7

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/smartpromise",
   "private": false,
-  "version": "3.0.9",
+  "version": "3.1.7",
   "description": "simple promises and Deferred constructs",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "(tstest test/ --web)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -19,12 +19,11 @@
     "url": "https://gitlab.com/pushrocks/smartq/issues"
   },
   "homepage": "https://gitlab.com/pushrocks/smartq#README",
-  "dependencies": {},
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.54",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.11.8",
+    "@types/node": "^15.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

readme.md

@@ -0,0 +1,98 @@
+# @pushrocks/smartpromise
+simple promises and Deferred constructs
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartpromise)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartpromise)
+* [github.com (source mirror)](https://github.com/pushrocks/smartpromise)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartpromise/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartpromise/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartpromise/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartpromise)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartpromise)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartpromise)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartpromise)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartpromise)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+
+## Usage
+
+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()
+
+```typescript
+import * as q from '@pushrocks/smartpromise';
+
+// Deferred
+// -----------------------------------------------
+let myAsyncFunction = (): Promise<string> => {
+  let done = q.defer<string>(); // returns your typical Deferred object
+  setTimeout(() => {
+    done.resolve('hi'); // will throw type error for other types than string as argument ;)
+  }, 6000);
+
+  console.log(done.status); // logs "pending";
+  done.promise.then(() => {
+    console.log(done.status); // logs "fullfilled"
+    console.log(done.duration); // logs the milliseconds between instantiation and fullfillment
+  });
+
+  return done.promise;
+};
+
+let myAsyncFunction2 = async () => {
+  let aString = await myAsyncFunction();
+  console.log(aString); // will log 'hi' to console
+};
+
+myAsyncFunction2();
+
+// Resolved and Rejected promises
+// ------------------------------------------------
+q.resolvedPromise(`I'll get logged to console soon`).then((x) => {
+  console.log(x);
+});
+
+q.rejectedPromise(`what a lovely error message`)
+  .then(
+    () => {
+      console.log('This never makes it to console');
+    } /*, alternatively put a reject function here */
+  )
+  .catch((err) => {
+    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
+});
+```
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.readme.node.ts

@@ -0,0 +1,54 @@
+import * as smartpromise from '../ts'; 
+
+// using Deferreds
+// simple deferred;
+const done = smartpromise.defer();
+done.promise.then((stringArg) => {
+  console.log(stringArg);
+});
+done.resolve('hello') // whenever you are ready
+
+
+// using deferreds in async functions to cater callback style apis
+const myAsyncFunction = async (): Promise<string> => {
+  const done = smartpromise.defer<string>(); // returns your typical Deferred object
+  setTimeout(() => {
+    done.resolve('hi'); // will throw type error for other types than string as argument ;)
+  }, 6000);
+
+  console.log(done.status); // logs "pending";
+  await done.promise;
+  console.log(done.status); // logs "fullfilled"
+  console.log(done.duration); // outputs the duration in millisenconds
+
+  return done.promise;
+};
+
+let myAsyncFunction2 = async () => {
+  let aString = await myAsyncFunction();
+  console.log(aString); // will log 'hi' to console
+};
+
+myAsyncFunction2();
+
+// Resolved and Rejected promises
+// ------------------------------------------------
+smartpromise.resolvedPromise(`I'll get logged to console soon`).then((x) => {
+  console.log(x);
+});
+
+smartpromise
+  .rejectedPromise(`what a lovely error message`)
+  .then(
+    () => {
+      console.log('This never makes it to console');
+    } /*, alternatively put a reject function here */
+  )
+  .catch((err) => {
+    console.log(err);
+  });
+
+import {tap, expect } from '@pushrocks/tapbundle';
+
+tap.test('runs through', async () => {})
+tap.start();

ts/index.ts

@@ -84,11 +84,34 @@ export const map = async <T>(inputArg: T[], functionArg: IAsyncFunction<T>) => {
   return resultArray;
 };
 
-export const timeoutWrap = (ms, promise) => {
+export const timeoutWrap = async <T = any>(promiseArg: Promise<T>, timeoutInMsArg: number, rejectArg = true) => {
-  return new Promise((resolve, reject) => {
+  return new Promise<T>((resolve, reject) => {
     setTimeout(() => {
-      reject(new Error('timeout'));
+      if (rejectArg) {
-    }, ms);
+        reject(new Error('timeout'));
-    promise.then(resolve, reject);
+      } else {
+        resolve(null);
+      }
+    }, timeoutInMsArg);
+    promiseArg.then(resolve, reject);
   });
 };
+
+export const timeoutAndContinue = async <T = any>(promiseArg: Promise<T>, timeoutInMsArg = 60000) => {
+  return timeoutWrap(promiseArg, timeoutInMsArg, false);
+}
+
+export const getFirstTrueOrFalse = async (promisesArg: Promise<boolean>[]) => {
+  const done = defer<boolean>();
+  for (const promiseArg of promisesArg) {
+    promiseArg.then((resultArg) => {
+      if (resultArg === true) {
+        done.resolve(true);
+      }
+    });
+  }
+  Promise.all(promisesArg).then(() => {
+    done.resolve(false);
+  });
+  return done.promise;
+};