@naturalcycles/nodejs-lib 13.1.1 → 13.1.3

package/dist/secret/secrets-decrypt.util.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretsDecrypt = void 0;
 const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("../colors/colors");
 const index_1 = require("../index");

package/dist/slack/slack.service.js

@@ -130,7 +130,7 @@ class SlackService {
 }
 exports.SlackService = SlackService;
 function slackDefaultMessagePrefixHook(msg) {
-    const tokens = [(0, js_lib_1.localTime)().toPretty()];
+    const tokens = [(0, js_lib_1.localTimeNow)().toPretty()];
     const { ctx } = msg;
     // AppEngine-specific decoration
     if (GAE && ctx && typeof ctx === 'object' && typeof ctx.header === 'function') {

package/dist/stream/ndjson/pipelineFromNDJsonFile.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipelineFromNDJsonFile = void 0;
 const tslib_1 = require("tslib");
-const node_zlib_1 = require("node:zlib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("../..");
 const colors_1 = require("../../colors/colors");

package/dist/stream/ndjson/pipelineToNDJsonFile.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipelineToNDJsonFile = void 0;
 const tslib_1 = require("tslib");
-const node_zlib_1 = require("node:zlib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_zlib_1 = require("node:zlib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("../..");
 const colors_1 = require("../../colors/colors");

package/dist/stream/transform/transformLogProgress.js

@@ -56,7 +56,7 @@ function transformLogProgress(opt = {}) {
         const rpsTotal = Math.round(batchedProgress / ((now - started) / 1000)) || 0;
         lastSecondStarted = now;
         processedLastSecond = 0;
-        const rps10 = Math.round(sma.push(lastRPS));
+        const rps10 = Math.round(sma.pushGetAvg(lastRPS));
         if (mem.rss > peakRSS)
             peakRSS = mem.rss;
         const o = {
@@ -92,7 +92,7 @@ function transformLogProgress(opt = {}) {
             if (perHour > 900) {
                 perHour = Math.round(perHour / 1000) + 'K';
             }
-            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`);
+            logger.log(`${(0, colors_1.dimGrey)((0, js_lib_1.localTimeNow)().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/util/buildInfo.util.js

@@ -5,7 +5,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const fs_util_1 = require("../fs/fs.util");
 const git_util_1 = require("./git.util");
 function generateBuildInfo(opt = {}) {
-    const now = (0, js_lib_1.localTime)(opt.overrideTimestamp);
+    const now = (0, js_lib_1.localTimeOrNow)(opt.overrideTimestamp);
     const ts = now.unix();
     const rev = (0, git_util_1.gitCurrentCommitSha)();
     const branchName = (0, git_util_1.gitCurrentBranchName)();

package/dist/validation/joi/number.extensions.d.ts

@@ -1,5 +1,4 @@
-import Joi from 'joi';
-import { Extension, NumberSchema as JoiNumberSchema } from 'joi';
+import Joi, { Extension, NumberSchema as JoiNumberSchema } from 'joi';
 export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {
     dividable: (q: number) => this;
 }

package/dist/validation/joi/string.extensions.d.ts

@@ -1,5 +1,4 @@
-import { Extension, StringSchema as JoiStringSchema } from 'joi';
-import Joi from 'joi';
+import Joi, { Extension, StringSchema as JoiStringSchema } from 'joi';
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
     dateString: (min?: string, max?: string) => this;
 }

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

@@ -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, js_lib_1.localTime)().add(14, 'hour').toISODate();
+                        max = (0, js_lib_1.localTimeNow)().add(14, 'hour').toISODate();
                     }
                     if (min === 'today') {
-                        min = (0, js_lib_1.localTime)().subtract(14, 'hour').toISODate();
+                        min = (0, js_lib_1.localTimeNow)().subtract(14, 'hour').toISODate();
                     }
                     // console.log('min/max', min, max)
                     const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.1.1",
+  "version": "13.1.3",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -38,12 +38,7 @@
     "@naturalcycles/dev-lib": "^13.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",
-    "jest": "^29.0.0",
-    "nock": "^13.0.2",
-    "prettier": "^3.0.0",
-    "vue-class-component": "^7.2.6",
-    "vuepress": "^1.7.1",
-    "vuepress-plugin-typescript": "^0.3.1"
+    "jest": "^29.0.0"
   },
   "bin": {
     "del": "dist/bin/del.js",

package/src/secret/secrets-decrypt.util.ts

@@ -1,5 +1,5 @@
-import path from 'node:path'
 import fs from 'node:fs'
+import path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'

package/src/slack/slack.service.ts

@@ -6,7 +6,7 @@ import {
   CommonLogLevel,
   Fetcher,
   getFetcher,
-  localTime,
+  localTimeNow,
   PQueue,
 } from '@naturalcycles/js-lib'
 import { inspectAny, InspectAnyOptions } from '..'
@@ -180,7 +180,7 @@ export class SlackService<CTX = any> {
 }
 
 export function slackDefaultMessagePrefixHook(msg: SlackMessage): string[] {
-  const tokens = [localTime().toPretty()]
+  const tokens = [localTimeNow().toPretty()]
   const { ctx } = msg
 
   // AppEngine-specific decoration

package/src/stream/ndjson/pipelineFromNDJsonFile.ts

@@ -1,5 +1,5 @@
-import { createUnzip, ZlibOptions } from 'node:zlib'
 import fs from 'node:fs'
+import { createUnzip, ZlibOptions } from 'node:zlib'
 import { _hb } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, transformSplit } from '../..'
 import { dimWhite, grey } from '../../colors/colors'

package/src/stream/ndjson/pipelineToNDJsonFile.ts

@@ -1,5 +1,5 @@
-import { createGzip, ZlibOptions } from 'node:zlib'
 import fs from 'node:fs'
+import { createGzip, ZlibOptions } from 'node:zlib'
 import { AppError } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, _pathExistsSync, _ensureFileSync } from '../..'
 import { grey } from '../../colors/colors'

package/src/stream/transform/transformLogProgress.ts

@@ -6,7 +6,7 @@ import {
   _since,
   AnyObject,
   CommonLogger,
-  localTime,
+  localTimeNow,
 } from '@naturalcycles/js-lib'
 import { hasColors, boldWhite, dimGrey, white, yellow } from '../../colors/colors'
 import { SizeStack } from '../sizeStack'
@@ -224,7 +224,7 @@ export function transformLogProgress<IN = any>(
     lastSecondStarted = now
     processedLastSecond = 0
 
-    const rps10 = Math.round(sma.push(lastRPS))
+    const rps10 = Math.round(sma.pushGetAvg(lastRPS))
     if (mem.rss > peakRSS) peakRSS = mem.rss
 
     const o: LogItem = {
@@ -260,7 +260,7 @@ export function transformLogProgress<IN = any>(
       }
 
       logger.log(
-        `${dimGrey(localTime().toPretty())} ${white(metric)} took ${yellow(
+        `${dimGrey(localTimeNow().toPretty())} ${white(metric)} took ${yellow(
           _since(started),
         )} so far to process ${yellow(batchedProgress)} rows, ~${yellow(perHour)}/hour`,
       )

package/src/util/buildInfo.util.ts

@@ -2,7 +2,7 @@ import {
   _filterUndefinedValues,
   AnyObject,
   BuildInfo,
-  localTime,
+  localTimeOrNow,
   UnixTimestampNumber,
 } from '@naturalcycles/js-lib'
 import { _pathExistsSync, _readJsonSync } from '../fs/fs.util'
@@ -21,7 +21,7 @@ export interface GenerateBuildInfoOptions {
 }
 
 export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo {
-  const now = localTime(opt.overrideTimestamp)
+  const now = localTimeOrNow(opt.overrideTimestamp)
   const ts = now.unix()
 
   const rev = gitCurrentCommitSha()

package/src/util/zip.util.ts

@@ -1,6 +1,5 @@
 import { promisify } from 'node:util'
-import { ZlibOptions } from 'node:zlib'
-import zlib from 'node:zlib'
+import zlib, { ZlibOptions } from 'node:zlib'
 
 const deflate = promisify(zlib.deflate.bind(zlib))
 const inflate = promisify(zlib.inflate.bind(zlib))

package/src/validation/joi/joi.validation.util.ts

@@ -84,7 +84,7 @@ export function getValidationResult<T>(
   })
 
   const vr: JoiValidationResult<T> = {
-    value: returnValue!,
+    value: returnValue,
   }
 
   if (error) {
@@ -120,7 +120,7 @@ export function undefinedIfInvalid<T>(value: T, schema?: AnySchema<T>): T | unde
 export function convert<T>(value: T, schema?: AnySchema<T>): T {
   if (!schema) return value as any
   const { value: returnValue } = schema.validate(value, defaultOptions)
-  return returnValue!
+  return returnValue
 }
 
 function createError(value: any, err: ValidationError, objectName?: string): JoiValidationError {

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

@@ -1,5 +1,4 @@
-import Joi from 'joi'
-import { Extension, NumberSchema as JoiNumberSchema } from 'joi'
+import Joi, { Extension, NumberSchema as JoiNumberSchema } from 'joi'
 
 export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {
   dividable: (q: number) => this

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

@@ -1,6 +1,5 @@
-import { LocalDate, localTime } from '@naturalcycles/js-lib'
-import { Extension, StringSchema as JoiStringSchema } from 'joi'
-import Joi from 'joi'
+import { LocalDate, localTimeNow } from '@naturalcycles/js-lib'
+import Joi, { Extension, StringSchema as JoiStringSchema } from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
   dateString: (min?: string, max?: string) => this
@@ -52,10 +51,10 @@ export function stringExtensions(joi: typeof Joi): Extension {
 
           // Today allows +-14 hours gap to account for different timezones
           if (max === 'today') {
-            max = localTime().add(14, 'hour').toISODate()
+            max = localTimeNow().add(14, 'hour').toISODate()
           }
           if (min === 'today') {
-            min = localTime().subtract(14, 'hour').toISODate()
+            min = localTimeNow().subtract(14, 'hour').toISODate()
           }
           // console.log('min/max', min, max)