@naturalcycles/nodejs-lib 13.31.1 → 13.33.0

package/dist/util/git2.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.git2 = void 0;
+const tslib_1 = require("tslib");
+const node_child_process_1 = tslib_1.__importDefault(require("node:child_process"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const colors_1 = require("../colors/colors");
+const exec2_1 = require("./exec2");
+/**
+ * Set of utility functions to work with git.
+ */
+class Git2 {
+    getLastGitCommitMsg() {
+        return exec2_1.exec2.exec('git log -1 --pretty=%B');
+    }
+    commitMessageToTitleMessage(msg) {
+        const firstLine = msg.split('\n')[0];
+        const [preTitle, title] = firstLine.split(': ');
+        return title || preTitle;
+    }
+    gitHasUncommittedChanges() {
+        // git diff-index --quiet HEAD -- || echo "untracked"
+        try {
+            node_child_process_1.default.execSync('git diff-index --quiet HEAD --', {
+                encoding: 'utf8',
+            });
+            return false;
+        }
+        catch {
+            return true;
+        }
+    }
+    /**
+     * Returns true if there were changes
+     */
+    gitCommitAll(msg) {
+        // git commit -a -m "style(lint-all): $GIT_MSG" || true
+        const cmd = `git commit -a --no-verify -m "${msg}"`;
+        // const cmd = `git`
+        // const args = ['commit', '-a', '--no-verify', '-m', msg]
+        console.log((0, colors_1.grey)(cmd));
+        try {
+            node_child_process_1.default.execSync(cmd, {
+                stdio: 'inherit',
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * @returns true if there are not pushed commits.
+     */
+    gitIsAhead() {
+        // ahead=`git rev-list HEAD --not --remotes | wc -l | awk '{print $1}'`
+        const cmd = `git rev-list HEAD --not --remotes | wc -l | awk '{print $1}'`;
+        const stdout = exec2_1.exec2.exec(cmd);
+        // console.log(`gitIsAhead: ${stdout}`)
+        return Number(stdout) > 0;
+    }
+    gitPull() {
+        const cmd = 'git pull';
+        try {
+            node_child_process_1.default.execSync(cmd, {
+                stdio: 'inherit',
+            });
+        }
+        catch { }
+    }
+    gitPush() {
+        // git push --set-upstream origin $CIRCLE_BRANCH && echo "pushed, exiting" && exit 0
+        let cmd = 'git push';
+        const branchName = this.gitCurrentBranchName();
+        if (branchName) {
+            cmd += ` --set-upstream origin ${branchName}`;
+        }
+        exec2_1.exec2.spawn(cmd, { logStart: true });
+    }
+    gitCurrentCommitSha(full = false) {
+        const sha = exec2_1.exec2.exec('git rev-parse HEAD');
+        return full ? sha : sha.slice(0, 7);
+    }
+    gitCurrentCommitTimestamp() {
+        return Number(exec2_1.exec2.exec('git log -1 --format=%ct'));
+    }
+    gitCurrentBranchName() {
+        return exec2_1.exec2.exec('git rev-parse --abbrev-ref HEAD');
+    }
+    gitCurrentRepoName() {
+        const originUrl = exec2_1.exec2.exec('git config --get remote.origin.url');
+        return node_path_1.default.basename(originUrl, '.git');
+    }
+}
+exports.git2 = new Git2();

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

@@ -1,4 +1,5 @@
-import Joi, { Extension, NumberSchema as JoiNumberSchema } from 'joi';
+import type 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,4 +1,5 @@
-import Joi, { Extension, StringSchema as JoiStringSchema } from 'joi';
+import type Joi from 'joi';
+import { Extension, StringSchema as JoiStringSchema } 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.31.1",
+  "version": "13.33.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -39,9 +39,10 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.8.3",
     "@naturalcycles/bench-lib": "^3.0.0",
     "@naturalcycles/dev-lib": "^15.0.3",
-    "@types/node": "^20.1.0",
+    "@types/node": "^22.1.0",
     "@types/yargs": "^16.0.0",
     "jest": "^29.0.0"
   },

package/src/csv/csvReader.ts

@@ -56,10 +56,7 @@ export function csvStringParse<T extends AnyObject = any>(
 }
 
 export function csvStringToArray(str: string): string[][] {
-  const objPattern = new RegExp(
-    String.raw`(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))`,
-    'gi',
-  )
+  const objPattern = /(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))/gi
   let matches: RegExpExecArray | null
   const arr: any[][] = [[]]
 
@@ -67,9 +64,7 @@ export function csvStringToArray(str: string): string[][] {
     if (matches[1]!.length && matches[1] !== ',') {
       arr.push([])
     }
-    arr[arr.length - 1]!.push(
-      matches[2] ? matches[2].replaceAll(new RegExp('""', 'g'), '"') : matches[3],
-    )
+    arr[arr.length - 1]!.push(matches[2] ? matches[2].replaceAll('""', '"') : matches[3])
   }
   return arr
 }

package/src/fs/fs2.ts

@@ -14,7 +14,7 @@ Credit to: fs-extra (https://github.com/jprichardson/node-fs-extra)
 
  */
 
-import type { RmOptions } from 'node:fs'
+import type { RmOptions, Stats } from 'node:fs'
 import fs from 'node:fs'
 import fsp from 'node:fs/promises'
 import path from 'node:path'
@@ -182,7 +182,7 @@ class FS2 {
   }
 
   ensureFile(filePath: string): void {
-    let stats
+    let stats: Stats | undefined
     try {
       stats = fs.statSync(filePath)
     } catch {}
@@ -197,7 +197,10 @@ class FS2 {
       }
     } catch (err) {
       // If the stat call above failed because the directory doesn't exist, create it
-      if ((err as any)?.code === 'ENOENT') return this.ensureDir(dir)
+      if ((err as any)?.code === 'ENOENT') {
+        this.ensureDir(dir)
+        return
+      }
       throw err
     }
 
@@ -205,7 +208,7 @@ class FS2 {
   }
 
   async ensureFileAsync(filePath: string): Promise<void> {
-    let stats
+    let stats: Stats | undefined
     try {
       stats = await fsp.stat(filePath)
     } catch {}
@@ -236,18 +239,19 @@ class FS2 {
   }
 
   emptyDir(dirPath: string): void {
-    let items
+    let items: string[]
     try {
       items = fs.readdirSync(dirPath)
     } catch {
-      return this.ensureDir(dirPath)
+      this.ensureDir(dirPath)
+      return
     }
 
     items.forEach(item => this.removePath(path.join(dirPath, item)))
   }
 
   async emptyDirAsync(dirPath: string): Promise<void> {
-    let items
+    let items: string[]
     try {
       items = await fsp.readdir(dirPath)
     } catch {

package/src/index.ts

@@ -72,8 +72,8 @@ export * from './stream/writable/writableVoid'
 export * from './string/inspect'
 export * from './util/buildInfo.util'
 export * from './util/env.util'
-export * from './util/exec.util'
-export * from './util/git.util'
+export * from './util/exec2'
+export * from './util/git2'
 export * from './util/lruMemoCache'
 export * from './util/zip.util'
 export * from './validation/ajv/ajv.util'

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

@@ -37,7 +37,7 @@ export function secretsDecrypt(
   const filenames = fastGlob.sync(patterns)
 
   filenames.forEach(filename => {
-    let plainFilename
+    let plainFilename: string
 
     if (jsonMode) {
       _assert(filename.endsWith('.json'), `${path.basename(filename)} MUST end with '.json'`)

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

@@ -31,7 +31,7 @@ export function secretsEncrypt(
         `!**/*.enc`, // excluding already encoded
       ]
   const filenames = fastGlob.sync(patterns)
-  let encFilename
+  let encFilename: string
 
   filenames.forEach(filename => {
     if (jsonMode) {

package/src/slack/slack.service.ts

@@ -92,7 +92,7 @@ export class SlackService<CTX = any> {
     if (msg.kv) {
       ;(msg.attachments ||= []).push({ fields: this.kvToFields(msg.kv) })
 
-      delete msg.kv // to not pass it all the way to Slack Api
+      msg.kv = undefined // to not pass it all the way to Slack Api
     }
 
     let text: string
@@ -135,9 +135,8 @@ export class SlackService<CTX = any> {
         // ignore (unless throwOnError is set)
         if (msg.throwOnError) {
           throw err
-        } else {
-          console.log(err)
         }
+        console.log(err)
       })
   }
 

package/src/stream/ndjson/transformJsonParse.ts

@@ -55,7 +55,7 @@ export function transformJsonParse<ROW = any>(
 }
 
 // Based on: https://stackoverflow.com/a/34557997/4919972
-export const bufferReviver: Reviver = (k, v) => {
+export const bufferReviver: Reviver = (_k, v) => {
   if (v !== null && typeof v === 'object' && v.type === 'Buffer' && Array.isArray(v.data)) {
     return Buffer.from(v.data)
   }

package/src/stream/stream.model.ts

@@ -45,7 +45,7 @@ export interface ReadableTyped<T> extends Readable {
   drop: (limit: number, opt?: ReadableSignalOptions) => ReadableTyped<T>
 }
 
-// eslint-disable-next-line unused-imports/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: ok
 export interface WritableTyped<T> extends Writable {}
 
 /**
@@ -59,7 +59,7 @@ export type ReadableBinary = Readable
  */
 export type WritableBinary = Writable
 
-// eslint-disable-next-line unused-imports/no-unused-vars
+// biome-ignore lint/correctness/noUnusedVariables: ok
 export interface TransformTyped<IN, OUT> extends Transform {}
 
 export interface TransformOptions {

package/src/stream/transform/transformMap.ts

@@ -40,10 +40,12 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
   /**
    * Number of concurrently pending promises returned by `mapper`.
    *
-   * Default is 32.
+   * Default is 16.
    * It was recently changed up from 16, after some testing that shown that
    * for simple low-cpu mapper functions 32 produces almost 2x throughput.
    * For example, in scenarios like streaming a query from Datastore.
+   * UPD: changed back from 32 to 16, "to be on a safe side", as 32 sometimes
+   * causes "Datastore timeout errors".
    */
   concurrency?: number
 
@@ -120,7 +122,7 @@ export interface TransformMapStatsSummary extends TransformMapStats {
  *
  * Only works in objectMode (due to through2Concurrent).
  *
- * Concurrency defaults to 32.
+ * Concurrency defaults to 16.
  *
  * If an Array is returned by `mapper` - it will be flattened and multiple results will be emitted from it. Tested by Array.isArray().
  */
@@ -129,7 +131,7 @@ export function transformMap<IN = any, OUT = IN>(
   opt: TransformMapOptions<IN, OUT> = {},
 ): TransformTyped<IN, OUT> {
   const {
-    concurrency = 32,
+    concurrency = 16,
     predicate, // we now default to "no predicate" (meaning pass-everything)
     errorMode = ErrorMode.THROW_IMMEDIATELY,
     flattenArrayOutput,

package/src/stream/transform/transformSplit.ts

@@ -18,7 +18,7 @@ export function transformSplitOnNewline(): TransformTyped<Buffer, Buffer> {
     readableObjectMode: true,
     writableHighWaterMark: 64 * 1024,
 
-    transform(buf: Buffer, enc, done) {
+    transform(buf: Buffer, _enc, done) {
       let offset = 0
       let lastMatch = 0
       if (buffered) {
@@ -66,7 +66,7 @@ export function transformSplit(separator = '\n'): TransformTyped<Buffer, Buffer>
     readableObjectMode: true,
     writableHighWaterMark: 64 * 1024,
 
-    transform(buf: Buffer, enc, done) {
+    transform(buf: Buffer, _enc, done) {
       let offset = 0
       let lastMatch = 0
       if (buffered) {
@@ -119,7 +119,7 @@ function firstNewlineMatch(buf: Buffer, offset: number): number {
 
 function firstMatch(buf: Buffer, offset: number, matcher: Buffer): number {
   if (offset >= buf.length) return -1
-  let i
+  let i: number
   for (i = offset; i < buf.length; i++) {
     if (buf[i] === matcher[0]) {
       if (matcher.length > 1) {

package/src/stream/transform/worker/workerClassProxy.js

@@ -1,6 +1,6 @@
 const started = Date.now()
-const { workerData, parentPort } = require('worker_threads')
-const { inspect } = require('util')
+const { workerData, parentPort } = require('node:worker_threads')
+const { inspect } = require('node:util')
 const { workerFile, workerIndex, logEvery = 1000, metric = 'worker' } = workerData || {}
 
 if (!workerFile) {

package/src/stream/writable/writableLimit.ts

@@ -11,7 +11,7 @@ export function writableLimit<T>(readable: Readable, limit: number): WritableTyp
 
   return new Writable({
     objectMode: true,
-    write(chunk, _, cb) {
+    write(_chunk, _, cb) {
       if (limit === 0) return cb() // no limit, just passthrough
 
       i++

package/src/stream/writable/writableVoid.ts

@@ -18,7 +18,7 @@ export function writableVoid(opt: WritableVoidOptions = {}): Writable {
   return new Writable({
     objectMode: true,
     ...opt,
-    write(chunk, _, cb) {
+    write(_chunk, _, cb) {
       cb()
     },
     final(cb) {

package/src/util/buildInfo.util.ts

@@ -6,12 +6,7 @@ import {
   UnixTimestampNumber,
 } from '@naturalcycles/js-lib'
 import { fs2 } from '../fs/fs2'
-import {
-  gitCurrentBranchName,
-  gitCurrentCommitSha,
-  gitCurrentCommitTimestamp,
-  gitCurrentRepoName,
-} from './git.util'
+import { git2 } from './git2'
 
 export interface GenerateBuildInfoOptions {
   /**
@@ -24,10 +19,10 @@ export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo
   const now = localTime.orNow(opt.overrideTimestamp)
   const ts = now.unix
 
-  const rev = gitCurrentCommitSha()
-  const branchName = gitCurrentBranchName()
-  const repoName = gitCurrentRepoName()
-  const tsCommit = gitCurrentCommitTimestamp()
+  const rev = git2.gitCurrentCommitSha()
+  const branchName = git2.gitCurrentBranchName()
+  const repoName = git2.gitCurrentRepoName()
+  const tsCommit = git2.gitCurrentCommitTimestamp()
 
   const ver = [now.toStringCompact(), repoName, branchName, rev].join('_')