@naturalcycles/nodejs-lib 12.74.0 → 12.75.0

package/dist/fs/del.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.del = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const fs = require("fs-extra");
-const globby = require("globby");
 const colors_1 = require("../colors");
+const index_1 = require("../index");
 const DEF_OPT = {
     patterns: [],
     concurrency: Number.POSITIVE_INFINITY,
@@ -32,9 +32,9 @@ async function del(_opt) {
         console.log(opt);
     }
     // 1. glob only files, expand dirs, delete
-    const filenames = await globby(patterns, {
+    const filenames = await (0, index_1.fastGlob)(patterns, {
         dot: true,
-        expandDirectories: true,
+        // expandDirectories: true,
         onlyFiles: true,
     });
     if (verbose || debug || dry) {
@@ -44,9 +44,9 @@ async function del(_opt) {
         return;
     await (0, js_lib_1.pMap)(filenames, filepath => fs.remove(filepath), { concurrency });
     // 2. glob only dirs, expand, delete only empty!
-    let dirnames = await globby(patterns, {
+    let dirnames = await (0, index_1.fastGlob)(patterns, {
         dot: true,
-        expandDirectories: true,
+        // expandDirectories: true,
         onlyDirectories: true,
     });
     // Add original patterns (if any of them are dirs)

package/dist/fs/kpy.js

@@ -5,13 +5,13 @@ const path = require("path");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const cpFile = require("cp-file");
 const fs = require("fs-extra");
-const globby = require("globby");
 const moveFile = require("move-file");
 const colors_1 = require("../colors");
+const index_1 = require("../index");
 async function kpy(opt) {
     const started = Date.now();
     kpyPrepare(opt);
-    const filenames = await globby(opt.inputPatterns, {
+    const filenames = await (0, index_1.fastGlob)(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });
@@ -39,7 +39,7 @@ exports.kpy = kpy;
 function kpySync(opt) {
     const started = Date.now();
     kpyPrepare(opt);
-    const filenames = globby.sync(opt.inputPatterns, {
+    const filenames = index_1.fastGlob.sync(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 import Ajv from 'ajv';
+import * as fastGlob from 'fast-glob';
+import { Options as FastGlobOptions } from 'fast-glob';
 import { RequestError, TimeoutError } from 'got';
 import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got';
 import { AnySchema, ValidationErrorItem } from 'joi';
@@ -67,5 +69,5 @@ export * from './validation/joi/joi.shared.schemas';
 import { JoiValidationError, JoiValidationErrorData } from './validation/joi/joi.validation.error';
 import { convert, getValidationResult, isValid, JoiValidationResult, undefinedIfInvalid, validate } from './validation/joi/joi.validation.util';
 import { runScript, RunScriptOptions } from './script';
-export type { RunScriptOptions, JoiValidationErrorData, JoiValidationResult, ValidationErrorItem, ExtendedJoi, SchemaTyped, AnySchema, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, NumberSchemaTyped, ObjectSchemaTyped, StringSchemaTyped, IDebug, IDebugger, SlackServiceCfg, SlackMessage, SlackMessageProps, SlackApiBody, SlackMessagePrefixHook, ReadableTyped, WritableTyped, TransformTyped, PipelineFromNDJsonFileOptions, PipelineToNDJsonFileOptions, TransformJsonParseOptions, TransformToNDJsonOptions, TransformMapOptions, TransformMapSyncOptions, NDJSONStreamForEachOptions, TransformOptions, TransformMultiThreadedOptions, WorkerClassInterface, WorkerInput, WorkerOutput, TableDiffOptions, InspectAnyOptions, Got, GetGotOptions, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AjvValidationOptions, AjvSchemaCfg, AjvValidationErrorData, };
-export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };
+export type { FastGlobOptions, RunScriptOptions, JoiValidationErrorData, JoiValidationResult, ValidationErrorItem, ExtendedJoi, SchemaTyped, AnySchema, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, NumberSchemaTyped, ObjectSchemaTyped, StringSchemaTyped, IDebug, IDebugger, SlackServiceCfg, SlackMessage, SlackMessageProps, SlackApiBody, SlackMessagePrefixHook, ReadableTyped, WritableTyped, TransformTyped, PipelineFromNDJsonFileOptions, PipelineToNDJsonFileOptions, TransformJsonParseOptions, TransformToNDJsonOptions, TransformMapOptions, TransformMapSyncOptions, NDJSONStreamForEachOptions, TransformOptions, TransformMultiThreadedOptions, WorkerClassInterface, WorkerInput, WorkerOutput, TableDiffOptions, InspectAnyOptions, Got, GetGotOptions, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AjvValidationOptions, AjvSchemaCfg, AjvValidationErrorData, };
+export { fastGlob, JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };

package/dist/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
+exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = exports.fastGlob = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = require("ajv");
 exports.Ajv = ajv_1.default;
+const fastGlob = require("fast-glob");
+exports.fastGlob = fastGlob;
 const got_1 = require("got");
 Object.defineProperty(exports, "RequestError", { enumerable: true, get: function () { return got_1.RequestError; } });
 Object.defineProperty(exports, "TimeoutError", { enumerable: true, get: function () { return got_1.TimeoutError; } });

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

@@ -4,8 +4,8 @@ exports.secretsDecrypt = void 0;
 const path = require("path");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const fs = require("fs-extra");
-const globby = require("globby");
 const colors_1 = require("../colors");
+const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
 // Debug it like this:
 // yarn tsn ./src/bin/secrets-decrypt.ts --file ./src/test/secrets2.json --jsonMode --encKey MPd/30v0Zcce4I5mfwF4NSXrpTYD9OO4/fIqw6rjNiWp2b1GN9Xm8nQZqr7c9kKSsATqtwe0HkJFDUGzDSow44GDgDICgB1u1rGa5eNqtxnOVGRR+lIinCvN/1OnpjzeoJy2bStXPj1DKx8anMqgA8SoOZdlWRNSkEeZlolru8Ey0ujZo22dfwMyRIEniLcqvBm/iMiAkV82fn/TxYw05GarAoJcrfPeDBvuOXsARnMCyX18qTFL0iojxeTU8JHxr8TX3eXDq9cJJmridEKlwRIAzADwtetI4ttlP8lwJj1pmgsBIN3iqYssZYCkZ3HMV6BoEc7LTI5z/45rKrAT1A==
@@ -17,7 +17,7 @@ const crypto_util_1 = require("../security/crypto.util");
 function secretsDecrypt(dir, file, encKey, 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 = globby.sync(patterns);
+    const filenames = index_1.fastGlob.sync(patterns);
     filenames.forEach(filename => {
         let plainFilename;
         if (jsonMode) {

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

@@ -4,8 +4,8 @@ exports.secretsEncrypt = void 0;
 const path = require("path");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const fs = require("fs-extra");
-const globby = require("globby");
 const colors_1 = require("../colors");
+const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
 /**
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
@@ -18,7 +18,7 @@ function secretsEncrypt(pattern, file, encKey, del = false, jsonMode = false) {
             ...pattern,
             `!**/*.enc`, // excluding already encoded
         ];
-    const filenames = globby.sync(patterns);
+    const filenames = index_1.fastGlob.sync(patterns);
     let encFilename;
     filenames.forEach(filename => {
         if (jsonMode) {

package/dist/util/env.util.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireFileToExist = exports.requireEnvKeys = void 0;
+const fs = require("fs");
 require("dotenv/config"); // ensure .env is read before requiring keys
-const fs = require("fs-extra");
 /**
  * @example
  *
@@ -22,7 +22,7 @@ function requireEnvKeys(...keys) {
 }
 exports.requireEnvKeys = requireEnvKeys;
 function requireFileToExist(filePath) {
-    if (!fs.pathExistsSync(filePath)) {
+    if (!fs.existsSync(filePath)) {
         throw new Error(`Required file should exist: ${filePath}`);
     }
 }

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

@@ -1,5 +1,5 @@
 import { JsonSchema } from '@naturalcycles/js-lib';
-import { GlobbyOptions } from 'globby';
+import type { FastGlobOptions } from '../..';
 import { AjvSchema, AjvSchemaCfg } from './ajvSchema';
 /**
  * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
@@ -9,7 +9,7 @@ import { AjvSchema, AjvSchemaCfg } from './ajvSchema';
  *
  * @experimental
  */
-export declare function readJsonSchemas(patterns: string | string[], opt?: GlobbyOptions): JsonSchema[];
+export declare function readJsonSchemas(patterns: string | string[], opt?: FastGlobOptions): 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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAjvSchemas = exports.readJsonSchemas = void 0;
 const fs = require("fs");
-const globby = require("globby");
+const __1 = require("../..");
 const ajvSchema_1 = require("./ajvSchema");
 /**
  * Does fs.readFileSync + JSON.parse for ALL files matching the passed `glob` pattern.
@@ -13,7 +13,7 @@ const ajvSchema_1 = require("./ajvSchema");
  * @experimental
  */
 function readJsonSchemas(patterns, opt) {
-    return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')));
+    return __1.fastGlob.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')));
 }
 exports.readJsonSchemas = readJsonSchemas;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.74.0",
+  "version": "12.75.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -26,8 +26,8 @@
     "debug": "^4.1.1",
     "dotenv": "^16.0.0",
     "execa": "^5.0.0",
+    "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.0",
-    "globby": "^11.0.0",
     "got": "^11.0.1",
     "joi": "17.4.2",
     "lru-cache": "^7.4.0",
@@ -38,8 +38,8 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^1.0.7",
-    "@naturalcycles/dev-lib": "^12.0.0",
-    "@types/node": "^17.0.0",
+    "@naturalcycles/dev-lib": "^13.0.0",
+    "@types/node": "^18.0.0",
     "@types/yargs": "^16.0.0",
     "jest": "^28.0.3",
     "nock": "^13.0.2",

package/src/fs/del.ts

@@ -1,7 +1,7 @@
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
 import * as fs from 'fs-extra'
-import * as globby from 'globby'
 import { dimGrey, yellow } from '../colors'
+import { fastGlob } from '../index'
 
 export interface DelOptions {
   /**
@@ -58,9 +58,9 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
 
   // 1. glob only files, expand dirs, delete
 
-  const filenames = await globby(patterns, {
+  const filenames = await fastGlob(patterns, {
     dot: true,
-    expandDirectories: true,
+    // expandDirectories: true,
     onlyFiles: true,
   })
 
@@ -73,9 +73,9 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
   await pMap(filenames, filepath => fs.remove(filepath), { concurrency })
 
   // 2. glob only dirs, expand, delete only empty!
-  let dirnames = await globby(patterns, {
+  let dirnames = await fastGlob(patterns, {
     dot: true,
-    expandDirectories: true,
+    // expandDirectories: true,
     onlyDirectories: true,
   })
 

package/src/fs/kpy.ts

@@ -2,9 +2,9 @@ import * as path from 'path'
 import { _since } from '@naturalcycles/js-lib'
 import * as cpFile from 'cp-file'
 import * as fs from 'fs-extra'
-import * as globby from 'globby'
 import * as moveFile from 'move-file'
 import { boldWhite, dimGrey, grey, yellow } from '../colors'
+import { fastGlob } from '../index'
 
 /**
  * Everything defaults to `undefined`.
@@ -50,7 +50,7 @@ export async function kpy(opt: KpyOptions): Promise<void> {
 
   kpyPrepare(opt)
 
-  const filenames = await globby(opt.inputPatterns!, {
+  const filenames = await fastGlob(opt.inputPatterns!, {
     cwd: opt.baseDir,
     dot: opt.dotfiles,
   })
@@ -87,7 +87,7 @@ export function kpySync(opt: KpyOptions): void {
 
   kpyPrepare(opt)
 
-  const filenames = globby.sync(opt.inputPatterns!, {
+  const filenames = fastGlob.sync(opt.inputPatterns!, {
     cwd: opt.baseDir,
     dot: opt.dotfiles,
   })

package/src/index.ts

@@ -1,4 +1,6 @@
 import Ajv from 'ajv'
+import * as fastGlob from 'fast-glob'
+import { Options as FastGlobOptions } from 'fast-glob'
 import { RequestError, TimeoutError } from 'got'
 import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got'
 import { AnySchema, ValidationErrorItem } from 'joi'
@@ -111,6 +113,7 @@ import {
 import { runScript, RunScriptOptions } from './script'
 
 export type {
+  FastGlobOptions,
   RunScriptOptions,
   JoiValidationErrorData,
   JoiValidationResult,
@@ -159,6 +162,7 @@ export type {
 }
 
 export {
+  fastGlob,
   JoiValidationError,
   validate,
   getValidationResult,

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

@@ -1,8 +1,8 @@
 import * as path from 'path'
 import { _assert } from '@naturalcycles/js-lib'
 import * as fs from 'fs-extra'
-import globby = require('globby')
 import { dimGrey, yellow } from '../colors'
+import { fastGlob } from '../index'
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util'
 
 export interface DecryptCLIOptions {
@@ -31,7 +31,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 = globby.sync(patterns)
+  const filenames = fastGlob.sync(patterns)
 
   filenames.forEach(filename => {
     let plainFilename

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

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

package/src/util/env.util.ts

@@ -1,6 +1,6 @@
+import * as fs from 'fs'
 import type { ValuesOf } from '@naturalcycles/js-lib'
 import 'dotenv/config' // ensure .env is read before requiring keys
-import * as fs from 'fs-extra'
 
 /**
  * @example
@@ -16,13 +16,13 @@ export function requireEnvKeys<T extends readonly string[]>(
   return keys.reduce((r, k) => {
     const v = process.env[k]
     if (!v) throw new Error(`${k} env variable is required, but missing`)
-    r[k] = v
+    r[k as ValuesOf<T>] = v
     return r
   }, {} as { [k in ValuesOf<T>]: string })
 }
 
 export function requireFileToExist(filePath: string): void {
-  if (!fs.pathExistsSync(filePath)) {
+  if (!fs.existsSync(filePath)) {
     throw new Error(`Required file should exist: ${filePath}`)
   }
 }

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

@@ -1,7 +1,7 @@
 import * as fs from 'fs'
 import { JsonSchema } from '@naturalcycles/js-lib'
-import { GlobbyOptions } from 'globby'
-import * as globby from 'globby'
+import { fastGlob } from '../..'
+import type { FastGlobOptions } from '../..'
 import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
 
 /**
@@ -12,8 +12,8 @@ import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
  *
  * @experimental
  */
-export function readJsonSchemas(patterns: string | string[], opt?: GlobbyOptions): JsonSchema[] {
-  return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')))
+export function readJsonSchemas(patterns: string | string[], opt?: FastGlobOptions): JsonSchema[] {
+  return fastGlob.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')))
 }
 
 /**

package/src/validation/ajv/ajvSchema.ts

@@ -159,7 +159,7 @@ export class AjvSchema<T = unknown> {
     const errors = this.validateFunction.errors!
 
     const {
-      objectId = _isObject(obj) ? (obj['id'] as string) : undefined,
+      objectId = _isObject(obj) ? (obj['id' as keyof T] as any) : undefined,
       objectName = this.cfg.objectName,
       logErrors = this.cfg.logErrors,
       separator = this.cfg.separator,