@naturalcycles/js-lib 14.116.0 → 14.117.1

package/dist/array/array.util.js

@@ -160,24 +160,24 @@ function _findLast(items, predicate) {
 exports._findLast = _findLast;
 function _takeWhile(items, predicate) {
     let proceed = true;
-    return items.filter((v, index) => (proceed = proceed && predicate(v, index)));
+    return items.filter((v, index) => (proceed &&= predicate(v, index)));
 }
 exports._takeWhile = _takeWhile;
 function _takeRightWhile(items, predicate) {
     let proceed = true;
-    return [...items].reverse().filter((v, index) => (proceed = proceed && predicate(v, index)));
+    return [...items].reverse().filter((v, index) => (proceed &&= predicate(v, index)));
 }
 exports._takeRightWhile = _takeRightWhile;
 function _dropWhile(items, predicate) {
     let proceed = false;
-    return items.filter((v, index) => (proceed = proceed || !predicate(v, index)));
+    return items.filter((v, index) => (proceed ||= !predicate(v, index)));
 }
 exports._dropWhile = _dropWhile;
 function _dropRightWhile(items, predicate) {
     let proceed = false;
     return [...items]
         .reverse()
-        .filter((v, index) => (proceed = proceed || !predicate(v, index)))
+        .filter((v, index) => (proceed ||= !predicate(v, index)))
         .reverse();
 }
 exports._dropRightWhile = _dropRightWhile;

package/dist/datetime/dateInterval.js

@@ -49,6 +49,7 @@ class DateInterval {
      */
     includes(d, incl = '[]') {
         d = localDate_1.LocalDate.of(d);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']');
     }
     intersects(int, inclusive = true) {

package/dist/datetime/localDate.js

@@ -112,6 +112,7 @@ class LocalDate {
         const $min = LocalDate.of(min);
         const $max = LocalDate.of(max).startOf(stepUnit);
         let current = $min.startOf(stepUnit);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (current.isAfter($min, incl[0] === '[')) {
             // ok
         }
@@ -170,6 +171,7 @@ class LocalDate {
     }
     isBetween(min, max, incl = '[)') {
         let r = this.cmp(min);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (r < 0 || (r === 0 && incl[0] === '('))
             return false;
         r = this.cmp(max);

package/dist/datetime/localTime.js

@@ -347,6 +347,7 @@ class LocalTime {
     }
     isBetween(min, max, incl = '[)') {
         let r = this.cmp(min);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (r < 0 || (r === 0 && incl[0] === '('))
             return false;
         r = this.cmp(max);
@@ -525,9 +526,7 @@ function getWeekYear(date) {
     else if (date.getTime() >= startOfThisYear.getTime()) {
         return year;
     }
-    else {
-        return year - 1;
-    }
+    return year - 1;
 }
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/startOfWeek/index.ts
 function startOfWeek(date, mutate = false) {

package/dist/datetime/timeInterval.js

@@ -59,6 +59,7 @@ class TimeInterval {
     }
     includes(d, incl = '[)') {
         d = localTime_1.LocalTime.parseToUnixTimestamp(d);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (d < this.$start || (d === this.$start && incl[0] === '('))
             return false;
         if (d > this.$end || (d === this.$end && incl[1] === ')'))

package/dist/decorators/asyncMemo.decorator.d.ts

@@ -6,11 +6,11 @@ export interface AsyncMemoOptions {
      * Function that creates an instance of `MemoCache`.
      * e.g LRUMemoCache from `@naturalcycles/nodejs-lib`.
      */
-    cacheFactory?: () => AsyncMemoCache;
+    cacheFactory?(): AsyncMemoCache;
     /**
      * Provide a custom implementation of CacheKey function.
      */
-    cacheKeyFn?: (args: any[]) => any;
+    cacheKeyFn?(args: any[]): any;
     /**
      * Default true.
      *

package/dist/decorators/createPromiseDecorator.d.ts

@@ -4,15 +4,15 @@ export interface PromiseDecoratorCfg<RES = any, PARAMS = any> {
      * Called BEFORE the original function.
      * If Promise is returned - it will be awaited.
      */
-    beforeFn?: (r: PromiseDecoratorResp<PARAMS>) => void | Promise<void>;
+    beforeFn?(r: PromiseDecoratorResp<PARAMS>): void | Promise<void>;
     /**
      * Called just AFTER the original function.
      * The output of this hook will be passed further,
      * so, pay attention to pass through (or modify) the result.
      */
-    thenFn?: (r: PromiseDecoratorResp<PARAMS> & {
+    thenFn?(r: PromiseDecoratorResp<PARAMS> & {
         res: RES;
-    }) => RES;
+    }): RES;
     /**
      * Called on Promise.reject.
      * If `catchFn` is not present - will re-throw the error,
@@ -20,14 +20,14 @@ export interface PromiseDecoratorCfg<RES = any, PARAMS = any> {
      * If `catchFn` is present - it's responsible for handling or re-throwing the error.
      * Whatever `catchFn` returns - passed to the original output.
      */
-    catchFn?: (r: PromiseDecoratorResp<PARAMS> & {
+    catchFn?(r: PromiseDecoratorResp<PARAMS> & {
         err: any;
-    }) => RES;
+    }): RES;
     /**
      * Fires AFTER thenFn / catchFn, like a usual Promise.finally().
      * Doesn't have access to neither res nor err (same as Promise.finally).
      */
-    finallyFn?: (r: PromiseDecoratorResp<PARAMS>) => any;
+    finallyFn?(r: PromiseDecoratorResp<PARAMS>): any;
 }
 export interface PromiseDecoratorResp<PARAMS> {
     decoratorParams: PARAMS;

package/dist/decorators/logMethod.decorator.js

@@ -59,11 +59,9 @@ function _LogMethod(opt = {}) {
                         throw err;
                     });
                 }
-                else {
-                    // not a Promise
-                    logFinished(logger, callSignature, started, sma, logResultFn, res);
-                    return res;
-                }
+                // not a Promise
+                logFinished(logger, callSignature, started, sma, logResultFn, res);
+                return res;
             }
             catch (err) {
                 logFinished(logger, callSignature, started, sma, logResultFn, undefined, err);
@@ -74,6 +72,7 @@ function _LogMethod(opt = {}) {
     };
 }
 exports._LogMethod = _LogMethod;
+// eslint-disable-next-line max-params
 function logFinished(logger, callSignature, started, sma, logResultFn, res, err) {
     const millis = Date.now() - started;
     const t = ['<<', callSignature, 'took', (0, time_util_1._ms)(millis)];

package/dist/decorators/memo.decorator.d.ts

@@ -6,11 +6,11 @@ export interface MemoOptions {
      * Function that creates an instance of `MemoCache`.
      * e.g LRUMemoCache from `@naturalcycles/nodejs-lib`
      */
-    cacheFactory?: () => MemoCache;
+    cacheFactory?(): MemoCache;
     /**
      * Provide a custom implementation of CacheKey function.
      */
-    cacheKeyFn?: (args: any[]) => any;
+    cacheKeyFn?(args: any[]): any;
     /**
      * Defaults to true.
      * Set to false to skip caching errors.

package/dist/error/tryCatch.d.ts

@@ -5,7 +5,7 @@ export interface TryCatchOptions {
      * The value returned from the function will be returned from the wrapped method (!).
      * onError function may be asynchronous.
      */
-    onError?: (err: Error) => any;
+    onError?(err: Error): any;
     /**
      * @default false
      */

package/dist/object/deepEquals.js

@@ -54,6 +54,7 @@ function _deepEquals(a, b) {
         }
         return true;
     }
+    // eslint-disable-next-line no-self-compare
     return a !== a && b !== b;
 }
 exports._deepEquals = _deepEquals;

package/dist/object/object.util.js

@@ -15,14 +15,12 @@ function _pick(obj, props, mutate = false) {
             return r;
         }, obj);
     }
-    else {
-        // Start as empty object, pick/add needed properties
-        return props.reduce((r, prop) => {
-            if (prop in obj)
-                r[prop] = obj[prop];
-            return r;
-        }, {});
-    }
+    // Start as empty object, pick/add needed properties
+    return props.reduce((r, prop) => {
+        if (prop in obj)
+            r[prop] = obj[prop];
+        return r;
+    }, {});
 }
 exports._pick = _pick;
 /**
@@ -259,7 +257,7 @@ function _unset(obj, prop) {
     }
     const segs = prop.split('.');
     let last = segs.pop();
-    while (segs.length && segs[segs.length - 1].slice(-1) === '\\') {
+    while (segs.length && segs[segs.length - 1].endsWith('\\')) {
         last = segs.pop().slice(0, -1) + '.' + last;
     }
     while (segs.length && (0, is_util_1._isObject)(obj)) {
@@ -329,7 +327,7 @@ function _set(obj, path, value) {
             a[c]
         : // No: create the key. Is the next key a potential array-index?
             (a[c] =
-                // @ts-ignore
+                // @ts-expect-error
                 // eslint-disable-next-line
                 Math.abs(path[i + 1]) >> 0 === +path[i + 1]
                     ? [] // Yes: assign a new array object

package/dist/promise/pRetry.d.ts

@@ -35,7 +35,7 @@ export interface PRetryOptions {
      *
      * @default () => true
      */
-    predicate?: (err: Error, attempt: number, maxAttempts: number) => boolean;
+    predicate?(err: Error, attempt: number, maxAttempts: number): boolean;
     /**
      * Log the first attempt (which is not a "retry" yet).
      *

package/dist/promise/pTimeout.d.ts

@@ -16,8 +16,11 @@ export interface PTimeoutOptions {
     /**
      * If provided - will be called INSTEAD of throwing an error.
      * Can be used to thrown a custom error OR resolve a promise without throwing.
+     *
+     * err (which is TimeoutError) is passed as an argument for convenience, so it can
+     * be logged or such. You don't have to consume it in any way though.
      */
-    onTimeout?: () => any;
+    onTimeout?(err: TimeoutError): any;
     /**
      * Defaults to true.
      * If true - preserves the stack trace in case of a Timeout (usually - very useful!).

package/dist/promise/pTimeout.js

@@ -26,16 +26,18 @@ exports.pTimeoutFn = pTimeoutFn;
  * If the Function rejects - passes this rejection further.
  */
 async function pTimeout(fn, opt) {
-    // todo: check how we can automatically infer function name (only applicable to named functions)
-    const { timeout, name, onTimeout, keepStackTrace = true } = opt;
+    const { timeout, name = fn.name || 'pTimeout function', 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
         const timer = setTimeout(() => {
+            const err = new TimeoutError(`"${name}" timed out after ${timeout} ms`, opt.errorData);
+            if (fakeError)
+                err.stack = fakeError.stack; // keep original stack
             if (onTimeout) {
                 try {
-                    resolve(onTimeout());
+                    resolve(onTimeout(err));
                 }
                 catch (err) {
                     if (fakeError)
@@ -48,9 +50,6 @@ async function pTimeout(fn, opt) {
                 }
                 return;
             }
-            const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`, opt.errorData);
-            if (fakeError)
-                err.stack = fakeError.stack; // keep original stack
             reject(err);
         }, timeout);
         // Execute the Function

package/dist/string/pupa.d.ts

@@ -11,10 +11,10 @@ export interface PupaOptions {
     /**
      * Performs arbitrary operation for each interpolation. If the returned value was `undefined`, it behaves differently depending on the `ignoreMissing` option. Otherwise, the returned value will be interpolated into a string (and escaped when double-braced) and embedded into the template.
      */
-    transform?: (data: {
+    transform?(data: {
         value: any;
         key: string;
-    }) => unknown;
+    }): unknown;
 }
 /**
  * API: https://github.com/sindresorhus/pupa

package/dist/string/readingTime.d.ts

@@ -4,7 +4,7 @@ export interface ReadingTimeOptions {
      * A function that returns a boolean value depending on if a character is considered as a word bound.
      * Default: spaces, new lines and tabs
      */
-    wordBound?: (char: string) => boolean;
+    wordBound?(char: string): boolean;
     /**
      * Default 200
      */

package/dist/string/safeJsonStringify.js

@@ -21,13 +21,11 @@ exports._safeJsonStringify = _safeJsonStringify;
 function serializer(replacer, cycleReplacer) {
     const stack = [];
     const keys = [];
-    if (cycleReplacer == null) {
-        cycleReplacer = function (key, value) {
-            if (stack[0] === value)
-                return '[Circular ~]';
-            return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';
-        };
-    }
+    cycleReplacer ??= function (key, value) {
+        if (stack[0] === value)
+            return '[Circular ~]';
+        return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';
+    };
     return function (key, value) {
         if (stack.length > 0) {
             const thisPos = stack.indexOf(this);

package/dist/string/url.util.js

@@ -17,7 +17,7 @@ exports._parseQueryString = void 0;
 function _parseQueryString(search) {
     const qs = {};
     search
-        .slice(search[0] === '?' ? 1 : 0)
+        .slice(search.startsWith('?') ? 1 : 0)
         .split('&')
         .forEach(p => {
         const [k, v] = p.split('=');

package/dist-esm/array/array.util.js

@@ -148,21 +148,21 @@ export function _findLast(items, predicate) {
 }
 export function _takeWhile(items, predicate) {
     let proceed = true;
-    return items.filter((v, index) => (proceed = proceed && predicate(v, index)));
+    return items.filter((v, index) => (proceed && (proceed = predicate(v, index))));
 }
 export function _takeRightWhile(items, predicate) {
     let proceed = true;
-    return [...items].reverse().filter((v, index) => (proceed = proceed && predicate(v, index)));
+    return [...items].reverse().filter((v, index) => (proceed && (proceed = predicate(v, index))));
 }
 export function _dropWhile(items, predicate) {
     let proceed = false;
-    return items.filter((v, index) => (proceed = proceed || !predicate(v, index)));
+    return items.filter((v, index) => (proceed || (proceed = !predicate(v, index))));
 }
 export function _dropRightWhile(items, predicate) {
     let proceed = false;
     return [...items]
         .reverse()
-        .filter((v, index) => (proceed = proceed || !predicate(v, index)))
+        .filter((v, index) => (proceed || (proceed = !predicate(v, index))))
         .reverse();
 }
 export function _countBy(items, mapper) {

package/dist-esm/datetime/dateInterval.js

@@ -46,6 +46,7 @@ export class DateInterval {
      */
     includes(d, incl = '[]') {
         d = LocalDate.of(d);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']');
     }
     intersects(int, inclusive = true) {

package/dist-esm/datetime/localDate.js

@@ -109,6 +109,7 @@ export class LocalDate {
         const $min = LocalDate.of(min);
         const $max = LocalDate.of(max).startOf(stepUnit);
         let current = $min.startOf(stepUnit);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (current.isAfter($min, incl[0] === '[')) {
             // ok
         }
@@ -167,6 +168,7 @@ export class LocalDate {
     }
     isBetween(min, max, incl = '[)') {
         let r = this.cmp(min);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (r < 0 || (r === 0 && incl[0] === '('))
             return false;
         r = this.cmp(max);

package/dist-esm/datetime/localTime.js

@@ -345,6 +345,7 @@ export class LocalTime {
     }
     isBetween(min, max, incl = '[)') {
         let r = this.cmp(min);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (r < 0 || (r === 0 && incl[0] === '('))
             return false;
         r = this.cmp(max);
@@ -521,9 +522,7 @@ function getWeekYear(date) {
     else if (date.getTime() >= startOfThisYear.getTime()) {
         return year;
     }
-    else {
-        return year - 1;
-    }
+    return year - 1;
 }
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/startOfWeek/index.ts
 function startOfWeek(date, mutate = false) {

package/dist-esm/datetime/timeInterval.js

@@ -56,6 +56,7 @@ export class TimeInterval {
     }
     includes(d, incl = '[)') {
         d = LocalTime.parseToUnixTimestamp(d);
+        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (d < this.$start || (d === this.$start && incl[0] === '('))
             return false;
         if (d > this.$end || (d === this.$end && incl[1] === ')'))

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

@@ -56,11 +56,9 @@ export function _LogMethod(opt = {}) {
                         throw err;
                     });
                 }
-                else {
-                    // not a Promise
-                    logFinished(logger, callSignature, started, sma, logResultFn, res);
-                    return res;
-                }
+                // not a Promise
+                logFinished(logger, callSignature, started, sma, logResultFn, res);
+                return res;
             }
             catch (err) {
                 logFinished(logger, callSignature, started, sma, logResultFn, undefined, err);
@@ -70,6 +68,7 @@ export function _LogMethod(opt = {}) {
         return descriptor;
     };
 }
+// eslint-disable-next-line max-params
 function logFinished(logger, callSignature, started, sma, logResultFn, res, err) {
     const millis = Date.now() - started;
     const t = ['<<', callSignature, 'took', _ms(millis)];

package/dist-esm/object/deepEquals.js

@@ -51,5 +51,6 @@ export function _deepEquals(a, b) {
         }
         return true;
     }
+    // eslint-disable-next-line no-self-compare
     return a !== a && b !== b;
 }

package/dist-esm/object/object.util.js

@@ -12,14 +12,12 @@ export function _pick(obj, props, mutate = false) {
             return r;
         }, obj);
     }
-    else {
-        // Start as empty object, pick/add needed properties
-        return props.reduce((r, prop) => {
-            if (prop in obj)
-                r[prop] = obj[prop];
-            return r;
-        }, {});
-    }
+    // Start as empty object, pick/add needed properties
+    return props.reduce((r, prop) => {
+        if (prop in obj)
+            r[prop] = obj[prop];
+        return r;
+    }, {});
 }
 /**
  * Returns clone of `obj` with `props` omitted.
@@ -239,7 +237,7 @@ export function _unset(obj, prop) {
     }
     const segs = prop.split('.');
     let last = segs.pop();
-    while (segs.length && segs[segs.length - 1].slice(-1) === '\\') {
+    while (segs.length && segs[segs.length - 1].endsWith('\\')) {
         last = segs.pop().slice(0, -1) + '.' + last;
     }
     while (segs.length && _isObject(obj)) {
@@ -305,7 +303,7 @@ export function _set(obj, path, value) {
             a[c]
         : // No: create the key. Is the next key a potential array-index?
             (a[c] =
-                // @ts-ignore
+                // @ts-expect-error
                 // eslint-disable-next-line
                 Math.abs(path[i + 1]) >> 0 === +path[i + 1]
                     ? [] // Yes: assign a new array object

package/dist-esm/promise/pTimeout.js

@@ -21,16 +21,18 @@ export function pTimeoutFn(fn, opt) {
  * If the Function rejects - passes this rejection further.
  */
 export async function pTimeout(fn, opt) {
-    // todo: check how we can automatically infer function name (only applicable to named functions)
-    const { timeout, name, onTimeout, keepStackTrace = true } = opt;
+    const { timeout, name = fn.name || 'pTimeout function', 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
         const timer = setTimeout(() => {
+            const err = new TimeoutError(`"${name}" timed out after ${timeout} ms`, opt.errorData);
+            if (fakeError)
+                err.stack = fakeError.stack; // keep original stack
             if (onTimeout) {
                 try {
-                    resolve(onTimeout());
+                    resolve(onTimeout(err));
                 }
                 catch (err) {
                     if (fakeError)
@@ -40,9 +42,6 @@ export async function pTimeout(fn, opt) {
                 }
                 return;
             }
-            const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`, opt.errorData);
-            if (fakeError)
-                err.stack = fakeError.stack; // keep original stack
             reject(err);
         }, timeout);
         // Execute the Function

package/dist-esm/string/safeJsonStringify.js

@@ -17,13 +17,11 @@ export function _safeJsonStringify(obj, replacer, spaces, cycleReplacer) {
 function serializer(replacer, cycleReplacer) {
     const stack = [];
     const keys = [];
-    if (cycleReplacer == null) {
-        cycleReplacer = function (key, value) {
-            if (stack[0] === value)
-                return '[Circular ~]';
-            return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';
-        };
-    }
+    cycleReplacer !== null && cycleReplacer !== void 0 ? cycleReplacer : (cycleReplacer = function (key, value) {
+        if (stack[0] === value)
+            return '[Circular ~]';
+        return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';
+    });
     return function (key, value) {
         if (stack.length > 0) {
             const thisPos = stack.indexOf(this);

package/dist-esm/string/url.util.js

@@ -14,7 +14,7 @@
 export function _parseQueryString(search) {
     const qs = {};
     search
-        .slice(search[0] === '?' ? 1 : 0)
+        .slice(search.startsWith('?') ? 1 : 0)
         .split('&')
         .forEach(p => {
         const [k, v] = p.split('=');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.116.0",
+  "version": "14.117.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/array/array.util.ts

@@ -164,24 +164,24 @@ export function _findLast<T>(items: T[], predicate: Predicate<T>): T | undefined
 
 export function _takeWhile<T>(items: T[], predicate: Predicate<T>): T[] {
   let proceed = true
-  return items.filter((v, index) => (proceed = proceed && predicate(v, index)))
+  return items.filter((v, index) => (proceed &&= predicate(v, index)))
 }
 
 export function _takeRightWhile<T>(items: T[], predicate: Predicate<T>): T[] {
   let proceed = true
-  return [...items].reverse().filter((v, index) => (proceed = proceed && predicate(v, index)))
+  return [...items].reverse().filter((v, index) => (proceed &&= predicate(v, index)))
 }
 
 export function _dropWhile<T>(items: T[], predicate: Predicate<T>): T[] {
   let proceed = false
-  return items.filter((v, index) => (proceed = proceed || !predicate(v, index)))
+  return items.filter((v, index) => (proceed ||= !predicate(v, index)))
 }
 
 export function _dropRightWhile<T>(items: T[], predicate: Predicate<T>): T[] {
   let proceed = false
   return [...items]
     .reverse()
-    .filter((v, index) => (proceed = proceed || !predicate(v, index)))
+    .filter((v, index) => (proceed ||= !predicate(v, index)))
     .reverse()
 }
 

package/src/datetime/dateInterval.ts

@@ -58,6 +58,7 @@ export class DateInterval {
    */
   includes(d: LocalDateConfig, incl: Inclusiveness = '[]'): boolean {
     d = LocalDate.of(d)
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
     return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']')
   }
 

package/src/datetime/localDate.ts

@@ -154,6 +154,7 @@ export class LocalDate {
     const $max = LocalDate.of(max).startOf(stepUnit)
 
     let current = $min.startOf(stepUnit)
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
     if (current.isAfter($min, incl[0] === '[')) {
       // ok
     } else {
@@ -228,6 +229,7 @@ export class LocalDate {
 
   isBetween(min: LocalDateConfig, max: LocalDateConfig, incl: Inclusiveness = '[)'): boolean {
     let r = this.cmp(min)
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
     if (r < 0 || (r === 0 && incl[0] === '(')) return false
     r = this.cmp(max)
     if (r > 0 || (r === 0 && incl[1] === ')')) return false

package/src/datetime/localTime.ts

@@ -431,6 +431,7 @@ export class LocalTime {
 
   isBetween(min: LocalTimeConfig, max: LocalTimeConfig, incl: Inclusiveness = '[)'): boolean {
     let r = this.cmp(min)
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
     if (r < 0 || (r === 0 && incl[0] === '(')) return false
     r = this.cmp(max)
     if (r > 0 || (r === 0 && incl[1] === ')')) return false
@@ -641,9 +642,8 @@ function getWeekYear(date: Date): number {
     return year + 1
   } else if (date.getTime() >= startOfThisYear.getTime()) {
     return year
-  } else {
-    return year - 1
   }
+  return year - 1
 }
 
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/startOfWeek/index.ts

package/src/datetime/timeInterval.ts

@@ -77,6 +77,7 @@ export class TimeInterval {
 
   includes(d: LocalTimeConfig, incl: Inclusiveness = '[)'): boolean {
     d = LocalTime.parseToUnixTimestamp(d)
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
     if (d < this.$start || (d === this.$start && incl[0] === '(')) return false
     if (d > this.$end || (d === this.$end && incl[1] === ')')) return false
     return true

package/src/decorators/asyncMemo.decorator.ts

@@ -11,12 +11,12 @@ export interface AsyncMemoOptions {
    * Function that creates an instance of `MemoCache`.
    * e.g LRUMemoCache from `@naturalcycles/nodejs-lib`.
    */
-  cacheFactory?: () => AsyncMemoCache
+  cacheFactory?(): AsyncMemoCache
 
   /**
    * Provide a custom implementation of CacheKey function.
    */
-  cacheKeyFn?: (args: any[]) => any
+  cacheKeyFn?(args: any[]): any
 
   /**
    * Default true.

package/src/decorators/createPromiseDecorator.ts

@@ -7,14 +7,14 @@ export interface PromiseDecoratorCfg<RES = any, PARAMS = any> {
    * Called BEFORE the original function.
    * If Promise is returned - it will be awaited.
    */
-  beforeFn?: (r: PromiseDecoratorResp<PARAMS>) => void | Promise<void>
+  beforeFn?(r: PromiseDecoratorResp<PARAMS>): void | Promise<void>
 
   /**
    * Called just AFTER the original function.
    * The output of this hook will be passed further,
    * so, pay attention to pass through (or modify) the result.
    */
-  thenFn?: (r: PromiseDecoratorResp<PARAMS> & { res: RES }) => RES
+  thenFn?(r: PromiseDecoratorResp<PARAMS> & { res: RES }): RES
 
   /**
    * Called on Promise.reject.
@@ -23,13 +23,13 @@ export interface PromiseDecoratorCfg<RES = any, PARAMS = any> {
    * If `catchFn` is present - it's responsible for handling or re-throwing the error.
    * Whatever `catchFn` returns - passed to the original output.
    */
-  catchFn?: (r: PromiseDecoratorResp<PARAMS> & { err: any }) => RES
+  catchFn?(r: PromiseDecoratorResp<PARAMS> & { err: any }): RES
 
   /**
    * Fires AFTER thenFn / catchFn, like a usual Promise.finally().
    * Doesn't have access to neither res nor err (same as Promise.finally).
    */
-  finallyFn?: (r: PromiseDecoratorResp<PARAMS>) => any
+  finallyFn?(r: PromiseDecoratorResp<PARAMS>): any
 }
 
 export interface PromiseDecoratorResp<PARAMS> {

package/src/decorators/logMethod.decorator.ts

@@ -122,11 +122,10 @@ export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
               logFinished(logger, callSignature, started, sma, logResultFn, undefined, err)
               throw err
             })
-        } else {
-          // not a Promise
-          logFinished(logger, callSignature, started, sma, logResultFn, res)
-          return res
         }
+        // not a Promise
+        logFinished(logger, callSignature, started, sma, logResultFn, res)
+        return res
       } catch (err) {
         logFinished(logger, callSignature, started, sma, logResultFn, undefined, err)
         throw err // rethrow
@@ -137,6 +136,7 @@ export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
   }
 }
 
+// eslint-disable-next-line max-params
 function logFinished(
   logger: CommonLogger,
   callSignature: string,

package/src/decorators/memo.decorator.ts

@@ -11,12 +11,12 @@ export interface MemoOptions {
    * Function that creates an instance of `MemoCache`.
    * e.g LRUMemoCache from `@naturalcycles/nodejs-lib`
    */
-  cacheFactory?: () => MemoCache
+  cacheFactory?(): MemoCache
 
   /**
    * Provide a custom implementation of CacheKey function.
    */
-  cacheKeyFn?: (args: any[]) => any
+  cacheKeyFn?(args: any[]): any
 
   /**
    * Defaults to true.

package/src/error/tryCatch.ts

@@ -7,7 +7,7 @@ export interface TryCatchOptions {
    * The value returned from the function will be returned from the wrapped method (!).
    * onError function may be asynchronous.
    */
-  onError?: (err: Error) => any
+  onError?(err: Error): any
 
   /**
    * @default false

package/src/object/deepEquals.ts

@@ -51,5 +51,6 @@ export function _deepEquals(a: any, b: any): boolean {
     return true
   }
 
+  // eslint-disable-next-line no-self-compare
   return a !== a && b !== b
 }

package/src/object/object.util.ts

@@ -17,13 +17,12 @@ export function _pick<T extends AnyObject, K extends keyof T>(
       if (!props.includes(prop as K)) delete r[prop]
       return r
     }, obj)
-  } else {
-    // Start as empty object, pick/add needed properties
-    return props.reduce((r, prop) => {
-      if (prop in obj) r[prop] = obj[prop]
-      return r
-    }, {} as T)
   }
+  // Start as empty object, pick/add needed properties
+  return props.reduce((r, prop) => {
+    if (prop in obj) r[prop] = obj[prop]
+    return r
+  }, {} as T)
 }
 
 /**
@@ -285,7 +284,7 @@ export function _unset<T extends AnyObject>(obj: T, prop: string): void {
 
   const segs = prop.split('.')
   let last = segs.pop()
-  while (segs.length && segs[segs.length - 1]!.slice(-1) === '\\') {
+  while (segs.length && segs[segs.length - 1]!.endsWith('\\')) {
     last = segs.pop()!.slice(0, -1) + '.' + last
   }
   while (segs.length && _isObject(obj)) {
@@ -359,7 +358,7 @@ export function _set<T extends AnyObject>(obj: T, path: PropertyPath, value: any
           a[c]
         : // No: create the key. Is the next key a potential array-index?
           (a[c] =
-            // @ts-ignore
+            // @ts-expect-error
             // eslint-disable-next-line
             Math.abs(path[i + 1]) >> 0 === +path[i + 1]
               ? [] // Yes: assign a new array object

package/src/promise/pRetry.ts

@@ -43,7 +43,7 @@ export interface PRetryOptions {
    *
    * @default () => true
    */
-  predicate?: (err: Error, attempt: number, maxAttempts: number) => boolean
+  predicate?(err: Error, attempt: number, maxAttempts: number): boolean
 
   /**
    * Log the first attempt (which is not a "retry" yet).

package/src/promise/pTimeout.ts

@@ -19,8 +19,11 @@ export interface PTimeoutOptions {
   /**
    * If provided - will be called INSTEAD of throwing an error.
    * Can be used to thrown a custom error OR resolve a promise without throwing.
+   *
+   * err (which is TimeoutError) is passed as an argument for convenience, so it can
+   * be logged or such. You don't have to consume it in any way though.
    */
-  onTimeout?: () => any
+  onTimeout?(err: TimeoutError): any
 
   /**
    * Defaults to true.
@@ -59,17 +62,19 @@ export function pTimeoutFn<T extends AnyAsyncFunction>(fn: T, opt: PTimeoutOptio
  * If the Function rejects - passes this rejection further.
  */
 export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions): Promise<T> {
-  // todo: check how we can automatically infer function name (only applicable to named functions)
-  const { timeout, name, onTimeout, keepStackTrace = true } = opt
+  const { timeout, name = fn.name || 'pTimeout function', 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
     const timer = setTimeout(() => {
+      const err = new TimeoutError(`"${name}" timed out after ${timeout} ms`, opt.errorData)
+      if (fakeError) err.stack = fakeError.stack // keep original stack
+
       if (onTimeout) {
         try {
-          resolve(onTimeout())
+          resolve(onTimeout(err))
         } catch (err: any) {
           if (fakeError) err.stack = fakeError.stack // keep original stack
           err.data = {
@@ -81,11 +86,6 @@ export async function pTimeout<T>(fn: AnyAsyncFunction<T>, opt: PTimeoutOptions)
         return
       }
 
-      const err = new TimeoutError(
-        `"${name || 'pTimeout function'}" timed out after ${timeout} ms`,
-        opt.errorData,
-      )
-      if (fakeError) err.stack = fakeError.stack // keep original stack
       reject(err)
     }, timeout)
 

package/src/string/pupa.ts

@@ -31,7 +31,7 @@ export interface PupaOptions {
   /**
    * Performs arbitrary operation for each interpolation. If the returned value was `undefined`, it behaves differently depending on the `ignoreMissing` option. Otherwise, the returned value will be interpolated into a string (and escaped when double-braced) and embedded into the template.
    */
-  transform?: (data: { value: any; key: string }) => unknown
+  transform?(data: { value: any; key: string }): unknown
 }
 
 /**

package/src/string/readingTime.ts

@@ -16,7 +16,7 @@ export interface ReadingTimeOptions {
    * A function that returns a boolean value depending on if a character is considered as a word bound.
    * Default: spaces, new lines and tabs
    */
-  wordBound?: (char: string) => boolean
+  wordBound?(char: string): boolean
   /**
    * Default 200
    */

package/src/string/safeJsonStringify.ts

@@ -26,11 +26,9 @@ function serializer(replacer?: Reviver, cycleReplacer?: Reviver): Reviver {
   const stack: any[] = []
   const keys: string[] = []
 
-  if (cycleReplacer == null) {
-    cycleReplacer = function (key, value) {
-      if (stack[0] === value) return '[Circular ~]'
-      return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']'
-    }
+  cycleReplacer ??= function (key, value) {
+    if (stack[0] === value) return '[Circular ~]'
+    return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']'
   }
 
   return function (key, value) {

package/src/string/url.util.ts

@@ -16,7 +16,7 @@ import type { StringMap } from '../types'
 export function _parseQueryString(search: string): StringMap {
   const qs: StringMap = {}
   search
-    .slice(search[0] === '?' ? 1 : 0)
+    .slice(search.startsWith('?') ? 1 : 0)
     .split('&')
     .forEach(p => {
       const [k, v] = p.split('=')