@naturalcycles/js-lib 14.78.0 → 14.80.1

package/dist/decorators/logMethod.decorator.js

@@ -56,7 +56,7 @@ function _LogMethod(opt = {}) {
                     })
                         .catch((err) => {
                         logFinished(logger, callSignature, started, sma, logResultFn, undefined, err);
-                        return Promise.reject(err);
+                        throw err;
                     });
                 }
                 else {

package/dist/decorators/memo.decorator.js

@@ -80,7 +80,7 @@ const _Memo = (opt = {}) => (target, key, descriptor) => {
                     // Wrap as Error if it's not Error
                     cache.get(ctx).set(cacheKey, err instanceof Error ? err : new Error(err));
                 }
-                return Promise.reject(err);
+                throw err;
             });
         }
         else {

package/dist/decorators/memoFn.js

@@ -49,7 +49,7 @@ function _memoFn(fn, opt = {}) {
                     // Wrap as Error if it's not Error
                     cache.set(cacheKey, err instanceof Error ? err : new Error(err));
                 }
-                return Promise.reject(err);
+                throw err;
             });
         }
         else {

package/dist/error/try.js

@@ -27,8 +27,6 @@ function _try(fn) {
     }
 }
 exports._try = _try;
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
 /**
  * Like _try, but for Promises.
  *

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -113,8 +113,8 @@ export declare class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSc
     minProps(minProperties: number): this;
     maxProps(maxProperties: number): this;
     additionalProps(additionalProperties: boolean): this;
-    baseDBEntity(): JsonSchemaObjectBuilder<T & BaseDBEntity>;
-    savedDBEntity(): JsonSchemaObjectBuilder<T & SavedDBEntity>;
+    baseDBEntity<ID = string>(idType?: string): JsonSchemaObjectBuilder<T & BaseDBEntity<ID>>;
+    savedDBEntity<ID = string>(idType?: string): JsonSchemaObjectBuilder<T & SavedDBEntity<ID>>;
     extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2>;
 }
 export declare class JsonSchemaArrayBuilder<ITEM> extends JsonSchemaAnyBuilder<ITEM[], JsonSchemaArray<ITEM>> {

package/dist/json-schema/jsonSchemaBuilder.js

@@ -306,16 +306,16 @@ class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         Object.assign(this.schema, { additionalProperties });
         return this;
     }
-    baseDBEntity() {
+    baseDBEntity(idType = 'string') {
         Object.assign(this.schema.properties, {
-            id: { type: 'string' },
+            id: { type: idType },
             created: { type: 'number', format: 'unixTimestamp' },
             updated: { type: 'number', format: 'unixTimestamp' },
         });
         return this;
     }
-    savedDBEntity() {
-        return this.baseDBEntity().addRequired(['id', 'created', 'updated']);
+    savedDBEntity(idType = 'string') {
+        return this.baseDBEntity(idType).addRequired(['id', 'created', 'updated']);
     }
     extend(s2) {
         const builder = new JsonSchemaObjectBuilder();

package/dist/json-schema/jsonSchemas.d.ts

@@ -1,3 +1,3 @@
 import { SavedDBEntity } from '../types';
-export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<Partial<SavedDBEntity>>;
-export declare const savedDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<SavedDBEntity>;
+export declare const baseDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<Partial<SavedDBEntity<string>>>;
+export declare const savedDBEntityJsonSchema: import("./jsonSchemaBuilder").JsonSchemaObjectBuilder<SavedDBEntity<string>>;

package/dist/promise/pProps.d.ts

@@ -1,10 +1,19 @@
-import { PMapOptions } from './pMap';
 /**
  * Promise.all for Object instead of Array.
- * Supports concurrency.
+ *
+ * Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
+ *
+ * Improvements:
+ *
+ * - Exported as { pProps }, so IDE auto-completion works
+ * - Simpler: no support for Map, Mapper, Options
+ * - Included Typescript typings (no need for @types/p-props)
+ *
+ * Concurrency implementation via pMap was removed in favor of preserving async
+ * stack traces (more important!).
  */
 export declare function pProps<T>(input: {
     [K in keyof T]: T[K] | Promise<T[K]>;
-}, opt?: PMapOptions): Promise<{
+}): Promise<{
     [K in keyof T]: Awaited<T[K]>;
 }>;

