xaa 1.6.2 → 1.7.2

package/README.md

@@ -2,7 +2,7 @@
 
 async/await and Promise helpers.
 
-<https://github.com/jchip/xaa>
+github: <https://github.com/jchip/xaa>
 
 ## Install and Usage
 
@@ -12,7 +12,7 @@ npm i xaa
 
 ## APIs
 
-API references can be found [here](https://jchip.github.io/xaa/modules/index.html)
+API references <https://jchip.github.io/xaa/>
 
 Or just use your IDE for hint if it supports TypeScript and typedoc.
 
@@ -32,9 +32,9 @@ async function test() {
       () => xaa.delay(10, 1),
       () => xaa.delay(15, 2),
       "some value",
-      Promise.resolve("more value"),
+      Promise.resolve("more value")
     ])
-    .then((results) => {
+    .then(results => {
       // results === [1, 2, "some value", "more value"]
     });
 }

package/dist/{xaa.d.ts → index.d.ts}

@@ -3,7 +3,8 @@
  * @module index
  */
 declare type Consumer<T> = (item: T, index?: number) => unknown;
-declare type Producer<T> = () => T | Promise<T>;
+declare type FuncProducer<T> = () => T | Promise<T>;
+declare type Producer<T> = Promise<T> | FuncProducer<T>;
 declare type Predicate<T> = (item: T, index?: number) => boolean | Promise<boolean>;
 /**
  * Defer object for fulfilling a promise later in other events
@@ -31,7 +32,7 @@ export declare class Defer<T> {
      * @param args - result
      * @returns nothing
      */
-    done(err: Error, ...args: any[]): void;
+    done: (err: Error, ...args: any[]) => void;
 }
 /**
  * Create a promise Defer object
@@ -57,8 +58,6 @@ export { makeDefer as defer };
 export declare class TimeoutError extends Error {
     constructor(msg: string);
 }
-declare type ValueOrProducer<T> = T extends Function ? never : T | Promise<T> | Producer<T>;
-declare type ValueOrErrorHandler<T> = T extends Function ? never : T | Promise<T> | ((err?: Error) => T | Promise<T>);
 /**
  * delay some milliseconds and then return `valOrFunc`
  *
@@ -75,8 +74,8 @@ declare type ValueOrErrorHandler<T> = T extends Function ? never : T | Promise<T
  * It can be an async function.
  * @returns `valOrFunc` or its returned value if it's a function.
  */
