@naturalcycles/nodejs-lib 12.75.1 → 12.77.0

package/dist/buffer/buffer.util.js

@@ -7,7 +7,7 @@ exports._chunkBuffer = void 0;
 function _chunkBuffer(buf, size) {
     const out = [];
     for (let i = 0; i < buf.length; i += size) {
-        out.push(buf.slice(i, i + size));
+        out.push(buf.subarray(i, i + size));
     }
     return out;
 }

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/dist/security/crypto.util.js

@@ -24,8 +24,8 @@ function decryptRandomIVBuffer(input, secretKeyBase64) {
     // md5 to match aes-256 key length of 32 bytes
     const key = (0, hash_util_1.md5)(Buffer.from(secretKeyBase64, 'base64'));
     // iv is first 16 bytes of encrypted buffer, the rest is payload
-    const iv = input.slice(0, 16);
-    const payload = input.slice(16);
+    const iv = input.subarray(0, 16);
+    const payload = input.subarray(16);
     const decipher = crypto.createDecipheriv(algorithm, key, iv);
     return Buffer.concat([decipher.update(payload), decipher.final()]);
 }

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

@@ -1,9 +1,20 @@
 /// <reference types="node" />
 export declare function md5(s: string | Buffer): string;
+export declare function md5AsBase64(s: string | Buffer): string;
 export declare function md5AsBuffer(s: string | Buffer): Buffer;
+export declare function sha256(s: string | Buffer): string;
+export declare function sha256AsBase64(s: string | Buffer): string;
+export declare function sha256AsBuffer(s: string | Buffer): Buffer;
 export declare function hash(s: string | Buffer, algorithm: string): string;
 export declare function hashAsBuffer(s: string | Buffer, algorithm: string): Buffer;
-export declare function stringToBase64(s: string): string;
+export declare function base64(s: string | Buffer): string;
 export declare function base64ToString(strBase64: string): string;
-export declare function bufferToBase64(b: Buffer): string;
 export declare function base64ToBuffer(strBase64: string): Buffer;
+/**
+ * @deprecated use `base64`
+ */
+export declare function stringToBase64(s: string): string;
+/**
+ * @deprecated use `base64`
+ */
+export declare function bufferToBase64(b: Buffer): string;

package/dist/security/hash.util.js

@@ -1,15 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.base64ToBuffer = exports.bufferToBase64 = exports.base64ToString = exports.stringToBase64 = exports.hashAsBuffer = exports.hash = exports.md5AsBuffer = exports.md5 = void 0;
+exports.bufferToBase64 = exports.stringToBase64 = exports.base64ToBuffer = exports.base64ToString = exports.base64 = exports.hashAsBuffer = exports.hash = exports.sha256AsBuffer = exports.sha256AsBase64 = exports.sha256 = exports.md5AsBuffer = exports.md5AsBase64 = exports.md5 = void 0;
 const crypto = require("crypto");
 function md5(s) {
     return hash(s, 'md5');
 }
 exports.md5 = md5;
+function md5AsBase64(s) {
+    return hashAsBuffer(s, 'md5').toString('base64');
+}
+exports.md5AsBase64 = md5AsBase64;
 function md5AsBuffer(s) {
     return hashAsBuffer(s, 'md5');
 }
 exports.md5AsBuffer = md5AsBuffer;
+function sha256(s) {
+    return hash(s, 'sha256');
+}
+exports.sha256 = sha256;
+function sha256AsBase64(s) {
+    return hashAsBuffer(s, 'sha256').toString('base64');
+}
+exports.sha256AsBase64 = sha256AsBase64;
+function sha256AsBuffer(s) {
+    return hashAsBuffer(s, 'sha256');
+}
+exports.sha256AsBuffer = sha256AsBuffer;
 function hash(s, algorithm) {
     return crypto.createHash(algorithm).update(s).digest('hex');
 }
@@ -18,19 +34,29 @@ function hashAsBuffer(s, algorithm) {
     return crypto.createHash(algorithm).update(s).digest();
 }
 exports.hashAsBuffer = hashAsBuffer;