package/dist/promise/pProps.js

@@ -1,26 +1,22 @@
 "use strict";
-/*
-Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
-
-Improvements:
-
-- Exported as { pProps }, so IDE auto-completion works
-- Simpler: no support for Map, Mapper, Options
-- Included Typescript typings (no need for @types/p-props)
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pProps = void 0;
-const pMap_1 = require("./pMap");
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
 /**
  * Promise.all for Object instead of Array.
- * Supports concurrency.
+ *
+ * Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
+ *
+ * Improvements:
+ *
+ * - Exported as { pProps }, so IDE auto-completion works
+ * - Simpler: no support for Map, Mapper, Options
+ * - Included Typescript typings (no need for @types/p-props)
+ *
+ * Concurrency implementation via pMap was removed in favor of preserving async
+ * stack traces (more important!).
  */
-async function pProps(input, opt) {
-    const r = {};
+async function pProps(input) {
     const keys = Object.keys(input);
-    await (0, pMap_1.pMap)(Object.values(input), (v, i) => (r[keys[i]] = v), opt);
-    return r;
+    return Object.fromEntries((await Promise.all(Object.values(input))).map((v, i) => [keys[i], v]));
 }
 exports.pProps = pProps;

package/dist/promise/pTimeout.d.ts

@@ -17,6 +17,14 @@ export interface PTimeoutOptions {
      * Can be used to thrown a custom error OR resolve a promise without throwing.
      */
     onTimeout?: () => any;
+    /**
+     * Defaults to true.
+     * If true - preserves the stack trace in case of a Timeout (usually - very useful!).
+     * It has a certain perf cost.
+     *
+     * @experimental
+     */
+    keepStackTrace?: boolean;
 }
 /**
  * Decorates a Function with a timeout.

package/dist/promise/pTimeout.js

@@ -24,7 +24,8 @@ exports.pTimeoutFn = pTimeoutFn;
  */
 async function pTimeout(promise, opt) {
     // todo: check how we can automatically infer function name (only applicable to named functions)
-    const { timeout, name, onTimeout } = opt;
+    const { timeout, name, onTimeout, keepStackTrace = true } = opt;
+    const fakeError = keepStackTrace ? new Error('TimeoutError') : undefined;
     // eslint-disable-next-line no-async-promise-executor
     return await new Promise(async (resolve, reject) => {
         // Prepare the timeout timer
@@ -34,11 +35,16 @@ async function pTimeout(promise, opt) {
                     resolve(onTimeout());
                 }
                 catch (err) {
+                    if (fakeError)
+                        err.stack = fakeError.stack; // keep original stack
                     reject(err);
                 }
                 return;
             }
-            reject(new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`));
+            const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`);
+            if (fakeError)
+                err.stack = fakeError.stack; // keep original stack
+            reject(err);
         }, timeout);
         // Execute the Function
         try {

package/dist/types.d.ts

@@ -24,13 +24,13 @@ export interface CreatedUpdated {
     created: number;
     updated: number;
 }
-export interface CreatedUpdatedId extends CreatedUpdated {
-    id: string;
+export interface CreatedUpdatedId<ID = string> extends CreatedUpdated {
+    id: ID;
 }
-export interface ObjectWithId {
-    id: string;
+export interface ObjectWithId<ID = string> {
+    id: ID;
 }
-export interface AnyObjectWithId extends AnyObject, ObjectWithId {
+export interface AnyObjectWithId<ID = string> extends AnyObject, ObjectWithId<ID> {
 }
 /**
  * Convenience type shorthand.
@@ -127,8 +127,8 @@ export declare type UnixTimestamp = number;
 /**
  * Base interface for any Entity that was saved to DB.
  */
-export interface SavedDBEntity {
-    id: string;
+export interface SavedDBEntity<ID = string> {
+    id: ID;
     /**
      * unixTimestamp of when the entity was first created (in the DB).
      */
@@ -144,9 +144,9 @@ export interface SavedDBEntity {
  * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
  * When it's known to be saved - `SavedDBEntity` interface can be used instead.
  */
-export declare type BaseDBEntity = Partial<SavedDBEntity>;
-export declare type Saved<E> = Merge<E, SavedDBEntity>;
-export declare type Unsaved<E> = Merge<E, BaseDBEntity>;
+export declare type BaseDBEntity<ID = string> = Partial<SavedDBEntity<ID>>;
+export declare type Saved<E, ID = string> = Merge<E, SavedDBEntity<ID>>;
+export declare type Unsaved<E, ID = string> = Merge<E, BaseDBEntity<ID>>;
 /**
  * Named type for JSON.parse / JSON.stringify second argument
  */

package/dist-esm/decorators/logMethod.decorator.js

@@ -53,7 +53,7 @@ export function _LogMethod(opt = {}) {
                     })
                         .catch((err) => {
                         logFinished(logger, callSignature, started, sma, logResultFn, undefined, err);
-                        return Promise.reject(err);
+                        throw err;
                     });
                 }
                 else {

package/dist-esm/decorators/memo.decorator.js

@@ -77,7 +77,7 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
                     // Wrap as Error if it's not Error
                     cache.get(ctx).set(cacheKey, err instanceof Error ? err : new Error(err));
                 }
-                return Promise.reject(err);
+                throw err;
             });
         }
         else {

package/dist-esm/decorators/memoFn.js

@@ -46,7 +46,7 @@ export function _memoFn(fn, opt = {}) {
                     // Wrap as Error if it's not Error
                     cache.set(cacheKey, err instanceof Error ? err : new Error(err));
                 }
-                return Promise.reject(err);
+                throw err;
             });
         }
         else {

package/dist-esm/error/try.js

@@ -23,8 +23,6 @@ export function _try(fn) {
         return [err, undefined];
     }
 }
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
 /**
  * Like _try, but for Promises.
  *

package/dist-esm/json-schema/jsonSchemaBuilder.js

@@ -301,16 +301,16 @@ export class JsonSchemaObjectBuilder extends JsonSchemaAnyBuilder {
         Object.assign(this.schema, { additionalProperties });
         return this;
     }
-    baseDBEntity() {
+    baseDBEntity(idType = 'string') {
         Object.assign(this.schema.properties, {
-            id: { type: 'string' },
+            id: { type: idType },
             created: { type: 'number', format: 'unixTimestamp' },
             updated: { type: 'number', format: 'unixTimestamp' },
         });
         return this;
     }
-    savedDBEntity() {
-        return this.baseDBEntity().addRequired(['id', 'created', 'updated']);
+    savedDBEntity(idType = 'string') {
+        return this.baseDBEntity(idType).addRequired(['id', 'created', 'updated']);
     }
     extend(s2) {
         const builder = new JsonSchemaObjectBuilder();

package/dist-esm/promise/pProps.js

@@ -1,22 +1,18 @@
-/*
-Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
-
-Improvements:
-
-- Exported as { pProps }, so IDE auto-completion works
-- Simpler: no support for Map, Mapper, Options
-- Included Typescript typings (no need for @types/p-props)
- */
-import { pMap } from './pMap';
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
 /**
  * Promise.all for Object instead of Array.
- * Supports concurrency.
+ *
+ * Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
+ *
+ * Improvements:
+ *
+ * - Exported as { pProps }, so IDE auto-completion works
+ * - Simpler: no support for Map, Mapper, Options
+ * - Included Typescript typings (no need for @types/p-props)
+ *
+ * Concurrency implementation via pMap was removed in favor of preserving async
+ * stack traces (more important!).
  */
-export async function pProps(input, opt) {
-    const r = {};
+export async function pProps(input) {
     const keys = Object.keys(input);
-    await pMap(Object.values(input), (v, i) => (r[keys[i]] = v), opt);
-    return r;
+    return Object.fromEntries((await Promise.all(Object.values(input))).map((v, i) => [keys[i], v]));
 }

package/dist-esm/promise/pTimeout.js

@@ -19,7 +19,8 @@ export function pTimeoutFn(fn, opt) {
  */
 export async function pTimeout(promise, opt) {
     // todo: check how we can automatically infer function name (only applicable to named functions)
-    const { timeout, name, onTimeout } = opt;
+    const { timeout, name, onTimeout, keepStackTrace = true } = opt;
+    const fakeError = keepStackTrace ? new Error('TimeoutError') : undefined;
     // eslint-disable-next-line no-async-promise-executor
     return await new Promise(async (resolve, reject) => {
         // Prepare the timeout timer
@@ -29,11 +30,16 @@ export async function pTimeout(promise, opt) {
                     resolve(onTimeout());
                 }
                 catch (err) {
+                    if (fakeError)
+                        err.stack = fakeError.stack; // keep original stack
                     reject(err);
                 }
                 return;
             }
-            reject(new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`));
+            const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`);
+            if (fakeError)
+                err.stack = fakeError.stack; // keep original stack
+            reject(err);
         }, timeout);
         // Execute the Function
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.78.0",
+  "version": "14.80.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -14,13 +14,14 @@
     "@naturalcycles/bench-lib": "^1.5.0",
     "@naturalcycles/dev-lib": "^12.0.0",
     "@naturalcycles/nodejs-lib": "^12.33.4",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.4",
     "jest": "^27.0.1",
     "patch-package": "^6.2.1",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",
-    "vuepress-plugin-typescript": "^0.3.1"
+    "vuepress-plugin-typescript": "^0.3.1",
+    "weak-napi": "^2.0.2"
   },
   "files": [
     "dist",

package/src/decorators/logMethod.decorator.ts

@@ -110,7 +110,7 @@ export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
             })
             .catch((err: any) => {
               logFinished(logger, callSignature, started, sma, logResultFn, undefined, err)
-              return Promise.reject(err)
+              throw err
             })
         } else {
           // not a Promise

package/src/decorators/memo.decorator.ts

@@ -163,7 +163,7 @@ export const _Memo =
               cache.get(ctx)!.set(cacheKey, err instanceof Error ? err : new Error(err))
             }
 
