@naturalcycles/nodejs-lib 12.75.1 → 12.76.0

package/dist/fs/del.d.ts

@@ -19,3 +19,4 @@ export declare type DelSingleOption = string;
  * @experimental
  */
 export declare function del(_opt: DelOptions | DelSingleOption): Promise<void>;
+export declare function delSync(_opt: DelOptions | DelSingleOption): void;

package/dist/fs/del.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = void 0;
+exports.delSync = exports.del = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const fs = require("fs-extra");
 const colors_1 = require("../colors");
@@ -70,6 +70,59 @@ async function del(_opt) {
     }
 }
 exports.del = del;
+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 => fs.removeSync(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 => fs.pathExistsSync(p) && fs.lstatSync(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}`)
+            fs.removeSync(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))}`);
+    }
+}
+exports.delSync = delSync;
 // Improved algorithm:
 // 1. glob only files, expand dirs, delete
 // 2. glob only dirs, expand, delete only empty!
@@ -77,3 +130,6 @@ exports.del = del;
 async function isEmptyDir(dir) {
     return (await fs.readdir(dir)).length === 0;
 }
+function isEmptyDirSync(dir) {
+    return fs.readdirSync(dir).length === 0;
+}

package/dist/fs/index.d.ts

@@ -1,5 +1,5 @@
-import { del, DelOptions } from './del';
+import { del, delSync, DelOptions } from './del';
 import { json2env, objectToShellExport } from './json2env';
 import { kpy, KpyOptions, kpySync } from './kpy';
 export type { KpyOptions, DelOptions };
-export { kpy, kpySync, del, objectToShellExport, json2env };
+export { kpy, kpySync, del, delSync, objectToShellExport, json2env };

package/dist/fs/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.json2env = exports.objectToShellExport = exports.del = exports.kpySync = exports.kpy = void 0;
+exports.json2env = exports.objectToShellExport = exports.delSync = exports.del = exports.kpySync = exports.kpy = void 0;
 const del_1 = require("./del");
 Object.defineProperty(exports, "del", { enumerable: true, get: function () { return del_1.del; } });
+Object.defineProperty(exports, "delSync", { enumerable: true, get: function () { return del_1.delSync; } });
 const json2env_1 = require("./json2env");
 Object.defineProperty(exports, "json2env", { enumerable: true, get: function () { return json2env_1.json2env; } });
 Object.defineProperty(exports, "objectToShellExport", { enumerable: true, get: function () { return json2env_1.objectToShellExport; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.75.1",
+  "version": "12.76.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -42,7 +42,7 @@
     "@naturalcycles/dev-lib": "^13.0.0",
     "@types/node": "^18.0.0",
     "@types/yargs": "^16.0.0",
-    "jest": "^28.0.3",
+    "jest": "^29.0.0",
     "nock": "^13.0.2",
     "patch-package": "^6.2.1",
     "prettier": "^2.0.0",

package/src/fs/del.ts

@@ -110,6 +110,78 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
   }
 }
 
+export function delSync(_opt: DelOptions | DelSingleOption): void {
+  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 = 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 => fs.removeSync(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 => fs.pathExistsSync(p) && fs.lstatSync(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}`)
+      fs.removeSync(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!
@@ -118,3 +190,7 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
 async function isEmptyDir(dir: string): Promise<boolean> {
   return (await fs.readdir(dir)).length === 0
 }
+
+function isEmptyDirSync(dir: string): boolean {
+  return fs.readdirSync(dir).length === 0
+}

package/src/fs/index.ts

@@ -1,7 +1,7 @@
-import { del, DelOptions } from './del'
+import { del, delSync, DelOptions } from './del'
 import { json2env, objectToShellExport } from './json2env'
 import { kpy, KpyOptions, kpySync } from './kpy'
 
 export type { KpyOptions, DelOptions }
 
-export { kpy, kpySync, del, objectToShellExport, json2env }
+export { kpy, kpySync, del, delSync, objectToShellExport, json2env }