-export declare function delay<T extends Function>(delayMs: number, valOrFunc?: Producer<T>): Promise<T>;
-export declare function delay<T = void>(delayMs: number, valOrFunc: ValueOrProducer<T>): Promise<T>;
+export declare function delay(delayMs: number): Promise<void>;
+export declare function delay<T = void>(delayMs: number, valOrFunc: T): Promise<T>;
 declare type Task<T> = Promise<T> | (() => Promise<T>);
 declare type Tasks<T extends readonly any[]> = {
     readonly [P in keyof T]: Task<T[P]>;
@@ -206,17 +205,18 @@ export declare type MapContext<T> = {
  * @param context MapContext
  * @returns any or a promise
  */
-export declare type MapFunction<T, O> = (value: T, index: number, context: MapContext<T>) => O | Promise<O>;
+export declare type MapFunction<T, O> = (value: Awaited<T>, index: number, context: MapContext<T>) => O | Promise<O>;
 /**
  * async map array with concurrency
+ *
  * - intended to be similar to `bluebird.map`
  *
- * @param array - input array for map
+ * @param array array to map, if any item is promise-like, it will be resolved first.
  * @param func - callback to map values from the array
  * @param options - MapOptions
  * @returns promise with mapped result
  */
-export declare function map<T, O>(array: readonly T[], func: MapFunction<T, O>, options?: MapOptions): Promise<O[]>;
+export declare function map<T, O>(array: readonly T[], func?: MapFunction<T, O>, options?: MapOptions): Promise<O[]>;
 /**
  * async version of array.forEach
  * - iterate through array and await call func with each element and index
@@ -247,16 +247,21 @@ export declare function each<T>(array: readonly T[], func: Consumer<T>): Promise
  * @returns filtered result
  */
 export declare function filter<T>(array: readonly T[], func: Predicate<T>): Promise<any[]>;
+declare type ValueOrErrorHandler<T> = T extends Function ? never : T | Promise<T> | ((err?: Error) => T | Promise<T>);
 /**
- * try to call and await a function and if it throws, then return `valOrFunc`.
+ * try to:
+ * - await a promise
+ * - call and await function that returns a promise
+ *
+ * If exception occur, then return `valOrFunc`
  *
- * - if `valOrFunc` is a function, then return `await valOrFunc(err)`
+ * - if `valOrFunc` is a function, then return `valOrFunc(err)`
  *
- * @param func function to try
+ * @param funcOrPromise function or promise to try
  * @param valOrFunc value, or callback to get value, to return if `func` throws
- * @returns awaited result, `valOrFunc`, or `await valOrFunc(err)`.
+ * @returns result, `valOrFunc`, or `valOrFunc(err)`.
  */
-export declare function tryCatch<T, TAlt>(func: Producer<T>, valOrFunc?: ValueOrErrorHandler<TAlt>): Promise<T | TAlt>;
+export declare function tryCatch<T>(funcOrPromise: Producer<T>, valOrFunc?: ValueOrErrorHandler<T>): Promise<T>;
 export { tryCatch as try };
 /**
  * Wrap the calling of a function into async/await (promise) context

package/dist/{xaa.js → index.js}

@@ -3,13 +3,24 @@
  * @packageDocumentation
  * @module index
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrap = exports.try = exports.tryCatch = exports.filter = exports.each = exports.map = exports.runTimeout = exports.timeout = exports.TimeoutRunner = exports.delay = exports.TimeoutError = exports.defer = exports.makeDefer = exports.Defer = void 0;
-const tslib_1 = require("tslib");
 /* eslint-disable max-statements, @typescript-eslint/ban-types */
-const assert_1 = tslib_1.__importDefault(require("assert"));
+const assert_1 = __importDefault(require("assert"));
 const util_1 = require("util");
-const setTimeoutPromise = util_1.promisify(setTimeout);
+const setTimeoutPromise = (0, util_1.promisify)(setTimeout);
+/**
+ * check if something is a promise
+ *
+ * @param p
+ * @returns true or false
+ */
+function isPromise(p) {
+    return p && p.then && p.catch;
+}
 /**
  * Defer object for fulfilling a promise later in other events
  *
@@ -27,22 +38,15 @@ class Defer {
             this.resolve = resolve;
             this.reject = reject;
         });
-    }
-    /**
-     * node.js callback for the deferred promise
-     *
-     * @param err - error
-     * @param args - result
-     * @returns nothing
-     */
-    done(err, ...args) {
         // Not declaring (err, result) explicitly for standard node.js callback.
         // we can't be sure if user's API expects callback that
         // should have a second arg for result.
-        if (err)
-            this.reject(err);
-        else
-            this.resolve(args[0]);
+        this.done = (err, ...args) => {
+            if (err)
+                this.reject(err);
+            else
+                this.resolve(args[0]);
+        };
     }
 }
 exports.Defer = Defer;
@@ -74,7 +78,7 @@ class TimeoutError extends Error {
     constructor(msg) {
         super(msg);
         this.name = "TimeoutError";
-        assert_1.default(msg);
+        (0, assert_1.default)(msg);
     }
 }
 exports.TimeoutError = TimeoutError;
@@ -210,7 +214,7 @@ function createMapContext(array) {
  *
  * Use by xaa.map internally.
  *
- * @param array array to map
+ * @param array array to map, if any item is promise-like, it will be resolved first.
  * @param func mapper callback
  * @param options MapOptions
  * @returns promise with mapped result
@@ -248,18 +252,28 @@ function multiMap(array, func, options) {
             awaited[pendingIx] = x;
             mapNext();
         };
-        try {
-            const res = func.call(options.thisArg, array[pendingIx], pendingIx, context);
-            if (res && res.then) {
+        const handleRet = res => {
+            if (isPromise(res)) {
                 res.then(save, fail);
                 return mapNext();
             }
             else {
                 return save(res);
             }
+        };
+        const item = array[pendingIx];
+        if (isPromise(item)) {
+            return item.then(val => {
+                return handleRet(func.call(options.thisArg, val, pendingIx, context));
+            }, fail);
         }
-        catch (err) {
-            return fail(err);
+        else {
+            try {
+                return handleRet(func.call(options.thisArg, item, pendingIx, context));
+            }
+            catch (err) {
+                return fail(err);
+            }
         }
     };
     //
@@ -275,15 +289,16 @@ function multiMap(array, func, options) {
 }
 /**
  * async map array with concurrency
+ *
  * - intended to be similar to `bluebird.map`
  *
- * @param array - input array for map
+ * @param array array to map, if any item is promise-like, it will be resolved first.
  * @param func - callback to map values from the array
  * @param options - MapOptions
  * @returns promise with mapped result
  */
 async function map(array, func, options = { concurrency: 1 }) {
-    assert_1.default(Array.isArray(array), `xaa.map expecting an array but got ${typeof array}`);
+    (0, assert_1.default)(Array.isArray(array), `xaa.map expecting an array but got ${typeof array}`);
     if (array.length < 1) {
         return [];
     }
@@ -295,7 +310,11 @@ async function map(array, func, options = { concurrency: 1 }) {
         const context = createMapContext(array);
         for (let i = 0; i < array.length; i++) {
             try {
-                awaited[i] = await func.call(options.thisArg, array[i], i, context);
+                let item = array[i];
+                if (isPromise(item)) {
+                    item = await item;
+                }
+                awaited[i] = await func.call(options.thisArg, item, i, context);
             }
             catch (err) {
                 context.failed = true;
@@ -352,20 +371,30 @@ async function filter(array, func) {
 }
 exports.filter = filter;
 /**
- * try to call and await a function and if it throws, then return `valOrFunc`.
+ * try to:
+ * - await a promise
+ * - call and await function that returns a promise
+ *
+ * If exception occur, then return `valOrFunc`
  *
- * - if `valOrFunc` is a function, then return `await valOrFunc(err)`
+ * - if `valOrFunc` is a function, then return `valOrFunc(err)`
  *
- * @param func function to try
+ * @param funcOrPromise function or promise to try
  * @param valOrFunc value, or callback to get value, to return if `func` throws
- * @returns awaited result, `valOrFunc`, or `await valOrFunc(err)`.
+ * @returns result, `valOrFunc`, or `valOrFunc(err)`.
  */
-async function tryCatch(func, valOrFunc) {
+async function tryCatch(funcOrPromise, valOrFunc) {
     try {
-        return await func();
+        if (isPromise(funcOrPromise)) {
+            return await funcOrPromise;
+        }
+        return await funcOrPromise();
     }
     catch (err) {
-        return typeof valOrFunc === "function" ? valOrFunc(err) : valOrFunc;
+        if (typeof valOrFunc === "function") {
+            return valOrFunc(err);
+        }
+        return valOrFunc;
     }
 }
 exports.tryCatch = tryCatch;
@@ -382,4 +411,4 @@ async function wrap(func, ...args2) {
     return func(...args2);
 }
 exports.wrap = wrap;
-//# sourceMappingURL=xaa.js.map
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "xaa",
-  "version": "1.6.2",
+  "version": "1.7.2",
   "description": "async/await/Promise helpers - delay, defer, timeout, each, map, filter",
-  "main": "dist/xaa.js",
-  "types": "dist/xaa.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "test": "xrun xarc/test-only",
-    "coverage": "xrun xarc/test-cov",
-    "prepublishOnly": "xrun [[build, docs], xarc/check]",
+    "build": "rm -rf dist && tsc",
+    "test": "xrun -s build xarc/test-only",
+    "coverage": "xrun -s build xarc/test-cov",
+    "prepublishOnly": "xrun [[build, docs] xarc/check]",
     "docs": "clap xarc/docs && touch docs/.nojekyll"
   },
   "homepage": "https://jchip.github.io/xaa/",
@@ -43,23 +43,23 @@
     "@types/sinon-chai": "^3.2.5",
     "@typescript-eslint/eslint-plugin": "^4.11.0",
     "@typescript-eslint/parser": "^4.11.0",
-    "@xarc/module-dev": "^3.0.2",
+    "@xarc/module-dev": "^4.0.0",
     "babel-eslint": "^10.1.0",
     "chai": "^4.2.0",
     "eslint": "^7.16.0",
     "eslint-config-walmart": "^2.2.1",
     "eslint-plugin-filenames": "^1.1.0",
     "eslint-plugin-jsdoc": "^30.7.9",
+    "eslint-plugin-tsdoc": "^0.2.11",
     "mocha": "^8.2.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.2.1",
     "run-verify": "^1.2.1",
     "sinon": "^9.2.2",
     "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^9.1.1",
-    "typedoc": "^0.20.13",
-    "typedoc-plugin-external-module-name": "^3.0.0",
+    "typedoc": "^0.22.12",
     "typescript": "^4.1.3"
   },
   "nyc": {
@@ -96,16 +96,12 @@
     "trailingComma": "none",
     "arrowParens": "avoid"
   },
-  "fyn": {
-    "devDependencies": {
-      "@xarc/module-dev": "../module-dev"
-    }
-  },
   "@xarc/module-dev": {
     "features": [
       "eslint",
       "eslintTS",
       "mocha",
+      "prettier",
       "typedoc",
       "typescript"
     ]
@@ -118,7 +114,5 @@
     ],
     "recursive": true
   },
-  "dependencies": {
-    "tslib": "^2.1.0"
-  }
+  "dependencies": {}
 }

package/dist/xaa.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xaa.js","sourceRoot":"","sources":["../src/xaa.ts"],"names":[],"mappings":"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"}