@naturalcycles/nodejs-lib 12.75.0 → 12.75.1

package/dist/fs/del.js

@@ -32,9 +32,9 @@ async function del(_opt) {
         console.log(opt);
     }
     // 1. glob only files, expand dirs, delete
-    const filenames = await (0, index_1.fastGlob)(patterns, {
+    const filenames = await (0, index_1.globby)(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 (0, index_1.fastGlob)(patterns, {
+    let dirnames = await (0, index_1.globby)(patterns, {
         dot: true,
-        // expandDirectories: true,
+        expandDirectories: true,
         onlyDirectories: true,
     });
     // Add original patterns (if any of them are dirs)

package/dist/fs/kpy.js

@@ -11,7 +11,7 @@ const index_1 = require("../index");
 async function kpy(opt) {
     const started = Date.now();
     kpyPrepare(opt);
-    const filenames = await (0, index_1.fastGlob)(opt.inputPatterns, {
+    const filenames = await (0, index_1.globby)(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 = index_1.fastGlob.sync(opt.inputPatterns, {
+    const filenames = index_1.globby.sync(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import Ajv from 'ajv';
 import * as fastGlob from 'fast-glob';
 import { Options as FastGlobOptions } from 'fast-glob';
+import * as globby from 'globby';
+import { GlobbyOptions } from 'globby';
 import { RequestError, TimeoutError } from 'got';
 import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got';
 import { AnySchema, ValidationErrorItem } from 'joi';
@@ -69,5 +71,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 { 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, };
+export type { GlobbyOptions, 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 { globby, 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,11 +1,13 @@
 "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 = exports.fastGlob = 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 = exports.globby = 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 globby = require("globby");
+exports.globby = globby;
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.75.0",
+  "version": "12.75.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -28,6 +28,7 @@
     "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",

package/src/fs/del.ts

@@ -1,7 +1,7 @@
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
 import * as fs from 'fs-extra'
 import { dimGrey, yellow } from '../colors'
-import { fastGlob } from '../index'
+import { globby } 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 fastGlob(patterns, {
+  const filenames = await globby(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 fastGlob(patterns, {
+  let dirnames = await globby(patterns, {
     dot: true,
-    // expandDirectories: true,
+    expandDirectories: true,
     onlyDirectories: true,
   })
 

package/src/fs/kpy.ts

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

package/src/index.ts

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