@naturalcycles/js-lib 14.234.0 → 14.236.0

package/dist/number/number.util.d.ts

@@ -22,8 +22,11 @@ export declare function _runLessOften(percent: number): boolean;
  * _isBetween(3, 1, 5) // true
  * _isBetween(5, 1, 5) // false
  * _isBetween(7, 1, 5) // false
+ *
+ * Also works with strings:
+ * _isBetween('2020-01-03', '2020-01-01', '2020-01-05') // true
  */
-export declare function _isBetween(x: number, min: number, max: number, incl?: Inclusiveness): boolean;
+export declare function _isBetween<T extends number | string>(x: T, min: T, max: T, incl?: Inclusiveness): boolean;
 export declare function _clamp(x: number, minIncl: number, maxIncl: number): number;
 /**
  * This function exists, because in JS you cannot just .sort() numbers,

package/dist/number/number.util.js

@@ -34,6 +34,9 @@ exports._runLessOften = _runLessOften;
  * _isBetween(3, 1, 5) // true
  * _isBetween(5, 1, 5) // false
  * _isBetween(7, 1, 5) // false
+ *
+ * Also works with strings:
+ * _isBetween('2020-01-03', '2020-01-01', '2020-01-05') // true
  */
 function _isBetween(x, min, max, incl = '[)') {
     if (incl === '[)') {
@@ -45,7 +48,6 @@ function _isBetween(x, min, max, incl = '[)') {
     else if (incl === '(]') {
         return x > min && x <= max;
     }
-    // ()
     return x > min && x < max;
 }
 exports._isBetween = _isBetween;

package/dist-esm/array/range.js

@@ -1,4 +1,3 @@
-import { __asyncGenerator, __await } from "tslib";
 import { AsyncIterable2 } from '../iter/asyncIterable2';
 import { Iterable2 } from '../iter/iterable2';
 export function _range(fromIncl, toExcl, step = 1) {
@@ -26,12 +25,10 @@ export function _rangeAsyncIterable(fromIncl, toExcl, step = 1) {
         fromIncl = 0;
     }
     return AsyncIterable2.of({
-        [Symbol.asyncIterator]() {
-            return __asyncGenerator(this, arguments, function* _a() {
-                for (let i = fromIncl; i < toExcl; i += step) {
-                    yield yield __await(i);
-                }
-            });
+        async *[Symbol.asyncIterator]() {
+            for (let i = fromIncl; i < toExcl; i += step) {
+                yield i;
+            }
         },
     });
 }

package/dist-esm/datetime/localTime.js

@@ -112,11 +112,10 @@ export class LocalTime {
         return v === undefined ? this.get('second') : this.set('second', v);
     }
     setComponents(c, mutate = false) {
-        var _a;
         const d = mutate ? this.$date : new Date(this.$date);
         // Year, month and day set all-at-once, to avoid 30/31 (and 28/29) mishap
         if (c.day || c.month !== undefined || c.year !== undefined) {
-            d.setFullYear((_a = c.year) !== null && _a !== void 0 ? _a : d.getFullYear(), c.month ? c.month - 1 : d.getMonth(), c.day || d.getDate());
+            d.setFullYear(c.year ?? d.getFullYear(), c.month ? c.month - 1 : d.getMonth(), c.day || d.getDate());
         }
         if (c.hour !== undefined) {
             d.setHours(c.hour);
@@ -317,13 +316,13 @@ export class LocalTime {
      * Third argument allows to override "now".
      */
     isOlderThan(n, unit, now) {
-        return this.isBefore(localTime.of(now !== null && now !== void 0 ? now : new Date()).plus(-n, unit));
+        return this.isBefore(localTime.of(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is same or older (<=) than "now" by X units.
      */
     isSameOrOlderThan(n, unit, now) {
-        return this.isSameOrBefore(localTime.of(now !== null && now !== void 0 ? now : new Date()).plus(-n, unit));
+        return this.isSameOrBefore(localTime.of(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is younger (>) than "now" by X units.
@@ -335,13 +334,13 @@ export class LocalTime {
      * Third argument allows to override "now".
      */
     isYoungerThan(n, unit, now) {
-        return this.isAfter(localTime.of(now !== null && now !== void 0 ? now : new Date()).plus(-n, unit));
+        return this.isAfter(localTime.of(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is same or younger (>=) than "now" by X units.
      */
     isSameOrYoungerThan(n, unit, now) {
-        return this.isSameOrAfter(localTime.of(now !== null && now !== void 0 ? now : new Date()).plus(-n, unit));
+        return this.isSameOrAfter(localTime.of(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Returns 1 if this > d
@@ -356,7 +355,10 @@ export class LocalTime {
         return t1 < t2 ? -1 : 1;
     }
     components() {
-        return Object.assign(Object.assign({}, this.dateComponents()), this.timeComponents());
+        return {
+            ...this.dateComponents(),
+            ...this.timeComponents(),
+        };
     }
     dateComponents() {
         return {

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

@@ -108,6 +108,6 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
  e.g `clear` to clear the cache, or get its underlying data.
  */
 export function _getAsyncMemo(method) {
-    _assert(typeof (method === null || method === void 0 ? void 0 : method.getInstanceCache) === 'function', 'method is not an AsyncMemo instance');
+    _assert(typeof method?.getInstanceCache === 'function', 'method is not an AsyncMemo instance');
     return method;
 }

package/dist-esm/decorators/createPromiseDecorator.js

@@ -18,7 +18,6 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
         const key = String(propertyKey);
         const methodSignature = _getTargetMethodSignature(target, key);
         pd.value = async function (...args) {
-            var _a, _b;
             // console.log(`@${cfg.decoratorName} called inside function`)
             const started = Date.now();
             try {
@@ -46,9 +45,12 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
                     started,
                 };
                 if (cfg.thenFn) {
-                    res = cfg.thenFn(Object.assign(Object.assign({}, resp), { res }));
+                    res = cfg.thenFn({
+                        ...resp,
+                        res,
+                    });
                 }
-                (_a = cfg.finallyFn) === null || _a === void 0 ? void 0 : _a.call(cfg, resp);
+                cfg.finallyFn?.(resp);
                 return res;
             }
             catch (err) {
@@ -63,10 +65,13 @@ export function _createPromiseDecorator(cfg, decoratorParams = {}) {
                 };
                 let handled = false;
                 if (cfg.catchFn) {
-                    cfg.catchFn(Object.assign(Object.assign({}, resp), { err }));
+                    cfg.catchFn({
+                        ...resp,
+                        err,
+                    });
                     handled = true;
                 }
-                (_b = cfg.finallyFn) === null || _b === void 0 ? void 0 : _b.call(cfg, resp);
+                cfg.finallyFn?.(resp);
                 if (!handled) {
                     throw err; // rethrow
                 }

package/dist-esm/decorators/debounce.js

@@ -105,5 +105,10 @@ export function _debounce(func, wait, opt = {}) {
     return debounced;
 }
 export function _throttle(func, wait, opt = {}) {
-    return _debounce(func, wait, Object.assign(Object.assign({ leading: true, trailing: true }, opt), { maxWait: wait }));
+    return _debounce(func, wait, {
+        leading: true,
+        trailing: true,
+        ...opt,
+        maxWait: wait,
+    });
 }

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

@@ -77,6 +77,6 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
  e.g `clear` to clear the cache, or get its underlying data.
  */
 export function _getMemo(method) {
-    _assert(typeof (method === null || method === void 0 ? void 0 : method.getInstanceCache) === 'function', 'method is not a Memo instance');
+    _assert(typeof method?.getInstanceCache === 'function', 'method is not a Memo instance');
     return method;
 }

package/dist-esm/define.js

@@ -76,14 +76,26 @@ export function _defineLazyProps(obj, props) {
  *
  */
 export function _defineProperty(obj, prop, pd) {
-    return Object.defineProperty(obj, prop, Object.assign({ writable: true, configurable: true, enumerable: true }, pd));
+    return Object.defineProperty(obj, prop, {
+        writable: true,
+        configurable: true,
+        enumerable: true,
+        // value: obj[prop], // existing value is already kept by default
+        ...pd,
+    });
 }
 /**
  * Object.defineProperties with better defaults.
  * See _defineProperty for exact defaults definition.
  */
 export function _defineProps(obj, props) {
-    return Object.defineProperties(obj, _mapValues(props, (k, pd) => (Object.assign({ writable: true, configurable: true, enumerable: true }, pd))));
+    return Object.defineProperties(obj, _mapValues(props, (k, pd) => ({
+        writable: true,
+        configurable: true,
+        enumerable: true,
+        // value: obj[k], // existing value is already kept by default
+        ...pd,
+    })));
 }
 /**
  * Like _defineProps, but skips props with nullish values.

package/dist-esm/enum.util.js

@@ -147,8 +147,7 @@ export function _numberEnumKey(en, v) {
 export function _stringEnumKeyOrUndefined(en, 
 // v: T[keyof T] | undefined | null, // cannot make it type-safe :(
 v) {
-    var _a;
-    return (_a = Object.entries(en).find(([_, v2]) => v2 === v)) === null || _a === void 0 ? void 0 : _a[0];
+    return Object.entries(en).find(([_, v2]) => v2 === v)?.[0];
 }
 export function _stringEnumKey(en, v) {
     const r = _stringEnumKeyOrUndefined(en, v);

package/dist-esm/error/assert.js

@@ -17,7 +17,10 @@ import { _deepEquals, _isErrorObject, _stringify, AssertionError } from '..';
 export function _assert(condition, // will be evaluated as Boolean
 message, errorData) {
     if (!condition) {
-        throw new AssertionError(message || 'condition failed', Object.assign({ userFriendly: true }, errorData));
+        throw new AssertionError(message || 'condition failed', {
+            userFriendly: true,
+            ...errorData,
+        });
     }
 }
 /**
@@ -32,7 +35,10 @@ export function _assertEquals(actual, expected, message, errorData) {
             ['not equal', `expected: ${_stringify(expected)}`, `got     : ${_stringify(actual)}`]
                 .filter(Boolean)
                 .join('\n');
-        throw new AssertionError(msg, Object.assign({ userFriendly: true }, errorData));
+        throw new AssertionError(msg, {
+            userFriendly: true,
+            ...errorData,
+        });
     }
 }
 /**
@@ -47,7 +53,10 @@ export function _assertDeepEquals(actual, expected, message, errorData) {
             [`not deeply equal`, `expected: ${_stringify(expected)}`, `got     : ${_stringify(actual)}`]
                 .filter(Boolean)
                 .join('\n');
-        throw new AssertionError(msg, Object.assign({ userFriendly: true }, errorData));
+        throw new AssertionError(msg, {
+            userFriendly: true,
+            ...errorData,
+        });
     }
 }
 export function _assertIsError(err, errorClass = Error) {

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

@@ -19,7 +19,10 @@ export function _anyToError(o, errorClass = Error, errorData) {
     }
     if (errorData) {
         ;
-        e.data = Object.assign(Object.assign({}, e.data), errorData);
+        e.data = {
+            ...e.data,
+            ...errorData,
+        };
     }
     return e;
 }
@@ -73,7 +76,7 @@ export function _errorLikeToErrorObject(e) {
     const obj = {
         name: e.name,
         message: e.message,
-        data: Object.assign({}, e.data), // empty by default
+        data: { ...e.data }, // empty by default
     };
     if (e.stack)
         obj.stack = e.stack;
@@ -168,11 +171,10 @@ export function _errorSnippet(err, opt = {}) {
     }
 }
 export function _isBackendErrorResponseObject(o) {
-    return _isErrorObject(o === null || o === void 0 ? void 0 : o.error);
+    return _isErrorObject(o?.error);
 }
 export function _isHttpRequestErrorObject(o) {
-    var _a;
-    return !!o && o.name === 'HttpRequestError' && typeof ((_a = o.data) === null || _a === void 0 ? void 0 : _a.requestUrl) === 'string';
+    return !!o && o.name === 'HttpRequestError' && typeof o.data?.requestUrl === 'string';
 }
 /**
  * Note: any instance of AppError is also automatically an ErrorObject
@@ -204,7 +206,10 @@ export function _isErrorLike(o) {
 export function _errorDataAppend(err, data) {
     if (!data)
         return err;
-    err.data = Object.assign(Object.assign({}, err.data), data);
+    err.data = {
+        ...err.data,
+        ...data,
+    };
     return err;
 }
 /**
@@ -294,7 +299,7 @@ export class HttpRequestError extends AppError {
                 enumerable: false,
             });
         }
-        super(message, data, Object.assign(Object.assign({}, opt), { name: 'HttpRequestError' }));
+        super(message, data, { ...opt, name: 'HttpRequestError' });
     }
 }
 export class AssertionError extends AppError {
@@ -312,7 +317,7 @@ export class JsonParseError extends AppError {
 }
 export class TimeoutError extends AppError {
     constructor(message, data, opt) {
-        super(message, data, Object.assign(Object.assign({}, opt), { name: 'TimeoutError' }));
+        super(message, data, { ...opt, name: 'TimeoutError' });
     }
 }
 /**

package/dist-esm/error/tryCatch.js

@@ -27,7 +27,7 @@ export function _tryCatch(fn, opt = {}) {
                 try {
                     return await onError(_anyToError(err)); // eslint-disable-line @typescript-eslint/return-await
                 }
-                catch (_a) { }
+                catch { }
             }
             // returns undefined, but doesn't rethrow
         }

package/dist-esm/http/fetcher.js

@@ -41,19 +41,31 @@ export class Fetcher {
         for (const method of HTTP_METHODS) {
             const m = method.toLowerCase();
             this[`${m}Void`] = async (url, opt) => {
-                return await this.fetch(Object.assign({ url,
-                    method, responseType: 'void' }, opt));
+                return await this.fetch({
+                    url,
+                    method,
+                    responseType: 'void',
+                    ...opt,
+                });
             };
             if (method === 'HEAD')
                 return // responseType=text
                 ;
             this[`${m}Text`] = async (url, opt) => {
-                return await this.fetch(Object.assign({ url,
-                    method, responseType: 'text' }, opt));
+                return await this.fetch({
+                    url,
+                    method,
+                    responseType: 'text',
+                    ...opt,
+                });
             };
             this[m] = async (url, opt) => {
-                return await this.fetch(Object.assign({ url,
-                    method, responseType: 'json' }, opt));
+                return await this.fetch({
+                    url,
+                    method,
+                    responseType: 'json',
+                    ...opt,
+                });
             };
         }
     }
@@ -89,7 +101,11 @@ export class Fetcher {
      * https://css-tricks.com/web-streams-everywhere-and-fetch-for-node-js/
      */
     async getReadableStream(url, opt) {
-        return await this.fetch(Object.assign({ url, responseType: 'readableStream' }, opt));
+        return await this.fetch({
+            url,
+            responseType: 'readableStream',
+            ...opt,
+        });
     }
     async fetch(opt) {
         const res = await this.doFetch(opt);
@@ -135,7 +151,6 @@ export class Fetcher {
      * Note: responseType defaults to `void`, so, override it if you expect different.
      */
     async doFetch(opt) {
-        var _b, _c;
         const req = this.normalizeOptions(opt);
         const { logger } = this.cfg;
         const { timeoutSeconds, init: { method }, } = req;
@@ -201,8 +216,8 @@ export class Fetcher {
                 // Separate Timeout will be introduced to "download and parse the body"
             }
             res.statusFamily = this.getStatusFamily(res);
-            res.statusCode = (_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status;
-            if (((_c = res.fetchResponse) === null || _c === void 0 ? void 0 : _c.ok) || !req.throwHttpErrors) {
+            res.statusCode = res.fetchResponse?.status;
+            if (res.fetchResponse?.ok || !req.throwHttpErrors) {
                 try {
                     // We are applying a separate Timeout (as long as original Timeout for now) to "download and parse the body"
                     await pTimeout(async () => await this.onOkResponse(res), {
@@ -296,7 +311,6 @@ export class Fetcher {
         return await globalThis.fetch(url, init);
     }
     async onNotOkResponse(res) {
-        var _b;
         let cause;
         if (res.err) {
             // This is only possible on JSON.parse error, or CORS error,
@@ -315,7 +329,7 @@ export class Fetcher {
             message: 'Fetch failed',
             data: {},
         });
-        let responseStatusCode = ((_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status) || 0;
+        let responseStatusCode = res.fetchResponse?.status || 0;
         if (res.statusFamily === 2) {
             // important to reset httpStatusCode to 0 in this case, as status 2xx can be misleading
             res.statusFamily = undefined;
@@ -342,7 +356,6 @@ export class Fetcher {
         await this.processRetry(res);
     }
     async processRetry(res) {
-        var _b;
         const { retryStatus } = res;
         if (!this.shouldRetry(res)) {
             retryStatus.retryStopped = true;
@@ -362,7 +375,7 @@ export class Fetcher {
         if (res.err && (!retryStatus.retryStopped || res.req.logResponse)) {
             this.cfg.logger.error([
                 ' <<',
-                ((_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status) || 0,
+                res.fetchResponse?.status || 0,
                 res.signature,
                 count &&
                     (retryStatus.retryAttempt || !retryStatus.retryStopped) &&
@@ -385,12 +398,12 @@ export class Fetcher {
         await pDelay(timeout);
     }
     getRetryTimeout(res) {
-        var _b;
         let timeout = 0;
         // Handling http 429 with specific retry headers
         // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
         if (res.fetchResponse && [429, 503].includes(res.fetchResponse.status)) {
-            const retryAfterStr = (_b = res.fetchResponse.headers.get('retry-after')) !== null && _b !== void 0 ? _b : res.fetchResponse.headers.get('x-ratelimit-reset');
+            const retryAfterStr = res.fetchResponse.headers.get('retry-after') ??
+                res.fetchResponse.headers.get('x-ratelimit-reset');
             if (retryAfterStr) {
                 if (Number(retryAfterStr)) {
                     timeout = Number(retryAfterStr) * 1000;
@@ -420,13 +433,12 @@ export class Fetcher {
      * statusCode of 0 (or absense of it) will BE retried.
      */
     shouldRetry(res) {
-        var _b, _c, _d, _e, _f;
         const { retryPost, retry3xx, retry4xx, retry5xx } = res.req;
         const { method } = res.req.init;
         if (method === 'POST' && !retryPost)
             return false;
         const { statusFamily } = res;
-        const statusCode = ((_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status) || 0;
+        const statusCode = res.fetchResponse?.status || 0;
         if (statusFamily === 5 && !retry5xx)
             return false;
         if ([408, 429].includes(statusCode)) {
@@ -438,14 +450,13 @@ export class Fetcher {
         if (statusFamily === 3 && !retry3xx)
             return false;
         // should not retry on `unexpected redirect` in error.cause.cause
-        if ((_f = (_e = (_d = (_c = res.err) === null || _c === void 0 ? void 0 : _c.cause) === null || _d === void 0 ? void 0 : _d.cause) === null || _e === void 0 ? void 0 : _e.message) === null || _f === void 0 ? void 0 : _f.includes('unexpected redirect')) {
+        if (res.err?.cause?.cause?.message?.includes('unexpected redirect')) {
             return false;
         }
         return true; // default is true
     }
     getStatusFamily(res) {
-        var _b;
-        const status = (_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status;
+        const status = res.fetchResponse?.status;
         if (!status)
             return;
         if (status >= 500)
@@ -478,8 +489,7 @@ export class Fetcher {
         return shortUrl;
     }
     normalizeCfg(cfg) {
-        var _b;
-        if ((_b = cfg.baseUrl) === null || _b === void 0 ? void 0 : _b.endsWith('/')) {
+        if (cfg.baseUrl?.endsWith('/')) {
             console.warn(`Fetcher: baseUrl should not end with slash: ${cfg.baseUrl}`);
             cfg.baseUrl = cfg.baseUrl.slice(0, cfg.baseUrl.length - 1);
         }
@@ -503,10 +513,13 @@ export class Fetcher {
             logResponseBody: debug,
             logWithBaseUrl: isServerSide(),
             logWithSearchParams: true,
-            retry: Object.assign({}, defRetryOptions),
+            retry: { ...defRetryOptions },
             init: {
                 method: cfg.method || 'GET',
-                headers: _filterNullishValues(Object.assign({ 'user-agent': _a.userAgent }, cfg.headers)),
+                headers: _filterNullishValues({
+                    'user-agent': _a.userAgent,
+                    ...cfg.headers,
+                }),
                 credentials: cfg.credentials,
                 redirect: cfg.redirect,
             },
@@ -518,22 +531,39 @@ export class Fetcher {
     }
     normalizeOptions(opt) {
         var _b;
-        const req = Object.assign(Object.assign(Object.assign(Object.assign({}, _pick(this.cfg, [
-            'timeoutSeconds',
-            'retryPost',
-            'retry4xx',
-            'retry5xx',
-            'responseType',
-            'jsonReviver',
-            'logRequest',
-            'logRequestBody',
-            'logResponse',
-            'logResponseBody',
-            'debug',
-            'throwHttpErrors',
-        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { headers: Object.assign({}, this.cfg.init.headers), method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: opt.redirect || this.cfg.init.redirect || 'follow' }), {
+        const req = {
+            ..._pick(this.cfg, [
+                'timeoutSeconds',
+                'retryPost',
+                'retry4xx',
+                'retry5xx',
+                'responseType',
+                'jsonReviver',
+                'logRequest',
+                'logRequestBody',
+                'logResponse',
+                'logResponseBody',
+                'debug',
+                'throwHttpErrors',
+            ]),
+            started: Date.now(),
+            ..._omit(opt, ['method', 'headers', 'credentials']),
+            inputUrl: opt.url || '',
+            fullUrl: opt.url || '',
+            retry: {
+                ...this.cfg.retry,
+                ..._filterUndefinedValues(opt.retry || {}),
+            },
+            init: _merge({
+                ...this.cfg.init,
+                headers: { ...this.cfg.init.headers }, // this avoids mutation
+                method: opt.method || this.cfg.init.method,
+                credentials: opt.credentials || this.cfg.init.credentials,
+                redirect: opt.redirect || this.cfg.init.redirect || 'follow',
+            }, {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
-            }) });
+            }),
+        };
         // Because all header values are stringified, so `a: undefined` becomes `undefined` as a string
         _filterNullishValues(req.init.headers, true);
         // setup url
@@ -545,7 +575,10 @@ export class Fetcher {
             }
             req.fullUrl = `${baseUrl}/${req.inputUrl}`;
         }
-        const searchParams = _filterUndefinedValues(Object.assign(Object.assign({}, this.cfg.searchParams), opt.searchParams));
+        const searchParams = _filterUndefinedValues({
+            ...this.cfg.searchParams,
+            ...opt.searchParams,
+        });
         if (Object.keys(searchParams).length) {
             const qs = new URLSearchParams(searchParams).toString();
             req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs;

package/dist-esm/iter/asyncIterable2.js

@@ -1,4 +1,3 @@
-import { __asyncDelegator, __asyncGenerator, __asyncValues, __await } from "tslib";
 import { END, SKIP } from '../types';
 /**
  * Similar to Iterable2, but for AsyncIterable.
@@ -19,16 +18,14 @@ export class AsyncIterable2 {
     }
     static ofIterable(it) {
         return new AsyncIterable2({
-            [Symbol.asyncIterator]() {
-                return __asyncGenerator(this, arguments, function* _a() {
-                    yield __await(yield* __asyncDelegator(__asyncValues(it)));
-                });
+            async *[Symbol.asyncIterator]() {
+                yield* it;
             },
         });
     }
     static empty() {
         return new AsyncIterable2({
-            [Symbol.asyncIterator]() { return __asyncGenerator(this, arguments, function* _a() { }); },
+            async *[Symbol.asyncIterator]() { },
         });
     }
     [Symbol.asyncIterator]() {
@@ -37,151 +34,69 @@ export class AsyncIterable2 {
     async toArray() {
         // todo: Array.fromAsync is not yet available, use that when it's ready
         // return await Array.fromAsync(this.it)
-        var _a, e_1, _b, _c;
         const res = [];
-        try {
-            for (var _d = true, _e = __asyncValues(this.it), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const item = _c;
-                res.push(item);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-            }
-            finally { if (e_1) throw e_1.error; }
+        for await (const item of this.it) {
+            res.push(item);
         }
         return res;
     }
     async forEach(cb) {
-        var _a, e_2, _b, _c;
         let i = 0;
-        try {
-            for (var _d = true, _e = __asyncValues(this.it), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const v = _c;
-                if ((await cb(v, i++)) === END)
-                    return;
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-            }
-            finally { if (e_2) throw e_2.error; }
+        for await (const v of this.it) {
+            if ((await cb(v, i++)) === END)
+                return;
         }
     }
     async some(cb) {
         return !!(await this.find(cb));
     }
     async every(cb) {
-        var _a, e_3, _b, _c;
         let i = 0;
-        try {
-            for (var _d = true, _e = __asyncValues(this.it), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const v = _c;
-                const r = await cb(v, i++);
-                if (r === END || !r)
-                    return false;
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-            }
-            finally { if (e_3) throw e_3.error; }
+        for await (const v of this.it) {
+            const r = await cb(v, i++);
+            if (r === END || !r)
+                return false;
         }
         return true;
     }
     async find(cb) {
-        var _a, e_4, _b, _c;
         let i = 0;
-        try {
-            for (var _d = true, _e = __asyncValues(this.it), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const v = _c;
-                const r = await cb(v, i++);
-                if (r === END)
-                    return;
-                if (r)
-                    return v;
-            }
-        }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-            }
-            finally { if (e_4) throw e_4.error; }
+        for await (const v of this.it) {
+            const r = await cb(v, i++);
+            if (r === END)
+                return;
+            if (r)
+                return v;
         }
     }
     filter(cb) {
         const { it } = this;
         return new AsyncIterable2({
-            [Symbol.asyncIterator]() {
-                return __asyncGenerator(this, arguments, function* _a() {
-                    var _b, e_5, _c, _d;
-                    let i = 0;
-                    try {
-                        for (var _e = true, it_1 = __asyncValues(it), it_1_1; it_1_1 = yield __await(it_1.next()), _b = it_1_1.done, !_b; _e = true) {
-                            _d = it_1_1.value;
-                            _e = false;
-                            const v = _d;
-                            const r = yield __await(cb(v, i++));
-                            if (r === END)
-                                return yield __await(void 0);
-                            if (r)
-                                yield yield __await(v);
-                        }
-                    }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                    finally {
-                        try {
-                            if (!_e && !_b && (_c = it_1.return)) yield __await(_c.call(it_1));
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                    }
-                });
+            async *[Symbol.asyncIterator]() {
+                let i = 0;
+                for await (const v of it) {
+                    const r = await cb(v, i++);
+                    if (r === END)
+                        return;
+                    if (r)
+                        yield v;
+                }
             },
         });
     }
     map(mapper) {
         const { it } = this;
         return new AsyncIterable2({
-            [Symbol.asyncIterator]() {
-                return __asyncGenerator(this, arguments, function* _a() {
-                    var _b, e_6, _c, _d;
-                    let i = 0;
-                    try {
-                        for (var _e = true, it_2 = __asyncValues(it), it_2_1; it_2_1 = yield __await(it_2.next()), _b = it_2_1.done, !_b; _e = true) {
-                            _d = it_2_1.value;
-                            _e = false;
-                            const v = _d;
-                            const r = yield __await(mapper(v, i++));
-                            if (r === END)
-                                return yield __await(void 0);
-                            if (r === SKIP)
-                                continue;
-                            yield yield __await(r);
-                        }
-                    }
-                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                    finally {
-                        try {
-                            if (!_e && !_b && (_c = it_2.return)) yield __await(_c.call(it_2));
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                    }
-                });
+            async *[Symbol.asyncIterator]() {
+                let i = 0;
+                for await (const v of it) {
+                    const r = await mapper(v, i++);
+                    if (r === END)
+                        return;
+                    if (r === SKIP)
+                        continue;
+                    yield r;
+                }
             },
         });
     }

package/dist-esm/json-schema/jsonSchema.util.js

@@ -6,7 +6,6 @@ import { _filterNullishValues } from '../object/object.util';
  * API similar to Object.assign(s1, s2)
  */
 export function mergeJsonSchemaObjects(s1, s2) {
-    var _a, _b;
     // Merge `properties`
     Object.entries(s2.properties).forEach(([k, v]) => {
         ;
@@ -18,8 +17,8 @@ export function mergeJsonSchemaObjects(s1, s2) {
         s1.patternProperties[k] = v;
     });
     s1.propertyNames = s2.propertyNames || s1.propertyNames;
-    s1.minProperties = (_a = s2.minProperties) !== null && _a !== void 0 ? _a : s1.minProperties;
-    s1.maxProperties = (_b = s2.maxProperties) !== null && _b !== void 0 ? _b : s1.maxProperties;
+    s1.minProperties = s2.minProperties ?? s1.minProperties;
+    s1.maxProperties = s2.maxProperties ?? s1.maxProperties;
     // Merge `required`
     s1.required.push(...s2.required);
     s1.required = _uniq(s1.required).sort();

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

@@ -250,12 +250,11 @@ export class JsonSchemaStringBuilder extends JsonSchemaAnyBuilder {
         return this;
     }
     transformModify(t, add) {
-        var _a;
         if (add) {
             this.schema.transform = _uniq([...(this.schema.transform || []), t]);
         }
         else {
-            this.schema.transform = (_a = this.schema.transform) === null || _a === void 0 ? void 0 : _a.filter(s => s !== t);
+            this.schema.transform = this.schema.transform?.filter(s => s !== t);
         }
         return this;
     }

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

@@ -14,7 +14,7 @@ export function _average(values) {
  * Same as _average, but safely returns null if input array is empty or nullish.
  */
 export function _averageOrNull(values) {
-    return (values === null || values === void 0 ? void 0 : values.length) ? values.reduce((a, b) => a + b) / values.length : null;
+    return values?.length ? values.reduce((a, b) => a + b) / values.length : null;
 }
 /**
  * valuesArray and weightsArray length is expected to be the same.

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

@@ -28,6 +28,9 @@ export function _runLessOften(percent) {
  * _isBetween(3, 1, 5) // true
  * _isBetween(5, 1, 5) // false
  * _isBetween(7, 1, 5) // false
+ *
+ * Also works with strings:
+ * _isBetween('2020-01-03', '2020-01-01', '2020-01-05') // true
  */
 export function _isBetween(x, min, max, incl = '[)') {
     if (incl === '[)') {
@@ -39,7 +42,6 @@ export function _isBetween(x, min, max, incl = '[)') {
     else if (incl === '(]') {
         return x > min && x <= max;
     }
-    // ()
     return x > min && x < max;
 }
 export function _clamp(x, minIncl, maxIncl) {

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

@@ -28,7 +28,7 @@ export function _omit(obj, props, mutate = false) {
     return props.reduce((r, prop) => {
         delete r[prop];
         return r;
-    }, mutate ? obj : Object.assign({}, obj));
+    }, mutate ? obj : { ...obj });
 }
 /**
  * Returns object with filtered keys from `props` array.
@@ -75,7 +75,7 @@ export function _filterObject(obj, predicate, mutate = false) {
         if (!predicate(k, r[k], obj))
             delete r[k];
         return r;
-    }, mutate ? obj : Object.assign({}, obj));
+    }, mutate ? obj : { ...obj });
 }
 /**
  * var users = {
@@ -134,8 +134,7 @@ export function _mapObject(obj, mapper) {
     }, {});
 }
 export function _findKeyByValue(obj, v) {
-    var _a;
-    return (_a = Object.entries(obj).find(([_, value]) => value === v)) === null || _a === void 0 ? void 0 : _a[0];
+    return Object.entries(obj).find(([_, value]) => value === v)?.[0];
 }
 export function _objectNullValuesToUndefined(obj, mutate = false) {
     return _mapValues(obj, (_k, v) => (v === null ? undefined : v), mutate);
@@ -277,7 +276,7 @@ export function _get(obj = {}, path = '') {
     return path
         .replaceAll(/\[([^\]]+)]/g, '.$1')
         .split('.')
-        .reduce((o, p) => o === null || o === void 0 ? void 0 : o[p], obj);
+        .reduce((o, p) => o?.[p], obj);
 }
 /**
  * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for

package/dist-esm/polyfill.js

@@ -1,7 +1,6 @@
 export function polyfillDispose() {
-    var _a, _b;
     // @ts-expect-error polyfill
-    (_a = Symbol.dispose) !== null && _a !== void 0 ? _a : (Symbol.dispose = Symbol('Symbol.dispose'));
+    Symbol.dispose ?? (Symbol.dispose = Symbol('Symbol.dispose'));
     // @ts-expect-error polyfill
-    (_b = Symbol.asyncDispose) !== null && _b !== void 0 ? _b : (Symbol.asyncDispose = Symbol('Symbol.asyncDispose'));
+    Symbol.asyncDispose ?? (Symbol.asyncDispose = Symbol('Symbol.asyncDispose'));
 }

package/dist-esm/promise/abortable.js

@@ -15,11 +15,10 @@ export class Abortable {
         this.aborted = false;
     }
     abort() {
-        var _a;
         if (this.aborted)
             return;
         this.aborted = true;
-        (_a = this.onAbort) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.onAbort?.();
         this.onAbort = undefined; // cleanup listener
     }
     clear() {

package/dist-esm/promise/pMap.js

@@ -96,7 +96,7 @@ export async function pMap(iterable, mapper, opt = {}) {
                     }
                     else {
                         // otherwise, suppress (but still log via logger)
-                        logger === null || logger === void 0 ? void 0 : logger.error(err);
+                        logger?.error(err);
                     }
                     resolvingCount--;
                     next();
@@ -134,7 +134,7 @@ async function pMap1(items, mapper, errorMode, logger) {
             }
             else {
                 // otherwise, suppress (but still log via logger)
-                logger === null || logger === void 0 ? void 0 : logger.error(err);
+                logger?.error(err);
             }
         }
     }
@@ -164,7 +164,7 @@ async function pMapAll(items, mapper, errorMode, logger) {
         }
         else {
             // otherwise, suppress (but still log via logger)
-            logger === null || logger === void 0 ? void 0 : logger.error(r.reason);
+            logger?.error(r.reason);
         }
     }
     if (errors.length) {

package/dist-esm/promise/pQueue.js

@@ -13,9 +13,14 @@ export class PQueue {
         this.inFlight = 0;
         this.queue = [];
         this.onIdleListeners = [];
-        this.cfg = Object.assign({ 
+        this.cfg = {
             // concurrency: Number.MAX_SAFE_INTEGER,
-            errorMode: ErrorMode.THROW_IMMEDIATELY, logger: console, debug: false, resolveOn: 'finish' }, cfg);
+            errorMode: ErrorMode.THROW_IMMEDIATELY,
+            logger: console,
+            debug: false,
+            resolveOn: 'finish',
+            ...cfg,
+        };
         if (!cfg.debug) {
             this.debug = () => { };
         }

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

@@ -11,7 +11,7 @@ export function _jsonParseIfPossible(obj, reviver) {
         try {
             return JSON.parse(obj, reviver);
         }
-        catch (_a) { }
+        catch { }
     }
     return obj;
 }
@@ -25,7 +25,7 @@ export function _jsonParseOrUndefined(obj, reviver) {
         try {
             return JSON.parse(obj, reviver);
         }
-        catch (_a) { }
+        catch { }
     }
 }
 /**
@@ -38,7 +38,7 @@ export function _jsonParse(s, reviver) {
     try {
         return JSON.parse(s, reviver);
     }
-    catch (_a) {
+    catch {
         throw new JsonParseError({
             text: s,
         });

package/dist-esm/string/readingTime.js

@@ -95,5 +95,8 @@ function readingTimeWithCount(words, options = {}) {
  */
 export function readingTime(text, options = {}) {
     const words = countWords(text, options);
-    return Object.assign(Object.assign({}, readingTimeWithCount(words, options)), { words });
+    return {
+        ...readingTimeWithCount(words, options),
+        words,
+    };
 }

package/dist-esm/string/safeJsonStringify.js

@@ -8,7 +8,7 @@ export function _safeJsonStringify(obj, replacer, spaces, cycleReplacer) {
         // Try native first (as it's ~3 times faster)
         return JSON.stringify(obj, replacer, spaces);
     }
-    catch (_a) {
+    catch {
         // Native failed - resort to the "safe" serializer
         return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces);
     }
@@ -17,7 +17,7 @@ export function _safeJsonStringify(obj, replacer, spaces, cycleReplacer) {
 function serializer(replacer, cycleReplacer) {
     const stack = [];
     const keys = [];
-    cycleReplacer !== null && cycleReplacer !== void 0 ? cycleReplacer : (cycleReplacer = function (key, value) {
+    cycleReplacer ?? (cycleReplacer = function (key, value) {
         if (stack[0] === value)
             return '[Circular ~]';
         return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';

package/dist-esm/string/stringify.js

@@ -117,7 +117,7 @@ export function _stringify(obj, opt = {}) {
             const { stringifyFn = globalStringifyFunction } = opt;
             s = stringifyFn(obj, undefined, 2);
         }
-        catch (_a) {
+        catch {
             s = String(obj); // fallback
         }
     }

package/dist-esm/web.js

@@ -14,8 +14,7 @@ export class InMemoryWebStorage {
     // but can be implemented with Proxy
     // [ name: string ]: any
     getItem(key) {
-        var _a;
-        return (_a = this.data[key]) !== null && _a !== void 0 ? _a : null;
+        return this.data[key] ?? null;
     }
     setItem(key, value) {
         this.data[key] = String(value);
@@ -24,8 +23,7 @@ export class InMemoryWebStorage {
         delete this.data[key];
     }
     key(index) {
-        var _a;
-        return (_a = Object.keys(this.data)[index]) !== null && _a !== void 0 ? _a : null;
+        return Object.keys(this.data)[index] ?? null;
     }
     clear() {
         this.data = {};

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

@@ -31,10 +31,9 @@ export class ZodValidationError extends ZodError {
         return this.annotate();
     }
     annotate() {
-        var _a;
         let objectTitle = this.schema.description;
         if (typeof this.value === 'object' && this.value) {
-            const objectName = this.schema.description || ((_a = this.value.constructor) === null || _a === void 0 ? void 0 : _a.name);
+            const objectName = this.schema.description || this.value.constructor?.name;
             const objectId = this.value['id'];
             objectTitle = [objectName, objectId].filter(Boolean).join('.');
         }

package/package.json

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

package/src/number/number.util.ts

@@ -34,11 +34,14 @@ export function _runLessOften(percent: number): boolean {
  * _isBetween(3, 1, 5) // true
  * _isBetween(5, 1, 5) // false
  * _isBetween(7, 1, 5) // false
+ *
+ * Also works with strings:
+ * _isBetween('2020-01-03', '2020-01-01', '2020-01-05') // true
  */
-export function _isBetween(
-  x: number,
-  min: number,
-  max: number,
+export function _isBetween<T extends number | string>(
+  x: T,
+  min: T,
+  max: T,
   incl: Inclusiveness = '[)',
 ): boolean {
   if (incl === '[)') {
@@ -48,7 +51,6 @@ export function _isBetween(
   } else if (incl === '(]') {
     return x > min && x <= max
   }
-  // ()
   return x > min && x < max
 }