@naturalcycles/nodejs-lib 13.24.0 → 13.25.0

package/dist/csv/csvReader.js

@@ -34,7 +34,7 @@ function csvStringParse(str, cfg = {}) {
 }
 exports.csvStringParse = csvStringParse;
 function csvStringToArray(str) {
-    const objPattern = new RegExp('(,|\\r?\\n|\\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\\r\\n]*))', 'gi');
+    const objPattern = new RegExp(String.raw `(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))`, 'gi');
     let matches;
     const arr = [[]];
     while ((matches = objPattern.exec(str))) {

package/dist/slack/slack.service.js

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

package/dist/stream/progressLogger.js

@@ -103,7 +103,7 @@ class ProgressLogger {
             if (perHour > 900) {
                 perHour = Math.round(perHour / 1000) + 'K';
             }
-            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)(this.started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
+            logger.log(`${(0, colors_1.dimGrey)(js_lib_1.localTime.now().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(this.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)(this.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 fs2_1 = require("../fs/fs2");
 const git_util_1 = require("./git.util");
 function generateBuildInfo(opt = {}) {
-    const now = (0, js_lib_1.localTimeOrNow)(opt.overrideTimestamp);
+    const now = js_lib_1.localTime.orNow(opt.overrideTimestamp);
     const ts = now.unix();
     const rev = (0, git_util_1.gitCurrentCommitSha)();
     const branchName = (0, git_util_1.gitCurrentBranchName)();

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -91,5 +91,6 @@ export declare const SEM_VER_REGEX: RegExp;
 export declare const semVerSchema: StringSchema<string>;
 export declare const userAgentSchema: StringSchema<string>;
 export declare const utcOffsetSchema: NumberSchema<number>;
+export declare const ianaTimezoneSchema: StringSchema<string>;
 export declare const ipAddressSchema: StringSchema<string>;
 export declare const baseDBEntitySchema: ObjectSchema<BaseDBEntity>;

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateIntervalStringSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.baseDBEntitySchema = exports.ipAddressSchema = exports.ianaTimezoneSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateIntervalStringSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const joi_extensions_1 = require("./joi.extensions");
 exports.booleanSchema = joi_extensions_1.Joi.boolean();
@@ -124,6 +124,11 @@ exports.utcOffsetSchema = exports.numberSchema
     .min(-14 * 60)
     .max(14 * 60)
     .dividable(15);
+exports.ianaTimezoneSchema = exports.stringSchema
+    .valid(...Intl.supportedValuesOf('timeZone'))
+    .messages({
+    'any.only': `must be a valid IANA timezone string`,
+});
 exports.ipAddressSchema = exports.stringSchema.ip();
 exports.baseDBEntitySchema = objectSchema({
     id: exports.stringSchema.optional(),

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

@@ -95,7 +95,7 @@ function getTodayStrPlus15() {
         return todayStrPlusCached;
     }
     lastCheckedPlus = now;
-    return (todayStrPlusCached = (0, js_lib_1.localTimeNow)().plus(15, 'hour').toISODate());
+    return (todayStrPlusCached = js_lib_1.localTime.now().plus(15, 'hour').toISODate());
 }
 function getTodayStrMinus15() {
     const now = Date.now();
@@ -104,5 +104,5 @@ function getTodayStrMinus15() {
         return todayStrMinusCached;
     }
     lastCheckedMinus = now;
-    return (todayStrMinusCached = (0, js_lib_1.localTimeNow)().plus(-15, 'hour').toISODate());
+    return (todayStrMinusCached = js_lib_1.localTime.now().plus(-15, 'hour').toISODate());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.24.0",
+  "version": "13.25.0",
   "scripts": {
     "prepare": "husky",
     "docs-serve": "vuepress dev docs",
@@ -34,7 +34,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@naturalcycles/bench-lib": "^2.0.0",
+    "@naturalcycles/bench-lib": "^3.0.0",
     "@naturalcycles/dev-lib": "^13.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",

package/src/csv/csvReader.ts

@@ -56,7 +56,10 @@ export function csvStringParse<T extends AnyObject = any>(
 }
 
 export function csvStringToArray(str: string): string[][] {
-  const objPattern = new RegExp('(,|\\r?\\n|\\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\\r\\n]*))', 'gi')
+  const objPattern = new RegExp(
+    String.raw`(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))`,
+    'gi',
+  )
   let matches: RegExpExecArray | null
   const arr: any[][] = [[]]
 

package/src/slack/slack.service.ts

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

package/src/stream/progressLogger.ts

@@ -4,7 +4,7 @@ import {
   _since,
   AnyObject,
   CommonLogger,
-  localTimeNow,
+  localTime,
   SimpleMovingAverage,
   UnixTimestampMillisNumber,
 } from '@naturalcycles/js-lib'
@@ -294,7 +294,7 @@ export class ProgressLogger<T> implements Disposable {
       }
 
       logger.log(
-        `${dimGrey(localTimeNow().toPretty())} ${white(metric)} took ${yellow(
+        `${dimGrey(localTime.now().toPretty())} ${white(metric)} took ${yellow(
           _since(this.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,
-  localTimeOrNow,
+  localTime,
   UnixTimestampNumber,
 } from '@naturalcycles/js-lib'
 import { fs2 } from '../fs/fs2'
@@ -21,7 +21,7 @@ export interface GenerateBuildInfoOptions {
 }
 
 export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo {
-  const now = localTimeOrNow(opt.overrideTimestamp)
+  const now = localTime.orNow(opt.overrideTimestamp)
   const ts = now.unix()
 
   const rev = gitCurrentCommitSha()

package/src/validation/joi/joi.shared.schemas.ts

@@ -156,6 +156,12 @@ export const utcOffsetSchema = numberSchema
   .max(14 * 60)
   .dividable(15)
 
+export const ianaTimezoneSchema = stringSchema
+  .valid(...Intl.supportedValuesOf('timeZone'))
+  .messages({
+    'any.only': `must be a valid IANA timezone string`,
+  })
+
 export const ipAddressSchema = stringSchema.ip()
 
 export const baseDBEntitySchema: ObjectSchema<BaseDBEntity> = objectSchema<BaseDBEntity>({

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

@@ -1,4 +1,4 @@
-import { localTimeNow } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib'
 import Joi, { Extension, StringSchema as JoiStringSchema } from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
@@ -111,7 +111,7 @@ function getTodayStrPlus15(): string {
   }
 
   lastCheckedPlus = now
-  return (todayStrPlusCached = localTimeNow().plus(15, 'hour').toISODate())
+  return (todayStrPlusCached = localTime.now().plus(15, 'hour').toISODate())
 }
 
 function getTodayStrMinus15(): string {
@@ -122,5 +122,5 @@ function getTodayStrMinus15(): string {
   }
 
   lastCheckedMinus = now
-  return (todayStrMinusCached = localTimeNow().plus(-15, 'hour').toISODate())
+  return (todayStrMinusCached = localTime.now().plus(-15, 'hour').toISODate())
 }