-function stringToBase64(s) {
-    return Buffer.from(s, 'utf8').toString('base64');
+function base64(s) {
+    return (Buffer.isBuffer(s) ? s : Buffer.from(s, 'utf8')).toString('base64');
 }
-exports.stringToBase64 = stringToBase64;
+exports.base64 = base64;
 function base64ToString(strBase64) {
     return Buffer.from(strBase64, 'base64').toString('utf8');
 }
 exports.base64ToString = base64ToString;
-function bufferToBase64(b) {
-    return b.toString('base64');
-}
-exports.bufferToBase64 = bufferToBase64;
 function base64ToBuffer(strBase64) {
     return Buffer.from(strBase64, 'base64');
 }
 exports.base64ToBuffer = base64ToBuffer;
+/**
+ * @deprecated use `base64`
+ */
+function stringToBase64(s) {
+    return Buffer.from(s, 'utf8').toString('base64');
+}
+exports.stringToBase64 = stringToBase64;
+/**
+ * @deprecated use `base64`
+ */
+function bufferToBase64(b) {
+    return b.toString('base64');
+}
+exports.bufferToBase64 = bufferToBase64;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.75.1",
+  "version": "12.77.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -42,17 +42,14 @@
     "@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",
     "vue-class-component": "^7.2.6",
     "vuepress": "^1.7.1",
     "vuepress-plugin-typescript": "^0.3.1",
-    "weak-napi": "^2.0.0"
-  },
-  "resolutions": {
-    "prettier": "^2.0.0"
+    "zod": "^3.19.1"
   },
   "bin": {
     "del": "dist/bin/del.js",

package/src/buffer/buffer.util.ts

@@ -5,7 +5,7 @@ export function _chunkBuffer(buf: Buffer, size: number): Buffer[] {
   const out: Buffer[] = []
 
   for (let i = 0; i < buf.length; i += size) {
-    out.push(buf.slice(i, i + size))
+    out.push(buf.subarray(i, i + size))
   }
 
   return out

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 }

package/src/security/crypto.util.ts

@@ -26,8 +26,8 @@ export function decryptRandomIVBuffer(input: Buffer, secretKeyBase64: string): B
   const key = md5(Buffer.from(secretKeyBase64, 'base64'))
 
   // iv is first 16 bytes of encrypted buffer, the rest is payload
-  const iv = input.slice(0, 16)
-  const payload = input.slice(16)
+  const iv = input.subarray(0, 16)
+  const payload = input.subarray(16)
 
   const decipher = crypto.createDecipheriv(algorithm, key, iv)
 

package/src/security/hash.util.ts

@@ -4,10 +4,26 @@ export function md5(s: string | Buffer): string {
   return hash(s, 'md5')
 }
 
+export function md5AsBase64(s: string | Buffer): string {
+  return hashAsBuffer(s, 'md5').toString('base64')
+}
+
 export function md5AsBuffer(s: string | Buffer): Buffer {
   return hashAsBuffer(s, 'md5')
 }
 
+export function sha256(s: string | Buffer): string {
+  return hash(s, 'sha256')
+}
+
+export function sha256AsBase64(s: string | Buffer): string {
+  return hashAsBuffer(s, 'sha256').toString('base64')
+}
+
+export function sha256AsBuffer(s: string | Buffer): Buffer {
+  return hashAsBuffer(s, 'sha256')
+}
+
 export function hash(s: string | Buffer, algorithm: string): string {
   return crypto.createHash(algorithm).update(s).digest('hex')
 }
@@ -16,18 +32,28 @@ export function hashAsBuffer(s: string | Buffer, algorithm: string): Buffer {
   return crypto.createHash(algorithm).update(s).digest()
 }
 
-export function stringToBase64(s: string): string {
-  return Buffer.from(s, 'utf8').toString('base64')
+export function base64(s: string | Buffer): string {
+  return (Buffer.isBuffer(s) ? s : Buffer.from(s, 'utf8')).toString('base64')
 }
 
 export function base64ToString(strBase64: string): string {
   return Buffer.from(strBase64, 'base64').toString('utf8')
 }
 
-export function bufferToBase64(b: Buffer): string {
-  return b.toString('base64')
-}
-
 export function base64ToBuffer(strBase64: string): Buffer {
   return Buffer.from(strBase64, 'base64')
 }
+
+/**
+ * @deprecated use `base64`
+ */
+export function stringToBase64(s: string): string {
+  return Buffer.from(s, 'utf8').toString('base64')
+}
+
+/**
+ * @deprecated use `base64`
+ */
+export function bufferToBase64(b: Buffer): string {
+  return b.toString('base64')
+}