@naturalcycles/nodejs-lib 13.1.0 → 13.1.2

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Joi = void 0;
-const JoiLib = require("joi");
+const tslib_1 = require("tslib");
+const joi_1 = tslib_1.__importDefault(require("joi"));
 const number_extensions_1 = require("./number.extensions");
 const string_extensions_1 = require("./string.extensions");
 /**
  * This is the only right place to import Joi from
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-exports.Joi = JoiLib.defaults(schema => {
+exports.Joi = joi_1.default.defaults(schema => {
     // hack to prevent infinite recursion due to .empty('') where '' is a stringSchema itself
     if (schema.type === 'string') {
         return (schema

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.1.0",
+  "version": "13.1.2",
   "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/bin/del.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { delSync } from '../fs/del'
 import { runScript } from '../script/runScript'
 

package/src/bin/generate-build-info.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import * as fs from 'node:fs'
-import * as path from 'node:path'
-import * as yargs from 'yargs'
+import fs from 'node:fs'
+import path from 'node:path'
+import yargs from 'yargs'
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env'
 import { runScript } from '../script/runScript'
 import { generateBuildInfo } from '../util/buildInfo.util'

package/src/bin/json2env.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { json2env } from '../fs/json2env'
 import { runScript } from '../script/runScript'
 

package/src/bin/kpy.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { kpySync } from '../fs/kpy'
 import { runScript } from '../script/runScript'
 

package/src/bin/secrets-decrypt.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 import { DecryptCLIOptions, secretsDecrypt } from '../secret/secrets-decrypt.util'

package/src/bin/secrets-encrypt.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 import { EncryptCLIOptions, secretsEncrypt } from '../secret/secrets-encrypt.util'

package/src/bin/secrets-gen-key.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import * as crypto from 'node:crypto'
-import * as yargs from 'yargs'
+import crypto from 'node:crypto'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 

package/src/bin/slack-this.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { SlackService } from '..'
 import { runScript } from '../script/runScript'
 

package/src/colors/colors.ts

@@ -1,5 +1,5 @@
-import * as tty from 'node:tty'
-import * as chalk from 'chalk'
+import tty from 'node:tty'
+import chalk from 'chalk'
 
 export { chalk }
 

package/src/fs/del.ts

@@ -1,5 +1,5 @@
-import * as fs from 'node:fs'
-import * as fsp from 'node:fs/promises'
+import fs from 'node:fs'
+import fsp from 'node:fs/promises'
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { _pathExists, _pathExistsSync, globby } from '../index'

package/src/fs/fs.util.ts

@@ -14,9 +14,9 @@ Credit to: fs-extra (https://github.com/jprichardson/node-fs-extra)
 
  */
 
-import * as fs from 'node:fs'
-import * as fsp from 'node:fs/promises'
-import * as path from 'node:path'
+import fs from 'node:fs'
+import fsp from 'node:fs/promises'
+import path from 'node:path'
 import { _jsonParse } from '@naturalcycles/js-lib'
 
 /**

package/src/fs/json2env.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { AnyObject } from '@naturalcycles/js-lib'
 import { dimGrey } from '../colors/colors'
 import { _pathExistsSync, _readJsonSync, _writeFileSync } from './fs.util'

package/src/fs/kpy.ts

@@ -1,4 +1,4 @@
-import * as path from 'node:path'
+import path from 'node:path'
 import { _since } from '@naturalcycles/js-lib'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors'
 import {

package/src/index.ts

@@ -1,7 +1,7 @@
 import Ajv from 'ajv'
-import * as fastGlob from 'fast-glob'
+import fastGlob from 'fast-glob'
 import type { Options as FastGlobOptions } from 'fast-glob'
-import * as globby from 'globby'
+import globby from 'globby'
 import type { GlobbyOptions } from 'globby'
 import type {
   AnySchema,

package/src/infra/process.util.ts

@@ -1,4 +1,4 @@
-import * as os from 'node:os'
+import os from 'node:os'
 import { _mb } from '@naturalcycles/js-lib'
 
 export function memoryUsage(): {

package/src/jwt/jwt.service.ts

@@ -1,7 +1,7 @@
 import { _assert, _errorDataAppend, AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
 import { AnySchema } from 'joi'
 import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken'
-import * as jsonwebtoken from 'jsonwebtoken'
+import jsonwebtoken from 'jsonwebtoken'
 import { anyObjectSchema } from '../validation/joi/joi.shared.schemas'
 import { validate } from '../validation/joi/joi.validation.util'
 export { jsonwebtoken }

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

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

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

@@ -1,5 +1,5 @@
-import * as fs from 'node:fs'
-import * as 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/security/crypto.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import { _stringMapEntries, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { md5AsBuffer, sha256AsBuffer } from './hash.util'
 

package/src/security/hash.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import { Base64String } from '@naturalcycles/js-lib'
 
 export function md5(s: string | Buffer): string {

package/src/security/id.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import {
   ALPHABET_ALPHANUMERIC,
   ALPHABET_ALPHANUMERIC_LOWERCASE,

package/src/security/secret.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _assert, _jsonParseIfPossible, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { decryptObject, decryptRandomIVBuffer } from './crypto.util'
 

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { createUnzip } from 'node:zlib'
 import { AbortableAsyncMapper, ErrorMode } from '@naturalcycles/js-lib'
 import {

package/src/stream/ndjson/pipelineFromNDJsonFile.ts

@@ -1,5 +1,5 @@
 import { createUnzip, ZlibOptions } from 'node:zlib'
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 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 * as fs from 'node:fs'
+import fs from 'node:fs'
 import { AppError } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, _pathExistsSync, _ensureFileSync } from '../..'
 import { grey } from '../../colors/colors'

package/src/stream/transform/transformLogProgress.ts

@@ -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 = {

package/src/util/env.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import type { ValuesOf } from '@naturalcycles/js-lib'
 import 'dotenv/config' // ensure .env is read before requiring keys
 

package/src/util/exec.util.ts

@@ -1,5 +1,5 @@
 import type { ProcessEnvOptions, SpawnOptions } from 'node:child_process'
-import * as cp from 'node:child_process'
+import cp from 'node:child_process'
 
 export async function execVoidCommand(
   cmd: string,

package/src/util/git.util.ts

@@ -1,5 +1,5 @@
-import * as cp from 'node:child_process'
-import * as path from 'node:path'
+import cp from 'node:child_process'
+import path from 'node:path'
 import type { UnixTimestampNumber } from '@naturalcycles/js-lib'
 import { grey } from '../colors/colors'
 

package/src/util/zip.util.ts

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

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

@@ -1,4 +1,4 @@
-import * as JoiLib from 'joi'
+import JoiLib from 'joi'
 import { NumberSchema, numberExtensions } from './number.extensions'
 import { StringSchema, stringExtensions } from './string.extensions'
 

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

@@ -1,4 +1,4 @@
-import * as Joi from 'joi'
+import Joi from 'joi'
 import { Extension, NumberSchema as JoiNumberSchema } from 'joi'
 
 export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {

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

@@ -1,6 +1,6 @@
 import { LocalDate, localTime } from '@naturalcycles/js-lib'
 import { Extension, StringSchema as JoiStringSchema } from 'joi'
-import * as Joi from 'joi'
+import Joi from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
   dateString: (min?: string, max?: string) => this