@naturalcycles/nodejs-lib 13.37.2 → 13.39.0

package/dist/bin/secrets-encrypt.js

@@ -16,7 +16,7 @@ function getEncryptCLIOptions() {
         pattern: {
             type: 'string',
             array: true,
-            desc: 'Globby pattern for secrets. Can be multiple.',
+            desc: 'Glob pattern for secrets. Can be multiple.',
             // demandOption: true,
             default: './secret/**',
         },

package/dist/fs/kpy.js

@@ -10,7 +10,7 @@ const index_1 = require("../index");
 async function kpy(opt) {
     const started = Date.now();
     kpyPrepare(opt);
-    const filenames = await (0, index_1.globby)(opt.inputPatterns, {
+    const filenames = await (0, index_1.fastGlob)(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });
@@ -39,7 +39,7 @@ async function kpy(opt) {
 function kpySync(opt) {
     const started = Date.now();
     kpyPrepare(opt);
-    const filenames = index_1.globby.sync(opt.inputPatterns, {
+    const filenames = index_1.fastGlob.sync(opt.inputPatterns, {
         cwd: opt.baseDir,
         dot: opt.dotfiles,
     });

package/dist/index.d.ts

@@ -1,8 +1,6 @@
 import Ajv from 'ajv';
 import type { Options as FastGlobOptions } from 'fast-glob';
 import fastGlob from 'fast-glob';
-import type { GlobbyOptions } from 'globby';
-import globby from 'globby';
 import type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FunctionSchema, ObjectSchema, ValidationErrorItem } from 'joi';
 export * from './buffer/buffer.util';
 export * from './colors/colors';
@@ -10,13 +8,11 @@ export * from './csv/csvReader';
 export * from './csv/csvWriter';
 export * from './csv/transformToCSV';
 export * from './diff/tableDiff';
-export * from './fs/del';
 export * from './fs/fs2';
 export * from './fs/json2env';
 export * from './fs/kpy';
 export * from './infra/process.util';
 export * from './jwt/jwt.service';
-export * from './log/debug';
 export * from './log/log.util';
 export * from './script/runScript';
 export * from './security/crypto.util';
@@ -76,5 +72,5 @@ export * from './validation/joi/joi.shared.schemas';
 export * from './validation/joi/joi.validation.error';
 export * from './validation/joi/joi.validation.util';
 export type { StringSchema } from './validation/joi/string.extensions';
-export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FastGlobOptions, FunctionSchema, GlobbyOptions, ObjectSchema, ValidationErrorItem, };
-export { Ajv, fastGlob, globby };
+export type { AlternativesSchema, AnySchema, ArraySchema, BinarySchema, BooleanSchema, DateSchema, FastGlobOptions, FunctionSchema, ObjectSchema, ValidationErrorItem, };
+export { Ajv, fastGlob };

package/dist/index.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globby = exports.fastGlob = exports.Ajv = void 0;
+exports.fastGlob = exports.Ajv = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
 exports.Ajv = ajv_1.default;
 const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 exports.fastGlob = fast_glob_1.default;
-const globby_1 = tslib_1.__importDefault(require("globby"));
-exports.globby = globby_1.default;
 tslib_1.__exportStar(require("./buffer/buffer.util"), exports);
 tslib_1.__exportStar(require("./colors/colors"), exports);
 tslib_1.__exportStar(require("./csv/csvReader"), exports);
 tslib_1.__exportStar(require("./csv/csvWriter"), exports);
 tslib_1.__exportStar(require("./csv/transformToCSV"), exports);
 tslib_1.__exportStar(require("./diff/tableDiff"), exports);
-tslib_1.__exportStar(require("./fs/del"), exports);
 tslib_1.__exportStar(require("./fs/fs2"), exports);
 tslib_1.__exportStar(require("./fs/json2env"), exports);
 tslib_1.__exportStar(require("./fs/kpy"), exports);
 tslib_1.__exportStar(require("./infra/process.util"), exports);
 tslib_1.__exportStar(require("./jwt/jwt.service"), exports);
-tslib_1.__exportStar(require("./log/debug"), exports);
 tslib_1.__exportStar(require("./log/log.util"), exports);
 tslib_1.__exportStar(require("./script/runScript"), exports);
 tslib_1.__exportStar(require("./security/crypto.util"), exports);

package/dist/security/id.util.d.ts

@@ -27,3 +27,10 @@ export declare function stringIdBase64(size?: number): string;
  * Base64url always produces strings without a padding character `=`, by design.
  */
 export declare function stringIdBase64Url(size?: number): string;
+/**
+ * Generate cryptographically-secure string id with non-ambiguous characters only,
+ * e.g. missing O and 0, I and 1 and l etc.
+ *
+ * Default length is 16.
+ */
+export declare function stringIdNonAmbiguous(size?: number): string;

package/dist/security/id.util.js

@@ -4,6 +4,7 @@ exports.stringIdBase62 = void 0;
 exports.stringId = stringId;
 exports.stringIdBase64 = stringIdBase64;
 exports.stringIdBase64Url = stringIdBase64Url;
+exports.stringIdNonAmbiguous = stringIdNonAmbiguous;
 const tslib_1 = require("tslib");
 const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
 const nanoid_1 = require("./nanoid");
@@ -42,3 +43,12 @@ function stringIdBase64(size = 16) {
 function stringIdBase64Url(size = 16) {
     return node_crypto_1.default.randomBytes(size * 0.75).toString('base64url');
 }
+/**
+ * Generate cryptographically-secure string id with non-ambiguous characters only,
+ * e.g. missing O and 0, I and 1 and l etc.
+ *
+ * Default length is 16.
+ */
+function stringIdNonAmbiguous(size = 16) {
+    return stringId(size, nanoid_1.ALPHABET_NONAMBIGUOUS);
+}

package/dist/security/nanoid.d.ts

@@ -1,3 +1,4 @@
+export declare const ALPHABET_NONAMBIGUOUS = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 export declare const ALPHABET_NUMBER = "0123456789";
 export declare const ALPHABET_LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
 export declare const ALPHABET_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";

package/dist/security/nanoid.js

@@ -6,11 +6,12 @@ https://github.com/ai/nanoid/
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALPHABET_BASE64_URL = exports.ALPHABET_BASE64 = exports.ALPHABET_ALPHANUMERIC = exports.ALPHABET_ALPHANUMERIC_UPPERCASE = exports.ALPHABET_ALPHANUMERIC_LOWERCASE = exports.ALPHABET_UPPERCASE = exports.ALPHABET_LOWERCASE = exports.ALPHABET_NUMBER = void 0;
+exports.ALPHABET_BASE64_URL = exports.ALPHABET_BASE64 = exports.ALPHABET_ALPHANUMERIC = exports.ALPHABET_ALPHANUMERIC_UPPERCASE = exports.ALPHABET_ALPHANUMERIC_LOWERCASE = exports.ALPHABET_UPPERCASE = exports.ALPHABET_LOWERCASE = exports.ALPHABET_NUMBER = exports.ALPHABET_NONAMBIGUOUS = void 0;
 exports.nanoIdCustomAlphabet = nanoIdCustomAlphabet;
 exports.nanoid = nanoid;
 /* eslint-disable */
 const node_crypto_1 = require("node:crypto");
+exports.ALPHABET_NONAMBIGUOUS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
 exports.ALPHABET_NUMBER = '0123456789';
 exports.ALPHABET_LOWERCASE = 'abcdefghijklmnopqrstuvwxyz';
 exports.ALPHABET_UPPERCASE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.37.2",
+  "version": "13.39.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -15,7 +15,6 @@
     "secrets-encrypt-debug": "tsn ./src/bin/secrets-encrypt.ts",
     "secrets-decrypt-debug": "tsn ./src/bin/secrets-decrypt.ts",
     "kpy-debug": "tsn ./src/bin/kpy.ts node_modules dist",
-    "del-debug": "tsn ./src/bin/del.ts dist --verbose --debug",
     "json2env-debug": "tsn ./src/bin/json2env.ts ./src/test/someFile.json"
   },
   "dependencies": {
@@ -26,10 +25,8 @@
     "ajv-formats": "^3.0.1",
     "ajv-keywords": "^5.0.0",
     "chalk": "^4.0.0",
-    "debug": "^4.1.1",
     "dotenv": "^16.0.0",
     "fast-glob": "^3.2.11",
-    "globby": "^11.0.0",
     "joi": "^17.9.2",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.0",
@@ -46,7 +43,6 @@
     "jest": "^29.0.0"
   },
   "bin": {
-    "del": "dist/bin/del.js",
     "kpy": "dist/bin/kpy.js",
     "json2env": "dist/bin/json2env.js",
     "generate-build-info": "dist/bin/generate-build-info.js",

package/src/bin/secrets-encrypt.ts

@@ -18,7 +18,7 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
     pattern: {
       type: 'string',
       array: true,
-      desc: 'Globby pattern for secrets. Can be multiple.',
+      desc: 'Glob pattern for secrets. Can be multiple.',
       // demandOption: true,
       default: './secret/**',
     },

package/src/fs/kpy.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { _since, UnixTimestampMillis } from '@naturalcycles/js-lib'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors'
-import { fs2, globby } from '../index'
+import { fastGlob, fs2 } from '../index'
 
 /**
  * Everything defaults to `undefined`.
@@ -47,7 +47,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,
   })
@@ -86,7 +86,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,8 +1,6 @@
 import Ajv from 'ajv'
 import type { Options as FastGlobOptions } from 'fast-glob'
 import fastGlob from 'fast-glob'
-import type { GlobbyOptions } from 'globby'
-import globby from 'globby'
 import type {
   AlternativesSchema,
   AnySchema,
@@ -20,13 +18,11 @@ export * from './csv/csvReader'
 export * from './csv/csvWriter'
 export * from './csv/transformToCSV'
 export * from './diff/tableDiff'
-export * from './fs/del'
 export * from './fs/fs2'
 export * from './fs/json2env'
 export * from './fs/kpy'
 export * from './infra/process.util'
 export * from './jwt/jwt.service'
-export * from './log/debug'
 export * from './log/log.util'
 export * from './script/runScript'
 export * from './security/crypto.util'
@@ -96,7 +92,6 @@ export type {
   DateSchema,
   FastGlobOptions,
   FunctionSchema,
-  GlobbyOptions,
   ObjectSchema,
   ValidationErrorItem,
   // extended
@@ -104,4 +99,4 @@ export type {
   // StringSchema,
 }
 
-export { Ajv, fastGlob, globby }
+export { Ajv, fastGlob }

package/src/security/id.util.ts

@@ -2,6 +2,7 @@ import crypto from 'node:crypto'
 import {
   ALPHABET_ALPHANUMERIC,
   ALPHABET_ALPHANUMERIC_LOWERCASE,
+  ALPHABET_NONAMBIGUOUS,
   nanoIdCustomAlphabet,
 } from './nanoid'
 
@@ -43,3 +44,13 @@ export function stringIdBase64(size = 16): string {
 export function stringIdBase64Url(size = 16): string {
   return crypto.randomBytes(size * 0.75).toString('base64url')
 }
+
+/**
+ * Generate cryptographically-secure string id with non-ambiguous characters only,
+ * e.g. missing O and 0, I and 1 and l etc.
+ *
+ * Default length is 16.
+ */
+export function stringIdNonAmbiguous(size = 16): string {
+  return stringId(size, ALPHABET_NONAMBIGUOUS)
+}

package/src/security/nanoid.ts

@@ -11,6 +11,7 @@ import { randomFillSync } from 'node:crypto'
 
 type RandomFn = (bytes: number) => Buffer
 
+export const ALPHABET_NONAMBIGUOUS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ'
 export const ALPHABET_NUMBER = '0123456789'
 export const ALPHABET_LOWERCASE = 'abcdefghijklmnopqrstuvwxyz'
 export const ALPHABET_UPPERCASE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'

package/dist/bin/del.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/bin/del.js

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const yargs_1 = tslib_1.__importDefault(require("yargs"));
-const del_1 = require("../fs/del");
-const runScript_1 = require("../script/runScript");
-(0, runScript_1.runScript)(async () => {
-    const { _: patterns, ...opt } = yargs_1.default.demandCommand(1).options({
-        verbose: {
-            type: 'boolean',
-        },
-        silent: {
-            type: 'boolean',
-        },
-        debug: {
-            type: 'boolean',
-        },
-        dry: {
-            type: 'boolean',
-        },
-        concurrency: {
-            type: 'number',
-        },
-    }).argv;
-    (0, del_1.delSync)({ patterns: patterns, ...opt });
-});

package/dist/fs/del.d.ts

@@ -1,22 +0,0 @@
-export interface DelOptions {
-    /**
-     * Globby patterns.
-     */
-    patterns: string[];
-    /**
-     * @default 0 (infinite)
-     */
-    concurrency?: number;
-    verbose?: boolean;
-    silent?: boolean;
-    debug?: boolean;
-    dry?: boolean;
-}
-export type DelSingleOption = string;
-/**
- * Delete files that match input patterns.
- *
- * @experimental
- */
-export declare function del(_opt: DelOptions | DelSingleOption): Promise<void>;
-export declare function delSync(_opt: DelOptions | DelSingleOption): void;

package/dist/fs/del.js

@@ -1,133 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = del;
-exports.delSync = delSync;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("../colors/colors");
-const index_1 = require("../index");
-const DEF_OPT = {
-    patterns: [],
-    concurrency: Number.POSITIVE_INFINITY,
-};
-/**
- * Delete files that match input patterns.
- *
- * @experimental
- */
-async function del(_opt) {
-    const started = Date.now();
-    // Convert DelSingleOption to DelOptions
-    if (typeof _opt === 'string') {
-        _opt = {
-            patterns: [_opt],
-        };
-    }
-    const opt = {
-        ...DEF_OPT,
-        ..._opt,
-        concurrency: _opt.concurrency || DEF_OPT.concurrency,
-    };
-    const { patterns, concurrency, verbose, silent, debug, dry } = opt;
-    if (debug) {
-        console.log(opt);
-    }
-    // 1. glob only files, expand dirs, delete
-    const filenames = await (0, index_1.globby)(patterns, {
-        dot: true,
-        expandDirectories: true,
-        onlyFiles: true,
-    });
-    if (verbose || debug || dry) {
-        console.log(`Will delete ${(0, colors_1.yellow)(filenames.length)} files:`, filenames);
-    }
-    if (dry)
-        return;
-    await (0, js_lib_1.pMap)(filenames, filepath => index_1.fs2.removePath(filepath), { concurrency });
-    // 2. glob only dirs, expand, delete only empty!
-    let dirnames = await (0, index_1.globby)(patterns, {
-        dot: true,
-        expandDirectories: true,
-        onlyDirectories: true,
-    });
-    // Add original patterns (if any of them are dirs)
-    dirnames = dirnames.concat(await (0, js_lib_1.pFilter)(patterns, async (pattern) => {
-        return (await index_1.fs2.pathExistsAsync(pattern)) && (await index_1.fs2.lstatAsync(pattern)).isDirectory();
-    }));
-    const dirnamesSorted = dirnames.sort().reverse();
-    // console.log({ dirnamesSorted })
-    const deletedDirs = [];
-    for (const dirpath of dirnamesSorted) {
-        if (await isEmptyDir(dirpath)) {
-            // console.log(`empty dir: ${dirpath}`)
-            await index_1.fs2.removePathAsync(dirpath);
-            deletedDirs.push(dirpath);
-        }
-    }
-    if (verbose || debug)
-        console.log({ deletedDirs });
-    if (!silent) {
-        console.log(`del deleted ${(0, colors_1.yellow)(filenames.length)} files and ${(0, colors_1.yellow)(deletedDirs.length)} dirs ${(0, colors_1.dimGrey)((0, js_lib_1._since)(started))}`);
-    }
-}
-function delSync(_opt) {
-    const started = Date.now();
-    // Convert DelSingleOption to DelOptions
-    if (typeof _opt === 'string') {
-        _opt = {
-            patterns: [_opt],
-        };
-    }
-    const opt = {
-        ...DEF_OPT,
-        ..._opt,
-    };
-    const { patterns, verbose, silent, debug, dry } = opt;
-    if (debug) {
-        console.log(opt);
-    }
-    // 1. glob only files, expand dirs, delete
-    const filenames = index_1.globby.sync(patterns, {
-        dot: true,
-        expandDirectories: true,
-        onlyFiles: true,
-    });
-    if (verbose || debug || dry) {
-        console.log(`Will delete ${(0, colors_1.yellow)(filenames.length)} files:`, filenames);
-    }
-    if (dry)
-        return;
-    filenames.forEach(filepath => index_1.fs2.removePath(filepath));
-    // 2. glob only dirs, expand, delete only empty!
-    let dirnames = index_1.globby.sync(patterns, {
-        dot: true,
-        expandDirectories: true,
-        onlyDirectories: true,
-    });
-    // Add original patterns (if any of them are dirs)
-    dirnames = dirnames.concat(patterns.filter(p => index_1.fs2.pathExists(p) && index_1.fs2.lstat(p).isDirectory()));
-    const dirnamesSorted = dirnames.sort().reverse();
-    // console.log({ dirnamesSorted })
-    const deletedDirs = [];
-    for (const dirpath of dirnamesSorted) {
-        if (isEmptyDirSync(dirpath)) {
-            // console.log(`empty dir: ${dirpath}`)
-            index_1.fs2.removePath(dirpath);
-            deletedDirs.push(dirpath);
-        }
-    }
-    if (verbose || debug)
-        console.log({ deletedDirs });
-    if (!silent) {
-        console.log(`del deleted ${(0, colors_1.yellow)(filenames.length)} files and ${(0, colors_1.yellow)(deletedDirs.length)} dirs ${(0, colors_1.dimGrey)((0, js_lib_1._since)(started))}`);
-    }
-}
-// Improved algorithm:
-// 1. glob only files, expand dirs, delete
-// 2. glob only dirs, expand, delete only empty!
-// 3. test each original pattern, if it exists and is directory and is empty - delete
-async function isEmptyDir(dir) {
-    return (await index_1.fs2.readdirAsync(dir)).length === 0;
-}
-function isEmptyDirSync(dir) {
-    return index_1.fs2.readdir(dir).length === 0;
-}

package/dist/log/debug.d.ts

@@ -1,23 +0,0 @@
-export interface IDebug {
-    (namespace: string): IDebugger;
-    coerce: (val: any) => any;
-    disable: () => string;
-    enable: (namespaces: string) => void;
-    enabled: (namespaces: string) => boolean;
-    log: (...args: any[]) => any;
-    names: RegExp[];
-    skips: RegExp[];
-    formatters: DebugFormatters;
-}
-export interface DebugFormatters {
-    [formatter: string]: (v: any) => string;
-}
-export interface IDebugger {
-    (...args: any[]): void;
-    color: string;
-    enabled: boolean;
-    log: (...args: any[]) => any;
-    namespace: string;
-    destroy: () => boolean;
-}
-export declare const Debug: IDebug;

package/dist/log/debug.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Debug = void 0;
-const originalDebug = require('debug');
-// eslint-disable-next-line @typescript-eslint/naming-convention
-exports.Debug = ((namespace) => {
-    const instance = originalDebug(namespace);
-    instance.log = console.log.bind(console); // this enables colors for objects
-    return instance;
-});
-exports.Debug.coerce = originalDebug.coerce.bind(originalDebug);
-exports.Debug.disable = originalDebug.disable.bind(originalDebug);
-exports.Debug.enable = originalDebug.enable.bind(originalDebug);
-exports.Debug.enabled = originalDebug.enabled.bind(originalDebug);
-exports.Debug.log = originalDebug.log.bind(originalDebug);
-exports.Debug.names = originalDebug.names;
-exports.Debug.skips = originalDebug.skips;
-exports.Debug.formatters = originalDebug.formatters;

package/src/bin/del.ts

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-import yargs from 'yargs'
-import { delSync } from '../fs/del'
-import { runScript } from '../script/runScript'
-
-runScript(async () => {
-  const { _: patterns, ...opt } = yargs.demandCommand(1).options({
-    verbose: {
-      type: 'boolean',
-    },
-    silent: {
-      type: 'boolean',
-    },
-    debug: {
-      type: 'boolean',
-    },
-    dry: {
-      type: 'boolean',
-    },
-    concurrency: {
-      type: 'number',
-    },
-  }).argv
-
-  delSync({ patterns: patterns as string[], ...opt })
-})

package/src/fs/del.ts

@@ -1,193 +0,0 @@
-import { _since, pFilter, pMap, UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { dimGrey, yellow } from '../colors/colors'
-import { fs2, globby } from '../index'
-
-export interface DelOptions {
-  /**
-   * Globby patterns.
-   */
-  patterns: string[]
-
-  /**
-   * @default 0 (infinite)
-   */
-  concurrency?: number
-
-  verbose?: boolean
-
-  silent?: boolean
-
-  debug?: boolean
-
-  dry?: boolean
-}
-
-export type DelSingleOption = string
-
-const DEF_OPT: DelOptions = {
-  patterns: [],
-  concurrency: Number.POSITIVE_INFINITY,
-}
-
-/**
- * Delete files that match input patterns.
- *
- * @experimental
- */
-export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
-  const started = Date.now() as UnixTimestampMillis
-
-  // Convert DelSingleOption to DelOptions
-  if (typeof _opt === 'string') {
-    _opt = {
-      patterns: [_opt],
-    }
-  }
-
-  const opt = {
-    ...DEF_OPT,
-    ..._opt,
-    concurrency: _opt.concurrency || DEF_OPT.concurrency,
-  }
-  const { patterns, concurrency, verbose, silent, debug, dry } = opt
-
-  if (debug) {
-    console.log(opt)
-  }
-
-  // 1. glob only files, expand dirs, delete
-
-  const filenames = await globby(patterns, {
-    dot: true,
-    expandDirectories: true,
-    onlyFiles: true,
-  })
-
-  if (verbose || debug || dry) {
-    console.log(`Will delete ${yellow(filenames.length)} files:`, filenames)
-  }
-
-  if (dry) return
-
-  await pMap(filenames, filepath => fs2.removePath(filepath), { concurrency })
-
-  // 2. glob only dirs, expand, delete only empty!
-  let dirnames = await globby(patterns, {
-    dot: true,
-    expandDirectories: true,
-    onlyDirectories: true,
-  })
-
-  // Add original patterns (if any of them are dirs)
-  dirnames = dirnames.concat(
-    await pFilter(patterns, async pattern => {
-      return (await fs2.pathExistsAsync(pattern)) && (await fs2.lstatAsync(pattern)).isDirectory()
-    }),
-  )
-
-  const dirnamesSorted = dirnames.sort().reverse()
-
-  // console.log({ dirnamesSorted })
-
-  const deletedDirs: string[] = []
-  for (const dirpath of dirnamesSorted) {
-    if (await isEmptyDir(dirpath)) {
-      // console.log(`empty dir: ${dirpath}`)
-      await fs2.removePathAsync(dirpath)
-      deletedDirs.push(dirpath)
-    }
-  }
-
-  if (verbose || debug) console.log({ deletedDirs })
-
-  if (!silent) {
-    console.log(
-      `del deleted ${yellow(filenames.length)} files and ${yellow(
-        deletedDirs.length,
-      )} dirs ${dimGrey(_since(started))}`,
-    )
-  }
-}
-
-export function delSync(_opt: DelOptions | DelSingleOption): void {
-  const started = Date.now() as UnixTimestampMillis
-
-  // Convert DelSingleOption to DelOptions
-  if (typeof _opt === 'string') {
-    _opt = {
-      patterns: [_opt],
-    }
-  }
-
-  const opt = {
-    ...DEF_OPT,
-    ..._opt,
-  }
-  const { patterns, verbose, silent, debug, dry } = opt
-
-  if (debug) {
-    console.log(opt)
-  }
-
-  // 1. glob only files, expand dirs, delete
-
-  const filenames = globby.sync(patterns, {
-    dot: true,
-    expandDirectories: true,
-    onlyFiles: true,
-  })
-
-  if (verbose || debug || dry) {
-    console.log(`Will delete ${yellow(filenames.length)} files:`, filenames)
-  }
-
-  if (dry) return
-
-  filenames.forEach(filepath => fs2.removePath(filepath))
-
-  // 2. glob only dirs, expand, delete only empty!
-  let dirnames = globby.sync(patterns, {
-    dot: true,
-    expandDirectories: true,
-    onlyDirectories: true,
-  })
-
-  // Add original patterns (if any of them are dirs)
-  dirnames = dirnames.concat(patterns.filter(p => fs2.pathExists(p) && fs2.lstat(p).isDirectory()))
-
-  const dirnamesSorted = dirnames.sort().reverse()
-
-  // console.log({ dirnamesSorted })
-
-  const deletedDirs: string[] = []
-  for (const dirpath of dirnamesSorted) {
-    if (isEmptyDirSync(dirpath)) {
-      // console.log(`empty dir: ${dirpath}`)
-      fs2.removePath(dirpath)
-      deletedDirs.push(dirpath)
-    }
-  }
-
-  if (verbose || debug) console.log({ deletedDirs })
-
-  if (!silent) {
-    console.log(
-      `del deleted ${yellow(filenames.length)} files and ${yellow(
-        deletedDirs.length,
-      )} dirs ${dimGrey(_since(started))}`,
-    )
-  }
-}
-
-// Improved algorithm:
-// 1. glob only files, expand dirs, delete
-// 2. glob only dirs, expand, delete only empty!
-// 3. test each original pattern, if it exists and is directory and is empty - delete
-
-async function isEmptyDir(dir: string): Promise<boolean> {
-  return (await fs2.readdirAsync(dir)).length === 0
-}
-
-function isEmptyDirSync(dir: string): boolean {
-  return fs2.readdir(dir).length === 0
-}

package/src/log/debug.ts

@@ -1,48 +0,0 @@
-// Types based on @types/debug
-export interface IDebug {
-  (namespace: string): IDebugger
-  coerce: (val: any) => any
-  disable: () => string
-  enable: (namespaces: string) => void
-  enabled: (namespaces: string) => boolean
-  log: (...args: any[]) => any
-
-  names: RegExp[]
-  skips: RegExp[]
-
-  formatters: DebugFormatters
-}
-
-export interface DebugFormatters {
-  [formatter: string]: (v: any) => string
-}
-
-export interface IDebugger {
-  // (formatter: any, ...args: any[]): void;
-  (...args: any[]): void
-
-  color: string
-  enabled: boolean
-  log: (...args: any[]) => any
-  namespace: string
-  destroy: () => boolean
-  // extend: (namespace: string, delimiter?: string) => IDebugger
-}
-
-const originalDebug = require('debug') as IDebug
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const Debug = ((namespace: string) => {
-  const instance = originalDebug(namespace)
-  instance.log = console.log.bind(console) // this enables colors for objects
-  return instance
-}) as IDebug
-
-Debug.coerce = originalDebug.coerce.bind(originalDebug)
-Debug.disable = originalDebug.disable.bind(originalDebug)
-Debug.enable = originalDebug.enable.bind(originalDebug)
-Debug.enabled = originalDebug.enabled.bind(originalDebug)
-Debug.log = originalDebug.log.bind(originalDebug)
-Debug.names = originalDebug.names
-Debug.skips = originalDebug.skips
-Debug.formatters = originalDebug.formatters