-            return Promise.reject(err)
+            throw err
           })
       } else {
         if (logMiss) {

package/src/decorators/memoFn.ts

@@ -83,7 +83,7 @@ export function _memoFn<T extends (...args: any[]) => any>(
             cache.set(cacheKey, err instanceof Error ? err : new Error(err))
           }
 
-          return Promise.reject(err)
+          throw err
         }) as any
     } else {
       if (logMiss) {

package/src/error/try.ts

@@ -27,9 +27,6 @@ export function _try<ERR = unknown, RETURN = void>(
   }
 }
 
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
-
 /**
  * Like _try, but for Promises.
  *

package/src/json-schema/jsonSchemaBuilder.ts

@@ -365,9 +365,9 @@ export class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyB
     return this
   }
 
-  baseDBEntity(): JsonSchemaObjectBuilder<T & BaseDBEntity> {
+  baseDBEntity<ID = string>(idType = 'string'): JsonSchemaObjectBuilder<T & BaseDBEntity<ID>> {
     Object.assign(this.schema.properties, {
-      id: { type: 'string' },
+      id: { type: idType },
       created: { type: 'number', format: 'unixTimestamp' },
       updated: { type: 'number', format: 'unixTimestamp' },
     })
@@ -375,8 +375,8 @@ export class JsonSchemaObjectBuilder<T extends AnyObject> extends JsonSchemaAnyB
     return this
   }
 
-  savedDBEntity(): JsonSchemaObjectBuilder<T & SavedDBEntity> {
-    return this.baseDBEntity().addRequired(['id', 'created', 'updated']) as any
+  savedDBEntity<ID = string>(idType = 'string'): JsonSchemaObjectBuilder<T & SavedDBEntity<ID>> {
+    return this.baseDBEntity(idType).addRequired(['id', 'created', 'updated']) as any
   }
 
   extend<T2 extends AnyObject>(s2: JsonSchemaObjectBuilder<T2>): JsonSchemaObjectBuilder<T & T2> {

package/src/promise/pProps.ts

@@ -1,28 +1,20 @@
-/*
-Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
-
-Improvements:
-
-- Exported as { pProps }, so IDE auto-completion works
-- Simpler: no support for Map, Mapper, Options
-- Included Typescript typings (no need for @types/p-props)
- */
-
-import { pMap, PMapOptions } from './pMap'
-
-// todo: remove when eslint starts to know about Awaited
-/* eslint-disable no-undef */
-
 /**
  * Promise.all for Object instead of Array.
- * Supports concurrency.
+ *
+ * Inspired by Bluebird Promise.props() and https://github.com/sindresorhus/p-props
+ *
+ * Improvements:
+ *
+ * - Exported as { pProps }, so IDE auto-completion works
+ * - Simpler: no support for Map, Mapper, Options
+ * - Included Typescript typings (no need for @types/p-props)
+ *
+ * Concurrency implementation via pMap was removed in favor of preserving async
+ * stack traces (more important!).
  */
-export async function pProps<T>(
-  input: { [K in keyof T]: T[K] | Promise<T[K]> },
-  opt?: PMapOptions,
-): Promise<{ [K in keyof T]: Awaited<T[K]> }> {
-  const r = {} as { [K in keyof T]: Awaited<T[K]> }
-  const keys = Object.keys(input) as (keyof T)[]
-  await pMap(Object.values(input), (v, i) => (r[keys[i]!] = v), opt)
-  return r
+export async function pProps<T>(input: { [K in keyof T]: T[K] | Promise<T[K]> }): Promise<{
+  [K in keyof T]: Awaited<T[K]>
+}> {
+  const keys = Object.keys(input)
+  return Object.fromEntries((await Promise.all(Object.values(input))).map((v, i) => [keys[i], v]))
 }

package/src/promise/pTimeout.ts

@@ -20,6 +20,15 @@ export interface PTimeoutOptions {
    * Can be used to thrown a custom error OR resolve a promise without throwing.
    */
   onTimeout?: () => any
+
+  /**
+   * Defaults to true.
+   * If true - preserves the stack trace in case of a Timeout (usually - very useful!).
+   * It has a certain perf cost.
+   *
+   * @experimental
+   */
+  keepStackTrace?: boolean
 }
 
 /**
@@ -42,7 +51,8 @@ export function pTimeoutFn<T extends AnyFunction>(fn: T, opt: PTimeoutOptions):
  */
 export async function pTimeout<T>(promise: Promise<T>, opt: PTimeoutOptions): Promise<T> {
   // todo: check how we can automatically infer function name (only applicable to named functions)
-  const { timeout, name, onTimeout } = opt
+  const { timeout, name, onTimeout, keepStackTrace = true } = opt
+  const fakeError = keepStackTrace ? new Error('TimeoutError') : undefined
 
   // eslint-disable-next-line no-async-promise-executor
   return await new Promise(async (resolve, reject) => {
@@ -51,13 +61,16 @@ export async function pTimeout<T>(promise: Promise<T>, opt: PTimeoutOptions): Pr
       if (onTimeout) {
         try {
           resolve(onTimeout())
-        } catch (err) {
+        } catch (err: any) {
+          if (fakeError) err.stack = fakeError.stack // keep original stack
           reject(err)
         }
         return
       }
 
-      reject(new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`))
+      const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`)
+      if (fakeError) err.stack = fakeError.stack // keep original stack
+      reject(err)
     }, timeout)
 
     // Execute the Function

package/src/types.ts

@@ -29,15 +29,15 @@ export interface CreatedUpdated {
   updated: number
 }
 
-export interface CreatedUpdatedId extends CreatedUpdated {
-  id: string
+export interface CreatedUpdatedId<ID = string> extends CreatedUpdated {
+  id: ID
 }
 
-export interface ObjectWithId {
-  id: string
+export interface ObjectWithId<ID = string> {
+  id: ID
 }
 
-export interface AnyObjectWithId extends AnyObject, ObjectWithId {}
+export interface AnyObjectWithId<ID = string> extends AnyObject, ObjectWithId<ID> {}
 
 /**
  * Convenience type shorthand.
@@ -169,8 +169,8 @@ export type UnixTimestamp = number
 /**
  * Base interface for any Entity that was saved to DB.
  */
-export interface SavedDBEntity {
-  id: string
+export interface SavedDBEntity<ID = string> {
+  id: ID
 
   /**
    * unixTimestamp of when the entity was first created (in the DB).
@@ -189,10 +189,10 @@ export interface SavedDBEntity {
  * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
  * When it's known to be saved - `SavedDBEntity` interface can be used instead.
  */
-export type BaseDBEntity = Partial<SavedDBEntity>
+export type BaseDBEntity<ID = string> = Partial<SavedDBEntity<ID>>
 
-export type Saved<E> = Merge<E, SavedDBEntity>
-export type Unsaved<E> = Merge<E, BaseDBEntity>
+export type Saved<E, ID = string> = Merge<E, SavedDBEntity<ID>>
+export type Unsaved<E, ID = string> = Merge<E, BaseDBEntity<ID>>
 
 /**
  * Named type for JSON.parse / JSON.stringify second argument