promist - npm Package Compare versions

Comparing version 0.4.2 to 0.4.3

compose/timeout.js

@@ -10,4 +10,2 @@ "use strict";
 
-var _wait = _interopRequireDefault(require("../create/wait"));
-
 var _cancellable = _interopRequireDefault(require("./cancellable"));
@@ -24,3 +22,4 @@
     let done = false;
-    (0, _wait.default)(ms).then(() => {
+    let timeout;
+    new Promise(resolve => timeout = setTimeout(resolve, ms)).then(() => {
       if (done) return;
@@ -32,6 +31,14 @@ if (shouldCancel) return promise.cancel();
     return (0, _intercept.default)(promise, p => {
-      return p.then(val => (done = true) && val).catch(err => (done = true) && Promise.reject(err));
+      return p.then(val => {
+        done = true;
+        clearTimeout(timeout);
+        return val;
+      }).catch(err => {
+        done = true;
+        clearTimeout(timeout);
+        return Promise.reject(err);
+      });
     });
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21wb3NlL3RpbWVvdXQuanMiXSwibmFtZXMiOlsidGltZW91dCIsIm1zIiwicmVhc29uIiwicHJvbWlzZSIsInNob3VsZENhbmNlbCIsInVuZGVmaW5lZCIsImRvbmUiLCJ0aGVuIiwiY2FuY2VsIiwicmVqZWN0IiwiRXJyb3IiLCJwIiwidmFsIiwiY2F0Y2giLCJlcnIiLCJQcm9taXNlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7Ozs7QUFFZSxTQUFTQSxPQUFULENBQWlCQyxFQUFqQixFQUFxQkMsTUFBckIsRUFBNkI7QUFDMUMsU0FBUUMsT0FBRCxJQUFhO0FBQ2xCLFVBQU1DLFlBQVksR0FBR0YsTUFBTSxLQUFLRyxTQUFYLElBQXdCSCxNQUFNLEtBQUssS0FBeEQ7QUFDQUMsSUFBQUEsT0FBTyxHQUFHQyxZQUFZLEdBQUcsMEJBQVlELE9BQVosQ0FBSCxHQUEwQix5QkFBV0EsT0FBWCxDQUFoRDtBQUVBLFFBQUlHLElBQUksR0FBRyxLQUFYO0FBQ0EsdUJBQUtMLEVBQUwsRUFBU00sSUFBVCxDQUFjLE1BQU07QUFDbEIsVUFBSUQsSUFBSixFQUFVO0FBQ1YsVUFBSUYsWUFBSixFQUFrQixPQUFPRCxPQUFPLENBQUNLLE1BQVIsRUFBUDtBQUNsQixVQUFJLE9BQU9OLE1BQVAsS0FBa0IsU0FBdEIsRUFBaUMsT0FBT0MsT0FBTyxDQUFDTSxNQUFSLENBQWVQLE1BQWYsQ0FBUDtBQUNqQ0MsTUFBQUEsT0FBTyxDQUFDTSxNQUFSLENBQWVDLEtBQUssQ0FBQyxtQkFBRCxDQUFwQjtBQUNELEtBTEQ7QUFPQSxXQUFPLHdCQUFVUCxPQUFWLEVBQW9CUSxDQUFELElBQU87QUFDL0IsYUFBT0EsQ0FBQyxDQUNMSixJQURJLENBQ0VLLEdBQUQsSUFBUyxDQUFDTixJQUFJLEdBQUcsSUFBUixLQUFpQk0sR0FEM0IsRUFFSkMsS0FGSSxDQUVHQyxHQUFELElBQVMsQ0FBQ1IsSUFBSSxHQUFHLElBQVIsS0FBaUJTLE9BQU8sQ0FBQ04sTUFBUixDQUFlSyxHQUFmLENBRjVCLENBQVA7QUFHRCxLQUpNLENBQVA7QUFLRCxHQWpCRDtBQWtCRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBpbnRlcmNlcHQgZnJvbSAnfi9oZWxwZXJzL2ludGVyY2VwdCc7XG5pbXBvcnQgd2FpdCBmcm9tICd+L2NyZWF0ZS93YWl0JztcbmltcG9ydCBjYW5jZWxsYWJsZSBmcm9tICcuL2NhbmNlbGxhYmxlJztcbmltcG9ydCBkZWZlcnJhYmxlIGZyb20gJy4vZGVmZXJyYWJsZSc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHRpbWVvdXQobXMsIHJlYXNvbikge1xuICByZXR1cm4gKHByb21pc2UpID0+IHtcbiAgICBjb25zdCBzaG91bGRDYW5jZWwgPSByZWFzb24gPT09IHVuZGVmaW5lZCB8fCByZWFzb24gPT09IGZhbHNlO1xuICAgIHByb21pc2UgPSBzaG91bGRDYW5jZWwgPyBjYW5jZWxsYWJsZShwcm9taXNlKSA6IGRlZmVycmFibGUocHJvbWlzZSk7XG5cbiAgICBsZXQgZG9uZSA9IGZhbHNlO1xuICAgIHdhaXQobXMpLnRoZW4oKCkgPT4ge1xuICAgICAgaWYgKGRvbmUpIHJldHVybjtcbiAgICAgIGlmIChzaG91bGRDYW5jZWwpIHJldHVybiBwcm9taXNlLmNhbmNlbCgpO1xuICAgICAgaWYgKHR5cGVvZiByZWFzb24gIT09ICdib29sZWFuJykgcmV0dXJuIHByb21pc2UucmVqZWN0KHJlYXNvbik7XG4gICAgICBwcm9taXNlLnJlamVjdChFcnJvcignUHJvbWlzZSB0aW1lZCBvdXQnKSk7XG4gICAgfSk7XG5cbiAgICByZXR1cm4gaW50ZXJjZXB0KHByb21pc2UsIChwKSA9PiB7XG4gICAgICByZXR1cm4gcFxuICAgICAgICAudGhlbigodmFsKSA9PiAoZG9uZSA9IHRydWUpICYmIHZhbClcbiAgICAgICAgLmNhdGNoKChlcnIpID0+IChkb25lID0gdHJ1ZSkgJiYgUHJvbWlzZS5yZWplY3QoZXJyKSk7XG4gICAgfSk7XG4gIH07XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21wb3NlL3RpbWVvdXQuanMiXSwibmFtZXMiOlsidGltZW91dCIsIm1zIiwicmVhc29uIiwicHJvbWlzZSIsInNob3VsZENhbmNlbCIsInVuZGVmaW5lZCIsImRvbmUiLCJQcm9taXNlIiwicmVzb2x2ZSIsInNldFRpbWVvdXQiLCJ0aGVuIiwiY2FuY2VsIiwicmVqZWN0IiwiRXJyb3IiLCJwIiwidmFsIiwiY2xlYXJUaW1lb3V0IiwiY2F0Y2giLCJlcnIiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7OztBQUVlLFNBQVNBLE9BQVQsQ0FBaUJDLEVBQWpCLEVBQXFCQyxNQUFyQixFQUE2QjtBQUMxQyxTQUFRQyxPQUFELElBQWE7QUFDbEIsVUFBTUMsWUFBWSxHQUFHRixNQUFNLEtBQUtHLFNBQVgsSUFBd0JILE1BQU0sS0FBSyxLQUF4RDtBQUNBQyxJQUFBQSxPQUFPLEdBQUdDLFlBQVksR0FBRywwQkFBWUQsT0FBWixDQUFILEdBQTBCLHlCQUFXQSxPQUFYLENBQWhEO0FBRUEsUUFBSUcsSUFBSSxHQUFHLEtBQVg7QUFDQSxRQUFJTixPQUFKO0FBQ0EsUUFBSU8sT0FBSixDQUFhQyxPQUFELElBQWNSLE9BQU8sR0FBR1MsVUFBVSxDQUFDRCxPQUFELEVBQVVQLEVBQVYsQ0FBOUMsRUFBOERTLElBQTlELENBQW1FLE1BQU07QUFDdkUsVUFBSUosSUFBSixFQUFVO0FBQ1YsVUFBSUYsWUFBSixFQUFrQixPQUFPRCxPQUFPLENBQUNRLE1BQVIsRUFBUDtBQUNsQixVQUFJLE9BQU9ULE1BQVAsS0FBa0IsU0FBdEIsRUFBaUMsT0FBT0MsT0FBTyxDQUFDUyxNQUFSLENBQWVWLE1BQWYsQ0FBUDtBQUNqQ0MsTUFBQUEsT0FBTyxDQUFDUyxNQUFSLENBQWVDLEtBQUssQ0FBQyxtQkFBRCxDQUFwQjtBQUNELEtBTEQ7QUFPQSxXQUFPLHdCQUFVVixPQUFWLEVBQW9CVyxDQUFELElBQU87QUFDL0IsYUFBT0EsQ0FBQyxDQUNMSixJQURJLENBQ0VLLEdBQUQsSUFBUztBQUNiVCxRQUFBQSxJQUFJLEdBQUcsSUFBUDtBQUNBVSxRQUFBQSxZQUFZLENBQUNoQixPQUFELENBQVo7QUFDQSxlQUFPZSxHQUFQO0FBQ0QsT0FMSSxFQU1KRSxLQU5JLENBTUdDLEdBQUQsSUFBUztBQUNkWixRQUFBQSxJQUFJLEdBQUcsSUFBUDtBQUNBVSxRQUFBQSxZQUFZLENBQUNoQixPQUFELENBQVo7QUFDQSxlQUFPTyxPQUFPLENBQUNLLE1BQVIsQ0FBZU0sR0FBZixDQUFQO0FBQ0QsT0FWSSxDQUFQO0FBV0QsS0FaTSxDQUFQO0FBYUQsR0ExQkQ7QUEyQkQiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgaW50ZXJjZXB0IGZyb20gJ34vaGVscGVycy9pbnRlcmNlcHQnO1xuaW1wb3J0IGNhbmNlbGxhYmxlIGZyb20gJy4vY2FuY2VsbGFibGUnO1xuaW1wb3J0IGRlZmVycmFibGUgZnJvbSAnLi9kZWZlcnJhYmxlJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdGltZW91dChtcywgcmVhc29uKSB7XG4gIHJldHVybiAocHJvbWlzZSkgPT4ge1xuICAgIGNvbnN0IHNob3VsZENhbmNlbCA9IHJlYXNvbiA9PT0gdW5kZWZpbmVkIHx8IHJlYXNvbiA9PT0gZmFsc2U7XG4gICAgcHJvbWlzZSA9IHNob3VsZENhbmNlbCA/IGNhbmNlbGxhYmxlKHByb21pc2UpIDogZGVmZXJyYWJsZShwcm9taXNlKTtcblxuICAgIGxldCBkb25lID0gZmFsc2U7XG4gICAgbGV0IHRpbWVvdXQ7XG4gICAgbmV3IFByb21pc2UoKHJlc29sdmUpID0+ICh0aW1lb3V0ID0gc2V0VGltZW91dChyZXNvbHZlLCBtcykpKS50aGVuKCgpID0+IHtcbiAgICAgIGlmIChkb25lKSByZXR1cm47XG4gICAgICBpZiAoc2hvdWxkQ2FuY2VsKSByZXR1cm4gcHJvbWlzZS5jYW5jZWwoKTtcbiAgICAgIGlmICh0eXBlb2YgcmVhc29uICE9PSAnYm9vbGVhbicpIHJldHVybiBwcm9taXNlLnJlamVjdChyZWFzb24pO1xuICAgICAgcHJvbWlzZS5yZWplY3QoRXJyb3IoJ1Byb21pc2UgdGltZWQgb3V0JykpO1xuICAgIH0pO1xuXG4gICAgcmV0dXJuIGludGVyY2VwdChwcm9taXNlLCAocCkgPT4ge1xuICAgICAgcmV0dXJuIHBcbiAgICAgICAgLnRoZW4oKHZhbCkgPT4ge1xuICAgICAgICAgIGRvbmUgPSB0cnVlO1xuICAgICAgICAgIGNsZWFyVGltZW91dCh0aW1lb3V0KTtcbiAgICAgICAgICByZXR1cm4gdmFsO1xuICAgICAgICB9KVxuICAgICAgICAuY2F0Y2goKGVycikgPT4ge1xuICAgICAgICAgIGRvbmUgPSB0cnVlO1xuICAgICAgICAgIGNsZWFyVGltZW91dCh0aW1lb3V0KTtcbiAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3QoZXJyKTtcbiAgICAgICAgfSk7XG4gICAgfSk7XG4gIH07XG59XG4iXX0=

package.json

 {
   "name": "promist",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "author": "Rafa Mel",
@@ -5,0 +5,0 @@ "description": "A dependable Promises and async utility belt",

typings/compose.d.ts

@@ -22,11 +22,11 @@ /**
 ): IPromist<T>;
-export function delay<T>(
+export function delay(
   ms: number,
   delayRejection?: boolean
-): (promise: Promise<T> | PromiseLike<T>) => IPromist<T>;
+): <T>(promise: Promise<T> | PromiseLike<T>) => IPromist<T>;
 export function status<T>(promise: Promise<T> | PromiseLike<T>): IPromist<T>;
 export function timed<T>(promise: Promise<T> | PromiseLike<T>): IPromist<T>;
-export function timeout<T>(
+export function timeout(
   ms: number,
   reason?: any
-): (promise: Promise<T> | PromiseLike<T>) => IPromist<any>;
+): <T>(promise: Promise<T> | PromiseLike<T>) => IPromist<T>;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

81939

increased by0.79%

Lines of code

885

increased by0.91%

No dependency changes