@naturalcycles/nodejs-lib 14.0.1 → 14.1.0

package/dist/bin/generate-build-info.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
 import path from 'node:path';
-import yargs from 'yargs';
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js';
 import { runScript } from '../script/runScript.js';
 import { generateBuildInfo } from '../util/buildInfo.util.js';
+import { _yargs } from '../yargs.util.js';
 runScript(async () => {
-    const { dir, overrideTimestamp } = yargs.options({
+    const { dir, overrideTimestamp } = _yargs().options({
         dir: {
             type: 'string',
             desc: 'Output directory',

package/dist/bin/json2env.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
-import yargs from 'yargs';
 import { json2env } from '../fs/json2env.js';
 import { runScript } from '../script/runScript.js';
+import { _yargs } from '../yargs.util.js';
 runScript(() => {
-    const { argv } = yargs.demandCommand(1).options({
+    const { argv } = _yargs()
+        .demandCommand(1)
+        .options({
         prefix: {
             type: 'string',
         },

package/dist/bin/kpy.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
-import yargs from 'yargs';
 import { kpySync } from '../fs/kpy.js';
 import { runScript } from '../script/runScript.js';
+import { _yargs } from '../yargs.util.js';
 runScript(() => {
-    const { _: [baseDir, ...inputPatterns], ...opt } = yargs.demandCommand(2).options({
+    const { _: [baseDir, ...inputPatterns], ...opt } = _yargs()
+        .demandCommand(2)
+        .options({
         silent: {
             type: 'boolean',
             desc: 'Suppress all text output',

package/dist/bin/secrets-gen-key.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { randomBytes } from 'node:crypto';
-import yargs from 'yargs';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
+import { _yargs } from '../yargs.util.js';
 runScript(() => {
-    const { sizeBytes } = yargs.option('sizeBytes', {
+    const { sizeBytes } = _yargs().option('sizeBytes', {
         type: 'number',
         default: 256,
     }).argv;

package/dist/bin/slack-this.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
-import yargs from 'yargs';
-import { SlackService } from '../index.js';
+import { _yargs, SlackService } from '../index.js';
 import { runScript } from '../script/runScript.js';
 runScript(async () => {
-    const { channel, msg, username, emoji, webhook: webhookUrl, } = yargs.options({
+    const { channel, msg, username, emoji, webhook: webhookUrl, } = _yargs().options({
         channel: {
             type: 'string',
             demandOption: true,

package/dist/fs/kpy.js

@@ -1,11 +1,12 @@
 import path from 'node:path';
 import { _since, localTime } from '@naturalcycles/js-lib';
+import { glob, globSync } from 'tinyglobby';
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors.js';
-import { fastGlob, fs2 } from '../index.js';
+import { fs2 } from './fs2.js';
 export async function kpy(opt) {
     const started = localTime.nowUnixMillis();
     kpyPrepare(opt);
-    const filenames = await fastGlob(opt.inputPatterns, {
+    const filenames = await glob(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });
@@ -34,7 +35,7 @@ export async function kpy(opt) {
 export function kpySync(opt) {
     const started = localTime.nowUnixMillis();
     kpyPrepare(opt);
-    const filenames = fastGlob.sync(opt.inputPatterns, {
+    const filenames = globSync(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import Ajv from 'ajv';
-import type { Options as FastGlobOptions } from 'fast-glob';
-import fastGlob from 'fast-glob';
+export { glob, globSync } from 'tinyglobby';
 import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
 export * from './buffer/buffer.util.js';
 export * from './colors/colors.js';
@@ -73,5 +72,5 @@ export * from './validation/joi/joi.validation.error.js';
 export * from './validation/joi/joi.validation.util.js';
 export type { StringSchema } from './validation/joi/string.extensions.js';
 export * from './yargs.util.js';
-export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FastGlobOptions, FunctionSchema, ObjectSchema, ValidationErrorItem, };
-export { Ajv, fastGlob };
+export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem, };
+export { Ajv };

package/dist/index.js

@@ -1,5 +1,5 @@
 import Ajv from 'ajv';
-import fastGlob from 'fast-glob';
+export { glob, globSync } from 'tinyglobby';
 export * from './buffer/buffer.util.js';
 export * from './colors/colors.js';
 export * from './csv/csvReader.js';
@@ -70,4 +70,4 @@ export * from './validation/joi/joi.shared.schemas.js';
 export * from './validation/joi/joi.validation.error.js';
 export * from './validation/joi/joi.validation.util.js';
 export * from './yargs.util.js';
-export { Ajv, fastGlob };
+export { Ajv };

package/dist/log/log.util.js

@@ -1,5 +1,5 @@
 import { commonLoggerCreate } from '@naturalcycles/js-lib';
-import { _inspect } from '../index.js';
+import { _inspect } from '../string/inspect.js';
 /**
  * CommonLogger that logs to process.stdout directly (bypassing console.log).
  */

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

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { _assert } from '@naturalcycles/js-lib';
+import { globSync } from 'tinyglobby';
 import { dimGrey, yellow } from '../colors/colors.js';
-import { fastGlob, fs2 } from '../index.js';
+import { fs2 } from '../fs/fs2.js';
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util.js';
 // Debug it like this:
 // yarn tsx scripts/./src/bin/secrets-encrypt.ts --file ./src/test/secrets2.plain.json --jsonMode --encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
@@ -16,7 +17,7 @@ import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util.js
 export function secretsDecrypt(dir, file, encKeyBuffer, del = false, jsonMode = false) {
     // If `file` is provided - only this one file is used
     const patterns = file ? [file] : dir.map(d => `${d}/**/*.enc`);
-    const filenames = fastGlob.sync(patterns);
+    const filenames = globSync(patterns);
     filenames.forEach(filename => {
         let plainFilename;
         if (jsonMode) {

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

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { _assert } from '@naturalcycles/js-lib';
+import { globSync } from 'tinyglobby';
 import { dimGrey, yellow } from '../colors/colors.js';
-import { fastGlob, fs2 } from '../index.js';
+import { fs2 } from '../fs/fs2.js';
 import { encryptObject, encryptRandomIVBuffer } from '../security/crypto.util.js';
 /**
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
@@ -15,7 +16,7 @@ export function secretsEncrypt(pattern, file, encKeyBuffer, del = false, jsonMod
             ...pattern,
             `!**/*.enc`, // excluding already encoded
         ];
-    const filenames = fastGlob.sync(patterns);
+    const filenames = globSync(patterns);
     let encFilename;
     filenames.forEach(filename => {
         if (jsonMode) {

package/dist/validation/ajv/ajv.util.d.ts

@@ -1,5 +1,5 @@
 import type { JsonSchema } from '@naturalcycles/js-lib';
-import type { FastGlobOptions } from '../../index.js';
+import type { GlobOptions } from 'tinyglobby';
 import type { AjvSchemaCfg } from './ajvSchema.js';
 import { AjvSchema } from './ajvSchema.js';
 /**
@@ -10,7 +10,7 @@ import { AjvSchema } from './ajvSchema.js';
  *
  * @experimental
  */
-export declare function readJsonSchemas(patterns: string | string[], opt?: FastGlobOptions): JsonSchema[];
+export declare function readJsonSchemas(patterns: string | string[], opt?: Omit<GlobOptions, 'patterns'>): JsonSchema[];
 /**
  * Reads json schemas from given dir (glob pattern).
  * Creates new AjvSchema for each of them (ajv validates them upon creation).

package/dist/validation/ajv/ajv.util.js

@@ -1,4 +1,5 @@
-import { fastGlob, fs2 } from '../../index.js';
+import { globSync } from 'tinyglobby';
+import { fs2 } from '../../fs/fs2.js';
 import { AjvSchema } from './ajvSchema.js';
 /**
  * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
@@ -9,7 +10,7 @@ import { AjvSchema } from './ajvSchema.js';
  * @experimental
  */
 export function readJsonSchemas(patterns, opt) {
-    return fastGlob.sync(patterns, opt).map(fileName => fs2.readJson(fileName));
+    return globSync(patterns, opt).map(fileName => fs2.readJson(fileName));
 }
 /**
  * Reads json schemas from given dir (glob pattern).

package/dist/validation/ajv/ajvSchema.js

@@ -1,5 +1,7 @@
 import { _filterNullishValues, _isObject, _substringBefore, JsonSchemaAnyBuilder, } from '@naturalcycles/js-lib';
-import { _inspect, fs2, requireFileToExist } from '../../index.js';
+import { fs2 } from '../../fs/fs2.js';
+import { _inspect } from '../../string/inspect.js';
+import { requireFileToExist } from '../../util/env.util.js';
 import { AjvValidationError } from './ajvValidationError.js';
 import { getAjv } from './getAjv.js';
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "14.0.1",
+  "version": "14.1.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -30,12 +30,12 @@
     "ajv-keywords": "^5",
     "chalk": "^5",
     "dotenv": "^16",
-    "fast-glob": "^3",
     "joi": "^17",
     "js-yaml": "^4",
     "jsonwebtoken": "^9",
     "lru-cache": "^11",
     "through2-concurrent": "^2",
+    "tinyglobby": "^0.2",
     "yargs": "^17"
   },
   "devDependencies": {
@@ -43,7 +43,6 @@
     "@naturalcycles/dev-lib": "^18",
     "@types/node": "^22",
     "@types/through2-concurrent": "^2",
-    "@vitest/coverage-v8": "^3",
     "tsx": "^4",
     "vitest": "^3"
   },

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

@@ -3,13 +3,13 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import type { UnixTimestamp } from '@naturalcycles/js-lib'
-import yargs from 'yargs'
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
 import { generateBuildInfo } from '../util/buildInfo.util.js'
+import { _yargs } from '../yargs.util.js'
 
 runScript(async () => {
-  const { dir, overrideTimestamp } = yargs.options({
+  const { dir, overrideTimestamp } = _yargs().options({
     dir: {
       type: 'string',
       desc: 'Output directory',

package/src/bin/json2env.ts

@@ -1,41 +1,43 @@
 #!/usr/bin/env node
 
-import yargs from 'yargs'
 import { json2env } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
+import { _yargs } from '../yargs.util.js'
 
 runScript(() => {
-  const { argv } = yargs.demandCommand(1).options({
-    prefix: {
-      type: 'string',
-    },
-    saveEnvFile: {
-      type: 'boolean',
-      desc: 'Save $JSON_FILE_NAME.sh file that exports json vars as environment vars',
-      default: true,
-    },
-    bashEnv: {
-      type: 'boolean',
-      desc: 'Populate $BASH_ENV file if BASH_ENV env variable exists',
-      default: true,
-    },
-    githubEnv: {
-      type: 'boolean',
-      desc: 'Populate $GITHUB_ENV file if GITHUB_ENV env variable exists',
-      default: true,
-    },
-    fail: {
-      type: 'boolean',
-      desc: 'Fail (exit status 1) on non-existing input file',
-      default: true,
-    },
-    debug: {
-      type: 'boolean',
-    },
-    silent: {
-      type: 'boolean',
-    },
-  })
+  const { argv } = _yargs()
+    .demandCommand(1)
+    .options({
+      prefix: {
+        type: 'string',
+      },
+      saveEnvFile: {
+        type: 'boolean',
+        desc: 'Save $JSON_FILE_NAME.sh file that exports json vars as environment vars',
+        default: true,
+      },
+      bashEnv: {
+        type: 'boolean',
+        desc: 'Populate $BASH_ENV file if BASH_ENV env variable exists',
+        default: true,
+      },
+      githubEnv: {
+        type: 'boolean',
+        desc: 'Populate $GITHUB_ENV file if GITHUB_ENV env variable exists',
+        default: true,
+      },
+      fail: {
+        type: 'boolean',
+        desc: 'Fail (exit status 1) on non-existing input file',
+        default: true,
+      },
+      debug: {
+        type: 'boolean',
+      },
+      silent: {
+        type: 'boolean',
+      },
+    })
 
   const { _: args, prefix, saveEnvFile, bashEnv, githubEnv, fail, debug, silent } = argv
   if (debug) console.log({ argv })

package/src/bin/kpy.ts

@@ -1,40 +1,42 @@
 #!/usr/bin/env node
 
-import yargs from 'yargs'
 import { kpySync } from '../fs/kpy.js'
 import { runScript } from '../script/runScript.js'
+import { _yargs } from '../yargs.util.js'
 
 runScript(() => {
   const {
     _: [baseDir, ...inputPatterns],
     ...opt
-  } = yargs.demandCommand(2).options({
-    silent: {
-      type: 'boolean',
-      desc: 'Suppress all text output',
-    },
-    verbose: {
-      type: 'boolean',
-      desc: 'Report progress on every file',
-    },
-    overwrite: {
-      type: 'boolean',
-      default: true,
-    },
-    dotfiles: {
-      type: 'boolean',
-    },
-    flat: {
-      type: 'boolean',
-    },
-    dry: {
-      type: 'boolean',
-    },
-    move: {
-      type: 'boolean',
-      descr: 'Move files instead of copy',
-    },
-  }).argv
+  } = _yargs()
+    .demandCommand(2)
+    .options({
+      silent: {
+        type: 'boolean',
+        desc: 'Suppress all text output',
+      },
+      verbose: {
+        type: 'boolean',
+        desc: 'Report progress on every file',
+      },
+      overwrite: {
+        type: 'boolean',
+        default: true,
+      },
+      dotfiles: {
+        type: 'boolean',
+      },
+      flat: {
+        type: 'boolean',
+      },
+      dry: {
+        type: 'boolean',
+      },
+      move: {
+        type: 'boolean',
+        descr: 'Move files instead of copy',
+      },
+    }).argv
 
   const outputDir = inputPatterns.pop() as string
 

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

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
 import { randomBytes } from 'node:crypto'
-import yargs from 'yargs'
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
+import { _yargs } from '../yargs.util.js'
 
 runScript(() => {
-  const { sizeBytes } = yargs.option('sizeBytes', {
+  const { sizeBytes } = _yargs().option('sizeBytes', {
     type: 'number',
     default: 256,
   }).argv

package/src/bin/slack-this.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import yargs from 'yargs'
-import { SlackService } from '../index.js'
+import { _yargs, SlackService } from '../index.js'
 import { runScript } from '../script/runScript.js'
 
 runScript(async () => {
@@ -11,7 +10,7 @@ runScript(async () => {
     username,
     emoji,
     webhook: webhookUrl,
-  } = yargs.options({
+  } = _yargs().options({
     channel: {
       type: 'string',
       demandOption: true,

package/src/fs/kpy.ts

@@ -1,8 +1,9 @@
 import path from 'node:path'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
 import { _since, localTime } from '@naturalcycles/js-lib'
+import { glob, globSync } from 'tinyglobby'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors.js'
-import { fastGlob, fs2 } from '../index.js'
+import { fs2 } from './fs2.js'
 
 /**
  * Everything defaults to `undefined`.
@@ -48,7 +49,7 @@ export async function kpy(opt: KpyOptions): Promise<void> {
 
   kpyPrepare(opt)
 
-  const filenames = await fastGlob(opt.inputPatterns!, {
+  const filenames = await glob(opt.inputPatterns!, {
     cwd: opt.baseDir,
     dot: opt.dotfiles,
   })
@@ -87,7 +88,7 @@ export function kpySync(opt: KpyOptions): void {
 
   kpyPrepare(opt)
 
-  const filenames = fastGlob.sync(opt.inputPatterns!, {
+  const filenames = globSync(opt.inputPatterns!, {
     cwd: opt.baseDir,
     dot: opt.dotfiles,
   })

package/src/index.ts

@@ -1,6 +1,5 @@
 import Ajv from 'ajv'
-import type { Options as FastGlobOptions } from 'fast-glob'
-import fastGlob from 'fast-glob'
+export { glob, globSync } from 'tinyglobby'
 import type {
   AlternativesSchema,
   AnySchema,
@@ -91,7 +90,6 @@ export type {
   BinarySchema,
   BooleanSchema,
   DateSchema,
-  FastGlobOptions,
   FunctionSchema,
   ObjectSchema,
   ValidationErrorItem,
@@ -100,4 +98,4 @@ export type {
   // StringSchema,
 }
 
-export { Ajv, fastGlob }
+export { Ajv }

package/src/log/log.util.ts

@@ -1,5 +1,5 @@
 import { commonLoggerCreate } from '@naturalcycles/js-lib'
-import { _inspect } from '../index.js'
+import { _inspect } from '../string/inspect.js'
 
 /**
  * CommonLogger that logs to process.stdout directly (bypassing console.log).

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

@@ -1,8 +1,9 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
+import { globSync } from 'tinyglobby'
 import { dimGrey, yellow } from '../colors/colors.js'
-import { fastGlob, fs2 } from '../index.js'
+import { fs2 } from '../fs/fs2.js'
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util.js'
 
 export interface DecryptCLIOptions {
@@ -34,7 +35,7 @@ export function secretsDecrypt(
   // If `file` is provided - only this one file is used
   const patterns = file ? [file] : dir.map(d => `${d}/**/*.enc`)
 
-  const filenames = fastGlob.sync(patterns)
+  const filenames = globSync(patterns)
 
   filenames.forEach(filename => {
     let plainFilename: string

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

@@ -1,8 +1,9 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
+import { globSync } from 'tinyglobby'
 import { dimGrey, yellow } from '../colors/colors.js'
-import { fastGlob, fs2 } from '../index.js'
+import { fs2 } from '../fs/fs2.js'
 import { encryptObject, encryptRandomIVBuffer } from '../security/crypto.util.js'
 
 export interface EncryptCLIOptions {
@@ -30,7 +31,7 @@ export function secretsEncrypt(
         ...pattern,
         `!**/*.enc`, // excluding already encoded
       ]
-  const filenames = fastGlob.sync(patterns)
+  const filenames = globSync(patterns)
   let encFilename: string
 
   filenames.forEach(filename => {

package/src/validation/ajv/ajv.util.ts

@@ -1,6 +1,7 @@
 import type { JsonSchema } from '@naturalcycles/js-lib'
-import type { FastGlobOptions } from '../../index.js'
-import { fastGlob, fs2 } from '../../index.js'
+import type { GlobOptions } from 'tinyglobby'
+import { globSync } from 'tinyglobby'
+import { fs2 } from '../../fs/fs2.js'
 import type { AjvSchemaCfg } from './ajvSchema.js'
 import { AjvSchema } from './ajvSchema.js'
 
@@ -12,8 +13,11 @@ import { AjvSchema } from './ajvSchema.js'
  *
  * @experimental
  */
-export function readJsonSchemas(patterns: string | string[], opt?: FastGlobOptions): JsonSchema[] {
-  return fastGlob.sync(patterns, opt).map(fileName => fs2.readJson(fileName))
+export function readJsonSchemas(
+  patterns: string | string[],
+  opt?: Omit<GlobOptions, 'patterns'>,
+): JsonSchema[] {
+  return globSync(patterns, opt).map(fileName => fs2.readJson(fileName))
 }
 
 /**

package/src/validation/ajv/ajvSchema.ts

@@ -6,7 +6,9 @@ import {
   JsonSchemaAnyBuilder,
 } from '@naturalcycles/js-lib'
 import type { Ajv, ValidateFunction } from 'ajv'
-import { _inspect, fs2, requireFileToExist } from '../../index.js'
+import { fs2 } from '../../fs/fs2.js'
+import { _inspect } from '../../string/inspect.js'
+import { requireFileToExist } from '../../util/env.util.js'
 import { AjvValidationError } from './ajvValidationError.js'
 import { getAjv } from './getAjv.js'