@naturalcycles/js-lib 14.246.1 → 14.246.2

package/dist/promise/pMap.js

@@ -88,7 +88,7 @@ async function pMap(iterable, mapper, opt = {}) {
                 ret[i] = value;
                 resolvingCount--;
                 next();
-            }, err => {
+            }, (err) => {
                 if (errorMode === __1.ErrorMode.THROW_IMMEDIATELY) {
                     isSettled = true;
                     reject(err);

package/dist/promise/pQueue.js

@@ -66,7 +66,7 @@ class PQueue {
                 if (!resolveOnStart)
                     fn.defer.resolve(result);
             })
-                .catch(err => {
+                .catch((err) => {
                 this.cfg.logger.error(err);
                 if (resolveOnStart)
                     return;

package/dist/promise/pTimeout.d.ts

@@ -1,6 +1,6 @@
 import type { ErrorData } from '../error/error.model';
 import { TimeoutError } from '../error/error.util';
-import type { AnyAsyncFunction, NumberOfMilliseconds } from '../types';
+import { AnyAsyncFunction, NumberOfMilliseconds } from '../types';
 export interface PTimeoutOptions {
     /**
      * Timeout in milliseconds.

package/dist/promise/pTimeout.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pTimeoutFn = pTimeoutFn;
 exports.pTimeout = pTimeout;
 const error_util_1 = require("../error/error.util");
+const types_1 = require("../types");
 /**
  * Decorates a Function with a timeout.
  * Returns a decorated Function.
@@ -44,6 +45,7 @@ async function pTimeout(fn, opt) {
                     resolve(onTimeout(err));
                 }
                 catch (err) {
+                    (0, types_1._typeCast)(err);
                     // keep original stack
                     err.stack = fakeError.stack.replace('Error: TimeoutError', err.name + ': ' + err.message);
                     reject((0, error_util_1._errorDataAppend)(err, opt.errorData));

package/dist/semver.d.ts

@@ -34,13 +34,13 @@ export declare class Semver {
      * returns 0 if they are equal
      * returns -1 if this < other
      */
-    cmp(other: SemverInput): -1 | 0 | 1;
+    compare(other: SemverInput): -1 | 0 | 1;
     toJSON: () => string;
     toString(): string;
 }
 declare class SemverFactory {
-    of(input: SemverInput): Semver;
-    parseOrNull(input: SemverInputNullable): Semver | null;
+    fromInput(input: SemverInput): Semver;
+    fromInputOrUndefined(input: SemverInputNullable): Semver | undefined;
     /**
      * Returns the highest (max) Semver from the array, or undefined if the array is empty.
      */

package/dist/semver.js

@@ -24,11 +24,11 @@ const is_util_1 = require("./is.util");
 class Semver {
     constructor(tokens) {
         this.tokens = tokens;
-        this.isAfter = (other) => this.cmp(other) > 0;
-        this.isSameOrAfter = (other) => this.cmp(other) >= 0;
-        this.isBefore = (other) => this.cmp(other) < 0;
-        this.isSameOrBefore = (other) => this.cmp(other) <= 0;
-        this.isSame = (other) => this.cmp(other) === 0;
+        this.isAfter = (other) => this.compare(other) > 0;
+        this.isSameOrAfter = (other) => this.compare(other) >= 0;
+        this.isBefore = (other) => this.compare(other) < 0;
+        this.isSameOrBefore = (other) => this.compare(other) <= 0;
+        this.isSame = (other) => this.compare(other) === 0;
         this.toJSON = () => this.toString();
     }
     get major() {
@@ -45,8 +45,8 @@ class Semver {
      * returns 0 if they are equal
      * returns -1 if this < other
      */
-    cmp(other) {
-        const { tokens } = exports.semver2.of(other);
+    compare(other) {
+        const { tokens } = exports.semver2.fromInput(other);
         for (let i = 0; i < 3; i++) {
             if (this.tokens[i] < tokens[i])
                 return -1;
@@ -61,16 +61,16 @@ class Semver {
 }
 exports.Semver = Semver;
 class SemverFactory {
-    of(input) {
-        const s = this.parseOrNull(input);
-        (0, assert_1._assert)(s !== null, `Cannot parse "${input}" into Semver`, {
+    fromInput(input) {
+        const s = this.fromInputOrUndefined(input);
+        (0, assert_1._assert)(s, `Cannot parse "${input}" into Semver`, {
             input,
         });
         return s;
     }
-    parseOrNull(input) {
+    fromInputOrUndefined(input) {
         if (!input)
-            return null;
+            return;
         if (input instanceof Semver)
             return input;
         const t = input.split('.');
@@ -89,7 +89,9 @@ class SemverFactory {
     max(items) {
         const items2 = items.filter(is_util_1._isTruthy);
         (0, assert_1._assert)(items2.length, 'semver.max called on empty array');
-        return items2.map(i => this.of(i)).reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
+        return items2
+            .map(i => this.fromInput(i))
+            .reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
     /**
      * Returns the lowest (min) Semver from the array, or undefined if the array is empty.
@@ -105,7 +107,7 @@ class SemverFactory {
         const items2 = items.filter(is_util_1._isTruthy);
         (0, assert_1._assert)(items2.length, 'semver.min called on empty array');
         return items2
-            .map(i => this.of(i))
+            .map(i => this.fromInput(i))
             .reduce((min, item) => (min.isSameOrBefore(item) ? min : item));
     }
     /**
@@ -113,11 +115,11 @@ class SemverFactory {
      */
     sort(items, dir = 'asc', mutate = false) {
         const mod = dir === 'desc' ? -1 : 1;
-        return (mutate ? items : [...items]).sort((a, b) => a.cmp(b) * mod);
+        return (mutate ? items : [...items]).sort((a, b) => a.compare(b) * mod);
     }
 }
 const semverFactory = new SemverFactory();
-exports.semver2 = semverFactory.of.bind(semverFactory);
+exports.semver2 = semverFactory.fromInput.bind(semverFactory);
 // The line below is the blackest of black magic I have ever written in 2024.
 // And probably 2023 as well.
 Object.setPrototypeOf(exports.semver2, semverFactory);

package/dist/string/pupa.js

@@ -20,7 +20,6 @@ class MissingValueError extends Error {
         super(`Missing a value for ${key ? `the placeholder: ${key}` : 'a placeholder'}`);
         this.key = key;
         this.name = 'MissingValueError';
-        this.key = key;
     }
 }
 exports.MissingValueError = MissingValueError;

package/dist-esm/promise/pMap.js

@@ -85,7 +85,7 @@ export async function pMap(iterable, mapper, opt = {}) {
                 ret[i] = value;
                 resolvingCount--;
                 next();
-            }, err => {
+            }, (err) => {
                 if (errorMode === ErrorMode.THROW_IMMEDIATELY) {
                     isSettled = true;
                     reject(err);

package/dist-esm/promise/pQueue.js

@@ -63,7 +63,7 @@ export class PQueue {
                 if (!resolveOnStart)
                     fn.defer.resolve(result);
             })
-                .catch(err => {
+                .catch((err) => {
                 this.cfg.logger.error(err);
                 if (resolveOnStart)
                     return;

package/dist-esm/promise/pTimeout.js

@@ -1,4 +1,5 @@
 import { _errorDataAppend, TimeoutError } from '../error/error.util';
+import { _typeCast } from '../types';
 /**
  * Decorates a Function with a timeout.
  * Returns a decorated Function.
@@ -40,6 +41,7 @@ export async function pTimeout(fn, opt) {
                     resolve(onTimeout(err));
                 }
                 catch (err) {
+                    _typeCast(err);
                     // keep original stack
                     err.stack = fakeError.stack.replace('Error: TimeoutError', err.name + ': ' + err.message);
                     reject(_errorDataAppend(err, opt.errorData));

package/dist-esm/semver.js

@@ -20,11 +20,11 @@ import { _isTruthy } from './is.util';
 export class Semver {
     constructor(tokens) {
         this.tokens = tokens;
-        this.isAfter = (other) => this.cmp(other) > 0;
-        this.isSameOrAfter = (other) => this.cmp(other) >= 0;
-        this.isBefore = (other) => this.cmp(other) < 0;
-        this.isSameOrBefore = (other) => this.cmp(other) <= 0;
-        this.isSame = (other) => this.cmp(other) === 0;
+        this.isAfter = (other) => this.compare(other) > 0;
+        this.isSameOrAfter = (other) => this.compare(other) >= 0;
+        this.isBefore = (other) => this.compare(other) < 0;
+        this.isSameOrBefore = (other) => this.compare(other) <= 0;
+        this.isSame = (other) => this.compare(other) === 0;
         this.toJSON = () => this.toString();
     }
     get major() {
@@ -41,8 +41,8 @@ export class Semver {
      * returns 0 if they are equal
      * returns -1 if this < other
      */
-    cmp(other) {
-        const { tokens } = semver2.of(other);
+    compare(other) {
+        const { tokens } = semver2.fromInput(other);
         for (let i = 0; i < 3; i++) {
             if (this.tokens[i] < tokens[i])
                 return -1;
@@ -56,16 +56,16 @@ export class Semver {
     }
 }
 class SemverFactory {
-    of(input) {
-        const s = this.parseOrNull(input);
-        _assert(s !== null, `Cannot parse "${input}" into Semver`, {
+    fromInput(input) {
+        const s = this.fromInputOrUndefined(input);
+        _assert(s, `Cannot parse "${input}" into Semver`, {
             input,
         });
         return s;
     }
-    parseOrNull(input) {
+    fromInputOrUndefined(input) {
         if (!input)
-            return null;
+            return;
         if (input instanceof Semver)
             return input;
         const t = input.split('.');
@@ -84,7 +84,9 @@ class SemverFactory {
     max(items) {
         const items2 = items.filter(_isTruthy);
         _assert(items2.length, 'semver.max called on empty array');
-        return items2.map(i => this.of(i)).reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
+        return items2
+            .map(i => this.fromInput(i))
+            .reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
     /**
      * Returns the lowest (min) Semver from the array, or undefined if the array is empty.
@@ -100,7 +102,7 @@ class SemverFactory {
         const items2 = items.filter(_isTruthy);
         _assert(items2.length, 'semver.min called on empty array');
         return items2
-            .map(i => this.of(i))
+            .map(i => this.fromInput(i))
             .reduce((min, item) => (min.isSameOrBefore(item) ? min : item));
     }
     /**
@@ -108,11 +110,11 @@ class SemverFactory {
      */
     sort(items, dir = 'asc', mutate = false) {
         const mod = dir === 'desc' ? -1 : 1;
-        return (mutate ? items : [...items]).sort((a, b) => a.cmp(b) * mod);
+        return (mutate ? items : [...items]).sort((a, b) => a.compare(b) * mod);
     }
 }
 const semverFactory = new SemverFactory();
-export const semver2 = semverFactory.of.bind(semverFactory);
+export const semver2 = semverFactory.fromInput.bind(semverFactory);
 // The line below is the blackest of black magic I have ever written in 2024.
 // And probably 2023 as well.
 Object.setPrototypeOf(semver2, semverFactory);

package/dist-esm/string/pupa.js

@@ -16,7 +16,6 @@ export class MissingValueError extends Error {
         super(`Missing a value for ${key ? `the placeholder: ${key}` : 'a placeholder'}`);
         this.key = key;
         this.name = 'MissingValueError';
-        this.key = key;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.246.1",
+  "version": "14.246.2",
   "scripts": {
     "prepare": "husky",
     "build-prod": "build-prod-esm-cjs",
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^3.0.0",
-    "@naturalcycles/dev-lib": "^13.0.1",
+    "@naturalcycles/dev-lib": "^14.0.0",
     "@naturalcycles/nodejs-lib": "^13.0.1",
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/crypto-js": "^4.1.1",

package/src/promise/pMap.ts

@@ -127,7 +127,7 @@ export async function pMap<IN, OUT>(
             resolvingCount--
             next()
           },
-          err => {
+          (err: Error) => {
             if (errorMode === ErrorMode.THROW_IMMEDIATELY) {
               isSettled = true
               reject(err)

package/src/promise/pQueue.ts

@@ -124,7 +124,7 @@ export class PQueue {
         .then(result => {
           if (!resolveOnStart) fn.defer.resolve(result)
         })
-        .catch(err => {
+        .catch((err: Error) => {
           this.cfg.logger.error(err)
           if (resolveOnStart) return
 

package/src/promise/pTimeout.ts

@@ -1,6 +1,6 @@
 import type { ErrorData } from '../error/error.model'
 import { _errorDataAppend, TimeoutError } from '../error/error.util'
-import type { AnyAsyncFunction, NumberOfMilliseconds } from '../types'
+import { _typeCast, AnyAsyncFunction, NumberOfMilliseconds } from '../types'
 
 export interface PTimeoutOptions {
   /**
@@ -84,6 +84,7 @@ export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions)
         try {
           resolve(onTimeout(err))
         } catch (err: any) {
+          _typeCast<Error>(err)
           // keep original stack
           err.stack = fakeError.stack!.replace('Error: TimeoutError', err.name + ': ' + err.message)
           reject(_errorDataAppend(err, opt.errorData))
@@ -98,7 +99,7 @@ export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions)
     try {
       resolve(await fn())
     } catch (err) {
-      reject(err)
+      reject(err as Error)
     } finally {
       clearTimeout(timer)
     }

package/src/semver.ts

@@ -36,19 +36,19 @@ export class Semver {
     return this.tokens[2]
   }
 
-  isAfter = (other: SemverInput): boolean => this.cmp(other) > 0
-  isSameOrAfter = (other: SemverInput): boolean => this.cmp(other) >= 0
-  isBefore = (other: SemverInput): boolean => this.cmp(other) < 0
-  isSameOrBefore = (other: SemverInput): boolean => this.cmp(other) <= 0
-  isSame = (other: SemverInput): boolean => this.cmp(other) === 0
+  isAfter = (other: SemverInput): boolean => this.compare(other) > 0
+  isSameOrAfter = (other: SemverInput): boolean => this.compare(other) >= 0
+  isBefore = (other: SemverInput): boolean => this.compare(other) < 0
+  isSameOrBefore = (other: SemverInput): boolean => this.compare(other) <= 0
+  isSame = (other: SemverInput): boolean => this.compare(other) === 0
 
   /**
    * Returns 1 if this > other
    * returns 0 if they are equal
    * returns -1 if this < other
    */
-  cmp(other: SemverInput): -1 | 0 | 1 {
-    const { tokens } = semver2.of(other)
+  compare(other: SemverInput): -1 | 0 | 1 {
+    const { tokens } = semver2.fromInput(other)
     for (let i = 0; i < 3; i++) {
       if (this.tokens[i]! < tokens[i]!) return -1
       if (this.tokens[i]! > tokens[i]!) return 1
@@ -64,18 +64,18 @@ export class Semver {
 }
 
 class SemverFactory {
-  of(input: SemverInput): Semver {
-    const s = this.parseOrNull(input)
+  fromInput(input: SemverInput): Semver {
+    const s = this.fromInputOrUndefined(input)
 
-    _assert(s !== null, `Cannot parse "${input}" into Semver`, {
+    _assert(s, `Cannot parse "${input}" into Semver`, {
       input,
     })
 
     return s
   }
 
-  parseOrNull(input: SemverInputNullable): Semver | null {
-    if (!input) return null
+  fromInputOrUndefined(input: SemverInputNullable): Semver | undefined {
+    if (!input) return
     if (input instanceof Semver) return input
 
     const t = input.split('.')
@@ -96,7 +96,9 @@ class SemverFactory {
   max(items: SemverInputNullable[]): Semver {
     const items2 = items.filter(_isTruthy)
     _assert(items2.length, 'semver.max called on empty array')
-    return items2.map(i => this.of(i)).reduce((max, item) => (max.isSameOrAfter(item) ? max : item))
+    return items2
+      .map(i => this.fromInput(i))
+      .reduce((max, item) => (max.isSameOrAfter(item) ? max : item))
   }
 
   /**
@@ -114,7 +116,7 @@ class SemverFactory {
     const items2 = items.filter(_isTruthy)
     _assert(items2.length, 'semver.min called on empty array')
     return items2
-      .map(i => this.of(i))
+      .map(i => this.fromInput(i))
       .reduce((min, item) => (min.isSameOrBefore(item) ? min : item))
   }
 
@@ -123,7 +125,7 @@ class SemverFactory {
    */
   sort(items: Semver[], dir: SortDirection = 'asc', mutate = false): Semver[] {
     const mod = dir === 'desc' ? -1 : 1
-    return (mutate ? items : [...items]).sort((a, b) => a.cmp(b) * mod)
+    return (mutate ? items : [...items]).sort((a, b) => a.compare(b) * mod)
   }
 }
 
@@ -133,7 +135,7 @@ interface SemverFn extends SemverFactory {
 
 const semverFactory = new SemverFactory()
 
-export const semver2 = semverFactory.of.bind(semverFactory) as SemverFn
+export const semver2 = semverFactory.fromInput.bind(semverFactory) as SemverFn
 
 // The line below is the blackest of black magic I have ever written in 2024.
 // And probably 2023 as well.

package/src/string/pupa.ts

@@ -18,7 +18,6 @@ export class MissingValueError extends Error {
   constructor(public key: any) {
     super(`Missing a value for ${key ? `the placeholder: ${key}` : 'a placeholder'}`)
     this.name = 'MissingValueError'
-    this.key = key
   }
 }