@naturalcycles/nodejs-lib 12.68.1 → 12.70.1

package/dist/slack/slack.service.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.slackDefaultMessagePrefixHook = exports.SlackService = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const got_1 = require("got");
 const __1 = require("..");
 const GAE = !!process.env['GAE_INSTANCE'];
@@ -128,7 +127,7 @@ class SlackService {
 }
 exports.SlackService = SlackService;
 function slackDefaultMessagePrefixHook(msg) {
-    const tokens = [(0, time_lib_1.dayjs)().toPretty()];
+    const tokens = [(0, js_lib_1.localTime)().toPretty()];
     const { ctx } = msg;
     // AppEngine-specific decoration
     if (GAE && ctx && typeof ctx === 'object' && typeof ctx.header === 'function') {

package/dist/stream/transform/transformLogProgress.js

@@ -4,7 +4,6 @@ exports.transformLogProgress = void 0;
 const stream_1 = require("stream");
 const util_1 = require("util");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const colors_1 = require("../../colors");
 const colors_2 = require("../../colors/colors");
 const sizeStack_1 = require("../sizeStack");
@@ -94,7 +93,7 @@ function transformLogProgress(opt = {}) {
             if (perHour > 900) {
                 perHour = Math.round(perHour / 1000) + 'K';
             }
-            logger.log(`${(0, colors_1.dimGrey)((0, time_lib_1.dayjs)().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
+            logger.log(`${(0, colors_1.dimGrey)((0, js_lib_1.localTime)().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
         }
         else if (final) {
             logger.log(`${(0, colors_1.boldWhite)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(started))} to process ${(0, colors_1.yellow)(batchedProgress)} rows with total RPS of ${(0, colors_1.yellow)(rpsTotal)}`);

package/dist/stream/transform/transformMap.d.ts

@@ -29,7 +29,7 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
      * If defined - will be called on every error happening in the stream.
      * Called BEFORE observable will emit error (unless skipErrors is set to true).
      */
-    onError?: (err: unknown, input: IN) => any;
+    onError?: (err: Error, input: IN) => any;
     /**
      * Progress metric
      *

package/dist/stream/transform/transformMap.js

@@ -67,7 +67,7 @@ function transformMap(mapper, opt = {}) {
             logErrorStats();
             if (onError) {
                 try {
-                    onError(err, chunk);
+                    onError((0, js_lib_1._anyToError)(err), chunk);
                 }
                 catch { }
             }

package/dist/stream/transform/transformMapSync.d.ts

@@ -27,7 +27,7 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
      * If defined - will be called on every error happening in the stream.
      * Called BEFORE observable will emit error (unless skipErrors is set to true).
      */
-    onError?: (err: unknown, input: IN) => any;
+    onError?: (err: Error, input: IN) => any;
     /**
      * Progress metric
      *

package/dist/stream/transform/transformMapSync.js

@@ -50,7 +50,7 @@ function transformMapSync(mapper, opt = {}) {
                 logErrorStats();
                 if (onError) {
                     try {
-                        onError(err, chunk);
+                        onError((0, js_lib_1._anyToError)(err), chunk);
                     }
                     catch { }
                 }

package/dist/util/lruMemoCache.d.ts

@@ -1,5 +1,5 @@
 import { MemoCache } from '@naturalcycles/js-lib';
-import LRUCache = require('lru-cache');
+import * as LRUCache from 'lru-cache';
 export declare type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>;
 /**
  * @example

package/dist/validation/joi/string.extensions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringExtensions = void 0;
-const time_lib_1 = require("@naturalcycles/time-lib");
+const js_lib_1 = require("@naturalcycles/js-lib");
 function stringExtensions(joi) {
     return {
         type: 'string',
@@ -41,10 +41,10 @@ function stringExtensions(joi) {
                     let { min, max } = args;
                     // Today allows +-14 hours gap to account for different timezones
                     if (max === 'today') {
-                        max = (0, time_lib_1.dayjs)().add(14, 'hour').toISODate();
+                        max = (0, js_lib_1.localTime)().add(14, 'hour').toISODate();
                     }
                     if (min === 'today') {
-                        min = (0, time_lib_1.dayjs)().subtract(14, 'hour').toISODate();
+                        min = (0, js_lib_1.localTime)().subtract(14, 'hour').toISODate();
                     }
                     // console.log('min/max', min, max)
                     const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v);
@@ -57,7 +57,7 @@ function stringExtensions(joi) {
                     else if (max && v > max) {
                         err = 'string.dateStringMax';
                     }
-                    else if (!(0, time_lib_1.dayjs)(v).isValid()) {
+                    else if (!js_lib_1.LocalDate.isValid(v)) {
                         // todo: replace with another regex (from ajv-validators) for speed
                         err = 'string.dateStringCalendarAccuracy';
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.68.1",
+  "version": "12.70.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -15,8 +15,6 @@
   },
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
-    "@naturalcycles/time-lib": "^3.0.1",
-    "@types/lru-cache": "^7.4.0",
     "@types/through2-concurrent": "^2.0.0",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.0",
@@ -43,7 +41,7 @@
     "@naturalcycles/dev-lib": "^12.0.0",
     "@types/node": "^17.0.0",
     "@types/yargs": "^16.0.0",
-    "jest": "^27.0.1",
+    "jest": "^28.0.3",
     "nock": "^13.0.2",
     "patch-package": "^6.2.1",
     "prettier": "^2.0.0",

package/src/slack/slack.service.ts

@@ -4,9 +4,9 @@ import {
   CommonLogger,
   commonLoggerMinLevel,
   CommonLogLevel,
+  localTime,
   PQueue,
 } from '@naturalcycles/js-lib'
-import { dayjs } from '@naturalcycles/time-lib'
 import got from 'got'
 import { inspectAny, InspectAnyOptions } from '..'
 import {
@@ -172,7 +172,7 @@ export class SlackService<CTX = any> {
 }
 
 export function slackDefaultMessagePrefixHook(msg: SlackMessage): string[] {
-  const tokens = [dayjs().toPretty()]
+  const tokens = [localTime().toPretty()]
   const { ctx } = msg
 
   // AppEngine-specific decoration

package/src/stream/transform/transformLogProgress.ts

@@ -1,7 +1,13 @@
 import { Transform } from 'stream'
 import { inspect, InspectOptions } from 'util'
-import { SimpleMovingAverage, _mb, _since, AnyObject, CommonLogger } from '@naturalcycles/js-lib'
-import { dayjs } from '@naturalcycles/time-lib'
+import {
+  SimpleMovingAverage,
+  _mb,
+  _since,
+  AnyObject,
+  CommonLogger,
+  localTime,
+} from '@naturalcycles/js-lib'
 import { boldWhite, dimGrey, white, yellow } from '../../colors'
 import { hasColors } from '../../colors/colors'
 import { SizeStack } from '../sizeStack'
@@ -255,7 +261,7 @@ export function transformLogProgress<IN = any>(
       }
 
       logger.log(
-        `${dimGrey(dayjs().toPretty())} ${white(metric)} took ${yellow(
+        `${dimGrey(localTime().toPretty())} ${white(metric)} took ${yellow(
           _since(started),
         )} so far to process ${yellow(batchedProgress)} rows, ~${yellow(perHour)}/hour`,
       )

package/src/stream/transform/transformMap.ts

@@ -1,4 +1,5 @@
 import {
+  _anyToError,
   AbortableAsyncMapper,
   AggregatedError,
   AsyncPredicate,
@@ -47,7 +48,7 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
    * If defined - will be called on every error happening in the stream.
    * Called BEFORE observable will emit error (unless skipErrors is set to true).
    */
-  onError?: (err: unknown, input: IN) => any
+  onError?: (err: Error, input: IN) => any
 
   /**
    * Progress metric
@@ -144,7 +145,7 @@ export function transformMap<IN = any, OUT = IN>(
 
         if (onError) {
           try {
-            onError(err, chunk)
+            onError(_anyToError(err), chunk)
           } catch {}
         }
 

package/src/stream/transform/transformMapSync.ts

@@ -1,4 +1,5 @@
 import {
+  _anyToError,
   AggregatedError,
   CommonLogger,
   END,
@@ -42,7 +43,7 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
    * If defined - will be called on every error happening in the stream.
    * Called BEFORE observable will emit error (unless skipErrors is set to true).
    */
-  onError?: (err: unknown, input: IN) => any
+  onError?: (err: Error, input: IN) => any
 
   /**
    * Progress metric
@@ -116,7 +117,7 @@ export function transformMapSync<IN = any, OUT = IN>(
 
         if (onError) {
           try {
-            onError(err, chunk)
+            onError(_anyToError(err), chunk)
           } catch {}
         }
 

package/src/util/lruMemoCache.ts

@@ -1,5 +1,5 @@
 import { MemoCache } from '@naturalcycles/js-lib'
-import LRUCache = require('lru-cache')
+import * as LRUCache from 'lru-cache'
 
 // Partial, to be able to provide default `max`
 export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>

package/src/validation/joi/string.extensions.ts

@@ -1,4 +1,4 @@
-import { dayjs } from '@naturalcycles/time-lib'
+import { LocalDate, localTime } from '@naturalcycles/js-lib'
 import { Extension, StringSchema } from 'joi'
 import * as Joi from 'joi'
 import { AnySchemaTyped } from './joi.model'
@@ -53,10 +53,10 @@ export function stringExtensions(joi: typeof Joi): Extension {
 
           // Today allows +-14 hours gap to account for different timezones
           if (max === 'today') {
-            max = dayjs().add(14, 'hour').toISODate()
+            max = localTime().add(14, 'hour').toISODate()
           }
           if (min === 'today') {
-            min = dayjs().subtract(14, 'hour').toISODate()
+            min = localTime().subtract(14, 'hour').toISODate()
           }
           // console.log('min/max', min, max)
 
@@ -67,7 +67,7 @@ export function stringExtensions(joi: typeof Joi): Extension {
             err = 'string.dateStringMin'
           } else if (max && v > max) {
             err = 'string.dateStringMax'
-          } else if (!dayjs(v).isValid()) {
+          } else if (!LocalDate.isValid(v)) {
             // todo: replace with another regex (from ajv-validators) for speed
             err = 'string.dateStringCalendarAccuracy'
           }