@naturalcycles/nodejs-lib 12.92.0 → 12.93.1

package/dist/fs/del.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delSync = exports.del = void 0;
+const fs = require("node:fs");
+const fsp = require("node:fs/promises");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fs = require("fs-extra");
 const colors_1 = require("../colors");
 const index_1 = require("../index");
 const DEF_OPT = {
@@ -42,7 +43,7 @@ async function del(_opt) {
     }
     if (dry)
         return;
-    await (0, js_lib_1.pMap)(filenames, filepath => fs.remove(filepath), { concurrency });
+    await (0, js_lib_1.pMap)(filenames, filepath => fsp.unlink(filepath), { concurrency });
     // 2. glob only dirs, expand, delete only empty!
     let dirnames = await (0, index_1.globby)(patterns, {
         dot: true,
@@ -51,7 +52,7 @@ async function del(_opt) {
     });
     // Add original patterns (if any of them are dirs)
     dirnames = dirnames.concat(await (0, js_lib_1.pFilter)(patterns, async (pattern) => {
-        return (await fs.pathExists(pattern)) && (await fs.lstat(pattern)).isDirectory();
+        return (await (0, index_1._pathExists)(pattern)) && (await fsp.lstat(pattern)).isDirectory();
     }));
     const dirnamesSorted = dirnames.sort().reverse();
     // console.log({ dirnamesSorted })
@@ -59,7 +60,7 @@ async function del(_opt) {
     for await (const dirpath of dirnamesSorted) {
         if (await isEmptyDir(dirpath)) {
             // console.log(`empty dir: ${dirpath}`)
-            await fs.remove(dirpath);
+            await fsp.unlink(dirpath);
             deletedDirs.push(dirpath);
         }
     }
@@ -97,7 +98,7 @@ function delSync(_opt) {
     }
     if (dry)
         return;
-    filenames.forEach(filepath => fs.removeSync(filepath));
+    filenames.forEach(filepath => fs.unlinkSync(filepath));
     // 2. glob only dirs, expand, delete only empty!
     let dirnames = index_1.globby.sync(patterns, {
         dot: true,
@@ -105,14 +106,14 @@ function delSync(_opt) {
         onlyDirectories: true,
     });
     // Add original patterns (if any of them are dirs)
-    dirnames = dirnames.concat(patterns.filter(p => fs.pathExistsSync(p) && fs.lstatSync(p).isDirectory()));
+    dirnames = dirnames.concat(patterns.filter(p => (0, index_1._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);
+            fs.unlinkSync(dirpath);
             deletedDirs.push(dirpath);
         }
     }
@@ -128,7 +129,7 @@ exports.delSync = delSync;
 // 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 fs.readdir(dir)).length === 0;
+    return (await fsp.readdir(dir)).length === 0;
 }
 function isEmptyDirSync(dir) {
     return fs.readdirSync(dir).length === 0;

package/dist/fs/fs.util.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import type { CopyOptions, CopyOptionsSync, MoveOptions } from 'fs-extra';
+/// <reference types="node" />
+import * as fs from 'node:fs';
 export interface JsonOptions {
     spaces?: number;
 }
@@ -11,16 +12,40 @@ export declare function _readFile(filePath: string): Promise<string>;
  * Convenience wrapper that defaults to utf-8 string output.
  */
 export declare function _readFileSync(filePath: string): string;
-export declare function _readJsonFile<T = unknown>(filePath: string): Promise<T>;
-export declare function _readJsonFileSync<T = unknown>(filePath: string): T;
+export declare function _readJson<T = unknown>(filePath: string): Promise<T>;
+/**
+ * @deprecated use _readJson
+ */
+export declare const _readJsonFile: typeof _readJson;
+export declare function _readJsonSync<T = unknown>(filePath: string): T;
+/**
+ * @deprecated use _readJsonSync
+ */
+export declare const _readJsonFileSync: typeof _readJsonSync;
 export declare function _writeFile(filePath: string, data: string | Buffer): Promise<void>;
 export declare function _writeFileSync(filePath: string, data: string | Buffer): void;
 export declare function _outputFile(filePath: string, data: string | Buffer): Promise<void>;
 export declare function _outputFileSync(filePath: string, data: string | Buffer): void;
-export declare function _writeJsonFile(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
-export declare function _writeJsonFileSync(filePath: string, data: any, opt?: JsonOptions): void;
-export declare function _outputJsonFile(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
-export declare function _outputJsonFileSync(filePath: string, data: any, opt?: JsonOptions): void;
+export declare function _writeJson(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+/**
+ * @deprecated use _writeJson
+ */
+export declare const _writeJsonFile: typeof _writeJson;
+export declare function _writeJsonSync(filePath: string, data: any, opt?: JsonOptions): void;
+/**
+ * @deprecated use _writeJsonSync
+ */
+export declare const _writeJsonFileSync: typeof _writeJsonSync;
+export declare function _outputJson(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+/**
+ * @deprecated use _outputJson
+ */
+export declare const _outputJsonFile: typeof _outputJson;
+export declare function _outputJsonSync(filePath: string, data: any, opt?: JsonOptions): void;
+/**
+ * @deprecated use _outputJsonSync
+ */
+export declare const _outputJsonFileSync: typeof _outputJsonSync;
 export declare function _pathExists(filePath: string): Promise<boolean>;
 export declare function _pathExistsSync(filePath: string): boolean;
 export declare function _ensureDir(dirPath: string): Promise<void>;
@@ -31,7 +56,13 @@ export declare function _removePath(fileOrDirPath: string): Promise<void>;
 export declare function _removePathSync(fileOrDirPath: string): void;
 export declare function _emptyDir(dirPath: string): Promise<void>;
 export declare function _emptyDirSync(dirPath: string): void;
-export declare function _copyPath(src: string, dest: string, opt?: CopyOptions): Promise<void>;
-export declare function _copyPathSync(src: string, dest: string, opt?: CopyOptionsSync): void;
-export declare function _movePath(src: string, dest: string, opt?: MoveOptions): Promise<void>;
-export declare function _movePathSync(src: string, dest: string, opt?: MoveOptions): void;
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
+export declare function _copyPath(src: string, dest: string, opt?: fs.CopyOptions): Promise<void>;
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
+export declare function _copyPathSync(src: string, dest: string, opt?: fs.CopySyncOptions): void;
+export declare function _movePath(src: string, dest: string, opt?: fs.CopyOptions): Promise<void>;
+export declare function _movePathSync(src: string, dest: string, opt?: fs.CopySyncOptions): void;

package/dist/fs/fs.util.js

@@ -15,12 +15,11 @@ Credit to: fs-extra (https://github.com/jprichardson/node-fs-extra)
 
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._movePathSync = exports._movePath = exports._copyPathSync = exports._copyPath = exports._emptyDirSync = exports._emptyDir = exports._removePathSync = exports._removePath = exports._ensureFileSync = exports._ensureFile = exports._ensureDirSync = exports._ensureDir = exports._pathExistsSync = exports._pathExists = exports._outputJsonFileSync = exports._outputJsonFile = exports._writeJsonFileSync = exports._writeJsonFile = exports._outputFileSync = exports._outputFile = exports._writeFileSync = exports._writeFile = exports._readJsonFileSync = exports._readJsonFile = exports._readFileSync = exports._readFile = void 0;
+exports._movePathSync = exports._movePath = exports._copyPathSync = exports._copyPath = exports._emptyDirSync = exports._emptyDir = exports._removePathSync = exports._removePath = exports._ensureFileSync = exports._ensureFile = exports._ensureDirSync = exports._ensureDir = exports._pathExistsSync = exports._pathExists = exports._outputJsonFileSync = exports._outputJsonSync = exports._outputJsonFile = exports._outputJson = exports._writeJsonFileSync = exports._writeJsonSync = exports._writeJsonFile = exports._writeJson = exports._outputFileSync = exports._outputFile = exports._writeFileSync = exports._writeFile = exports._readJsonFileSync = exports._readJsonSync = exports._readJsonFile = exports._readJson = exports._readFileSync = exports._readFile = void 0;
 const fs = require("node:fs");
 const fsp = require("node:fs/promises");
 const path = require("node:path");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fse = require("fs-extra");
 /**
  * Convenience wrapper that defaults to utf-8 string output.
  */
@@ -35,16 +34,24 @@ function _readFileSync(filePath) {
     return fs.readFileSync(filePath, 'utf8');
 }
 exports._readFileSync = _readFileSync;
-async function _readJsonFile(filePath) {
+async function _readJson(filePath) {
     const str = await fsp.readFile(filePath, 'utf8');
     return (0, js_lib_1._jsonParse)(str);
 }
-exports._readJsonFile = _readJsonFile;
-function _readJsonFileSync(filePath) {
+exports._readJson = _readJson;
+/**
+ * @deprecated use _readJson
+ */
+exports._readJsonFile = _readJson;
+function _readJsonSync(filePath) {
     const str = fs.readFileSync(filePath, 'utf8');
     return (0, js_lib_1._jsonParse)(str);
 }
-exports._readJsonFileSync = _readJsonFileSync;
+exports._readJsonSync = _readJsonSync;
+/**
+ * @deprecated use _readJsonSync
+ */
+exports._readJsonFileSync = _readJsonSync;
 async function _writeFile(filePath, data) {
     await fsp.writeFile(filePath, data);
 }
@@ -69,26 +76,42 @@ function _outputFileSync(filePath, data) {
     fs.writeFileSync(filePath, data);
 }
 exports._outputFileSync = _outputFileSync;
-async function _writeJsonFile(filePath, data, opt) {
+async function _writeJson(filePath, data, opt) {
     const str = JSON.stringify(data, null, opt?.spaces);
     await fsp.writeFile(filePath, str);
 }
-exports._writeJsonFile = _writeJsonFile;
-function _writeJsonFileSync(filePath, data, opt) {
+exports._writeJson = _writeJson;
+/**
+ * @deprecated use _writeJson
+ */
+exports._writeJsonFile = _writeJson;
+function _writeJsonSync(filePath, data, opt) {
     const str = JSON.stringify(data, null, opt?.spaces);
     fs.writeFileSync(filePath, str);
 }
-exports._writeJsonFileSync = _writeJsonFileSync;
-async function _outputJsonFile(filePath, data, opt) {
+exports._writeJsonSync = _writeJsonSync;
+/**
+ * @deprecated use _writeJsonSync
+ */
+exports._writeJsonFileSync = _writeJsonSync;
+async function _outputJson(filePath, data, opt) {
     const str = JSON.stringify(data, null, opt?.spaces);
     await _outputFile(filePath, str);
 }
-exports._outputJsonFile = _outputJsonFile;
-function _outputJsonFileSync(filePath, data, opt) {
+exports._outputJson = _outputJson;
+/**
+ * @deprecated use _outputJson
+ */
+exports._outputJsonFile = _outputJson;
+function _outputJsonSync(filePath, data, opt) {
     const str = JSON.stringify(data, null, opt?.spaces);
     _outputFileSync(filePath, str);
 }
-exports._outputJsonFileSync = _outputJsonFileSync;
+exports._outputJsonSync = _outputJsonSync;
+/**
+ * @deprecated use _outputJsonSync
+ */
+exports._outputJsonFileSync = _outputJsonSync;
 async function _pathExists(filePath) {
     try {
         await fsp.access(filePath);
@@ -197,20 +220,33 @@ function _emptyDirSync(dirPath) {
     items.forEach(item => _removePathSync(path.join(dirPath, item)));
 }
 exports._emptyDirSync = _emptyDirSync;
-// copyFile/moveFile - let's keep using fs-extra for now
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
 async function _copyPath(src, dest, opt) {
-    await fse.copy(src, dest, opt);
+    await fsp.cp(src, dest, {
+        recursive: true,
+        ...opt,
+    });
 }
 exports._copyPath = _copyPath;
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
 function _copyPathSync(src, dest, opt) {
-    fse.copySync(src, dest, opt);
+    fs.cpSync(src, dest, {
+        recursive: true,
+        ...opt,
+    });
 }
 exports._copyPathSync = _copyPathSync;
 async function _movePath(src, dest, opt) {
-    await fse.move(src, dest, opt);
+    await _copyPath(src, dest, opt);
+    await _removePath(src);
 }
 exports._movePath = _movePath;
 function _movePathSync(src, dest, opt) {
-    fse.moveSync(src, dest, opt);
+    _copyPathSync(src, dest, opt);
+    _removePathSync(src);
 }
 exports._movePathSync = _movePathSync;

package/dist/fs/json2env.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectToGithubActionsEnv = exports.objectToShellExport = exports.json2env = void 0;
-const fs = require("fs-extra");
+const fs = require("node:fs");
 const colors_1 = require("../colors");
+const fs_util_1 = require("./fs.util");
 const JSON2ENV_OPT_DEF = {
     saveEnvFile: true,
     bashEnv: true,
@@ -14,7 +15,7 @@ function json2env(opt) {
         ...JSON2ENV_OPT_DEF,
         ...opt,
     };
-    if (!fs.pathExistsSync(jsonPath)) {
+    if (!(0, fs_util_1._pathExistsSync)(jsonPath)) {
         if (fail) {
             throw new Error(`Path doesn't exist: ${jsonPath}`);
         }
@@ -27,7 +28,7 @@ function json2env(opt) {
         return;
     }
     // read file
-    const json = fs.readJsonSync(jsonPath);
+    const json = (0, fs_util_1._readJsonSync)(jsonPath);
     const exportStr = objectToShellExport(json, prefix);
     const githubStr = objectToGithubActionsEnv(json, prefix);
     if (debug) {
@@ -35,7 +36,7 @@ function json2env(opt) {
     }
     if (saveEnvFile) {
         const shPath = `${jsonPath}.sh`;
-        fs.writeFileSync(shPath, exportStr);
+        (0, fs_util_1._writeFileSync)(shPath, exportStr);
         if (!silent) {
             console.log(`json2env created ${(0, colors_1.dimGrey)(shPath)}:`);
             console.log(exportStr);

package/dist/fs/kpy.js

@@ -20,10 +20,12 @@ async function kpy(opt) {
         const destFilename = path.resolve(opt.outputDir, opt.flat ? basename : filename);
         if (!opt.dry) {
             if (opt.move) {
-                await (0, index_1._movePath)(srcFilename, destFilename, { overwrite });
+                await (0, index_1._movePath)(srcFilename, destFilename, {
+                    force: overwrite,
+                });
             }
             else {
-                await (0, index_1._copyPath)(srcFilename, destFilename, { overwrite });
+                await (0, index_1._copyPath)(srcFilename, destFilename, { force: overwrite });
             }
         }
         if (opt.verbose) {
@@ -48,10 +50,10 @@ function kpySync(opt) {
         const destFilename = path.resolve(opt.outputDir, opt.flat ? basename : filename);
         if (!opt.dry) {
             if (opt.move) {
-                (0, index_1._movePathSync)(srcFilename, destFilename, { overwrite });
+                (0, index_1._movePathSync)(srcFilename, destFilename, { force: overwrite });
             }
             else {
-                (0, index_1._copyPathSync)(srcFilename, destFilename, { overwrite });
+                (0, index_1._copyPathSync)(srcFilename, destFilename, { force: overwrite });
             }
         }
         if (opt.verbose) {

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretsDecrypt = void 0;
 const path = require("node:path");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fs = require("fs-extra");
 const colors_1 = require("../colors");
 const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
@@ -24,8 +24,8 @@ function secretsDecrypt(dir, file, encKey, del = false, jsonMode = false) {
             (0, js_lib_1._assert)(filename.endsWith('.json'), `${path.basename(filename)} MUST end with '.json'`);
             (0, js_lib_1._assert)(!filename.endsWith('.plain.json'), `${path.basename(filename)} MUST NOT end with '.plain.json'`);
             plainFilename = filename.replace('.json', '.plain.json');
-            const json = (0, crypto_util_1.decryptObject)(JSON.parse(fs.readFileSync(filename, 'utf8')), encKey);
-            fs.writeFileSync(plainFilename, JSON.stringify(json, null, 2));
+            const json = (0, crypto_util_1.decryptObject)((0, index_1._readJsonSync)(filename), encKey);
+            (0, index_1._writeJsonSync)(plainFilename, json, { spaces: 2 });
         }
         else {
             const enc = fs.readFileSync(filename);

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretsEncrypt = void 0;
+const fs = require("node:fs");
 const path = require("node:path");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fs = require("fs-extra");
 const colors_1 = require("../colors");
 const index_1 = require("../index");
 const crypto_util_1 = require("../security/crypto.util");
@@ -24,8 +24,8 @@ function secretsEncrypt(pattern, file, encKey, del = false, jsonMode = false) {
         if (jsonMode) {
             (0, js_lib_1._assert)(filename.endsWith('.plain.json'), `${path.basename(filename)} MUST end with '.plain.json'`);
             encFilename = filename.replace('.plain', '');
-            const json = (0, crypto_util_1.encryptObject)(JSON.parse(fs.readFileSync(filename, 'utf8')), encKey);
-            fs.writeFileSync(encFilename, JSON.stringify(json, null, 2));
+            const json = (0, crypto_util_1.encryptObject)((0, index_1._readJsonSync)(filename), encKey);
+            (0, index_1._writeJsonSync)(encFilename, json, { spaces: 2 });
         }
         else {
             const plain = fs.readFileSync(filename);

package/dist/stream/ndjson/pipelineFromNDJsonFile.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipelineFromNDJsonFile = void 0;
 const node_zlib_1 = require("node:zlib");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fs = require("fs-extra");
 const __1 = require("../..");
 const colors_1 = require("../../colors");
 const ndjson_model_1 = require("./ndjson.model");

package/dist/stream/ndjson/pipelineToNDJsonFile.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipelineToNDJsonFile = void 0;
 const node_zlib_1 = require("node:zlib");
+const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const fs = require("fs-extra");
 const __1 = require("../..");
 const colors_1 = require("../../colors");
 const ndjson_model_1 = require("./ndjson.model");
@@ -15,12 +15,12 @@ const transformToNDJson_1 = require("./transformToNDJson");
  */
 async function pipelineToNDJsonFile(streams, opt) {
     const { filePath, gzip, protectFromOverwrite = false } = opt;
-    if (protectFromOverwrite && fs.pathExistsSync(filePath)) {
+    if (protectFromOverwrite && (0, __1._pathExistsSync)(filePath)) {
         throw new js_lib_1.AppError(`pipelineToNDJsonFile: output file exists: ${filePath}`);
     }
     const started = Date.now();
     let rows = 0;
-    fs.ensureFileSync(filePath);
+    (0, __1._ensureFileSync)(filePath);
     console.log(`>> ${(0, colors_1.grey)(filePath)} started...`);
     await (0, __1._pipeline)([
         ...streams,

package/dist/validation/ajv/ajv.util.js

@@ -12,7 +12,7 @@ const ajvSchema_1 = require("./ajvSchema");
  * @experimental
  */
 function readJsonSchemas(patterns, opt) {
-    return __1.fastGlob.sync(patterns, opt).map(fileName => (0, __1._readJsonFileSync)(fileName));
+    return __1.fastGlob.sync(patterns, opt).map(fileName => (0, __1._readJsonSync)(fileName));
 }
 exports.readJsonSchemas = readJsonSchemas;
 /**

package/dist/validation/ajv/ajvSchema.js

@@ -59,7 +59,7 @@ class AjvSchema {
      */
     static readJsonSync(filePath, cfg = {}) {
         (0, index_1.requireFileToExist)(filePath);
-        const schema = (0, index_1._readJsonFileSync)(filePath);
+        const schema = (0, index_1._readJsonSync)(filePath);
         return new AjvSchema(schema, cfg);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.92.0",
+  "version": "12.93.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
-    "@types/fs-extra": "^11.0.1",
     "@types/jsonwebtoken": "^9.0.0",
     "@types/through2-concurrent": "^2.0.0",
     "ajv": "^8.6.2",
@@ -28,7 +27,6 @@
     "dotenv": "^16.0.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
-    "fs-extra": "^11.0.0",
     "globby": "^11.0.0",
     "got": "^11.0.1",
     "joi": "17.4.2",

package/src/fs/del.ts

@@ -1,7 +1,8 @@
+import * as fs from 'node:fs'
+import * as fsp from 'node:fs/promises'
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
-import * as fs from 'fs-extra'
 import { dimGrey, yellow } from '../colors'
-import { globby } from '../index'
+import { _pathExists, _pathExistsSync, globby } from '../index'
 
 export interface DelOptions {
   /**
@@ -70,7 +71,7 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
 
   if (dry) return
 
-  await pMap(filenames, filepath => fs.remove(filepath), { concurrency })
+  await pMap(filenames, filepath => fsp.unlink(filepath), { concurrency })
 
   // 2. glob only dirs, expand, delete only empty!
   let dirnames = await globby(patterns, {
@@ -82,7 +83,7 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
   // Add original patterns (if any of them are dirs)
   dirnames = dirnames.concat(
     await pFilter(patterns, async pattern => {
-      return (await fs.pathExists(pattern)) && (await fs.lstat(pattern)).isDirectory()
+      return (await _pathExists(pattern)) && (await fsp.lstat(pattern)).isDirectory()
     }),
   )
 
@@ -94,7 +95,7 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
   for await (const dirpath of dirnamesSorted) {
     if (await isEmptyDir(dirpath)) {
       // console.log(`empty dir: ${dirpath}`)
-      await fs.remove(dirpath)
+      await fsp.unlink(dirpath)
       deletedDirs.push(dirpath)
     }
   }
@@ -144,7 +145,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
 
   if (dry) return
 
-  filenames.forEach(filepath => fs.removeSync(filepath))
+  filenames.forEach(filepath => fs.unlinkSync(filepath))
 
   // 2. glob only dirs, expand, delete only empty!
   let dirnames = globby.sync(patterns, {
@@ -155,7 +156,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
 
   // Add original patterns (if any of them are dirs)
   dirnames = dirnames.concat(
-    patterns.filter(p => fs.pathExistsSync(p) && fs.lstatSync(p).isDirectory()),
+    patterns.filter(p => _pathExistsSync(p) && fs.lstatSync(p).isDirectory()),
   )
 
   const dirnamesSorted = dirnames.sort().reverse()
@@ -166,7 +167,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
   for (const dirpath of dirnamesSorted) {
     if (isEmptyDirSync(dirpath)) {
       // console.log(`empty dir: ${dirpath}`)
-      fs.removeSync(dirpath)
+      fs.unlinkSync(dirpath)
       deletedDirs.push(dirpath)
     }
   }
@@ -188,7 +189,7 @@ export function delSync(_opt: DelOptions | DelSingleOption): void {
 // 3. test each original pattern, if it exists and is directory and is empty - delete
 
 async function isEmptyDir(dir: string): Promise<boolean> {
-  return (await fs.readdir(dir)).length === 0
+  return (await fsp.readdir(dir)).length === 0
 }
 
 function isEmptyDirSync(dir: string): boolean {

package/src/fs/fs.util.ts

@@ -18,8 +18,6 @@ import * as fs from 'node:fs'
 import * as fsp from 'node:fs/promises'
 import * as path from 'node:path'
 import { _jsonParse } from '@naturalcycles/js-lib'
-import type { CopyOptions, CopyOptionsSync, MoveOptions } from 'fs-extra'
-import * as fse from 'fs-extra'
 
 export interface JsonOptions {
   spaces?: number
@@ -39,16 +37,26 @@ export function _readFileSync(filePath: string): string {
   return fs.readFileSync(filePath, 'utf8')
 }
 
-export async function _readJsonFile<T = unknown>(filePath: string): Promise<T> {
+export async function _readJson<T = unknown>(filePath: string): Promise<T> {
   const str = await fsp.readFile(filePath, 'utf8')
   return _jsonParse(str)
 }
 
-export function _readJsonFileSync<T = unknown>(filePath: string): T {
+/**
+ * @deprecated use _readJson
+ */
+export const _readJsonFile = _readJson
+
+export function _readJsonSync<T = unknown>(filePath: string): T {
   const str = fs.readFileSync(filePath, 'utf8')
   return _jsonParse(str)
 }
 
+/**
+ * @deprecated use _readJsonSync
+ */
+export const _readJsonFileSync = _readJsonSync
+
 export async function _writeFile(filePath: string, data: string | Buffer): Promise<void> {
   await fsp.writeFile(filePath, data)
 }
@@ -75,34 +83,46 @@ export function _outputFileSync(filePath: string, data: string | Buffer): void {
   fs.writeFileSync(filePath, data)
 }
 
-export async function _writeJsonFile(
-  filePath: string,
-  data: any,
-  opt?: JsonOptions,
-): Promise<void> {
+export async function _writeJson(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
   const str = JSON.stringify(data, null, opt?.spaces)
   await fsp.writeFile(filePath, str)
 }
 
-export function _writeJsonFileSync(filePath: string, data: any, opt?: JsonOptions): void {
+/**
+ * @deprecated use _writeJson
+ */
+export const _writeJsonFile = _writeJson
+
+export function _writeJsonSync(filePath: string, data: any, opt?: JsonOptions): void {
   const str = JSON.stringify(data, null, opt?.spaces)
   fs.writeFileSync(filePath, str)
 }
 
-export async function _outputJsonFile(
-  filePath: string,
-  data: any,
-  opt?: JsonOptions,
-): Promise<void> {
+/**
+ * @deprecated use _writeJsonSync
+ */
+export const _writeJsonFileSync = _writeJsonSync
+
+export async function _outputJson(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
   const str = JSON.stringify(data, null, opt?.spaces)
   await _outputFile(filePath, str)
 }
 
-export function _outputJsonFileSync(filePath: string, data: any, opt?: JsonOptions): void {
+/**
+ * @deprecated use _outputJson
+ */
+export const _outputJsonFile = _outputJson
+
+export function _outputJsonSync(filePath: string, data: any, opt?: JsonOptions): void {
   const str = JSON.stringify(data, null, opt?.spaces)
   _outputFileSync(filePath, str)
 }
 
+/**
+ * @deprecated use _outputJsonSync
+ */
+export const _outputJsonFileSync = _outputJsonSync
+
 export async function _pathExists(filePath: string): Promise<boolean> {
   try {
     await fsp.access(filePath)
@@ -206,20 +226,32 @@ export function _emptyDirSync(dirPath: string): void {
   items.forEach(item => _removePathSync(path.join(dirPath, item)))
 }
 
-// copyFile/moveFile - let's keep using fs-extra for now
-
-export async function _copyPath(src: string, dest: string, opt?: CopyOptions): Promise<void> {
-  await fse.copy(src, dest, opt)
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
+export async function _copyPath(src: string, dest: string, opt?: fs.CopyOptions): Promise<void> {
+  await fsp.cp(src, dest, {
+    recursive: true,
+    ...opt,
+  })
 }
 
-export function _copyPathSync(src: string, dest: string, opt?: CopyOptionsSync): void {
-  fse.copySync(src, dest, opt)
+/**
+ * Cautious, underlying Node function is currently Experimental.
+ */
+export function _copyPathSync(src: string, dest: string, opt?: fs.CopySyncOptions): void {
+  fs.cpSync(src, dest, {
+    recursive: true,
+    ...opt,
+  })
 }
 
-export async function _movePath(src: string, dest: string, opt?: MoveOptions): Promise<void> {
-  await fse.move(src, dest, opt)
+export async function _movePath(src: string, dest: string, opt?: fs.CopyOptions): Promise<void> {
+  await _copyPath(src, dest, opt)
+  await _removePath(src)
 }
 
-export function _movePathSync(src: string, dest: string, opt?: MoveOptions): void {
-  fse.moveSync(src, dest, opt)
+export function _movePathSync(src: string, dest: string, opt?: fs.CopySyncOptions): void {
+  _copyPathSync(src, dest, opt)
+  _removePathSync(src)
 }

package/src/fs/json2env.ts

@@ -1,5 +1,6 @@
-import * as fs from 'fs-extra'
+import * as fs from 'node:fs'
 import { dimGrey } from '../colors'
+import { _pathExistsSync, _readJsonSync, _writeFileSync } from './fs.util'
 
 export interface Json2EnvOptions {
   jsonPath: string
@@ -42,7 +43,7 @@ export function json2env(opt: Json2EnvOptions): void {
     ...opt,
   }
 
-  if (!fs.pathExistsSync(jsonPath)) {
+  if (!_pathExistsSync(jsonPath)) {
     if (fail) {
       throw new Error(`Path doesn't exist: ${jsonPath}`)
     }
@@ -59,7 +60,7 @@ export function json2env(opt: Json2EnvOptions): void {
   }
 
   // read file
-  const json = fs.readJsonSync(jsonPath)
+  const json = _readJsonSync(jsonPath)
 
   const exportStr = objectToShellExport(json, prefix)
   const githubStr = objectToGithubActionsEnv(json, prefix)
@@ -70,7 +71,7 @@ export function json2env(opt: Json2EnvOptions): void {
 
   if (saveEnvFile) {
     const shPath = `${jsonPath}.sh`
-    fs.writeFileSync(shPath, exportStr)
+    _writeFileSync(shPath, exportStr)
 
     if (!silent) {
       console.log(`json2env created ${dimGrey(shPath)}:`)

package/src/fs/kpy.ts

@@ -72,9 +72,11 @@ export async function kpy(opt: KpyOptions): Promise<void> {
 
       if (!opt.dry) {
         if (opt.move) {
-          await _movePath(srcFilename, destFilename, { overwrite })
+          await _movePath(srcFilename, destFilename, {
+            force: overwrite,
+          })
         } else {
-          await _copyPath(srcFilename, destFilename, { overwrite })
+          await _copyPath(srcFilename, destFilename, { force: overwrite })
         }
       }
 
@@ -108,9 +110,9 @@ export function kpySync(opt: KpyOptions): void {
 
     if (!opt.dry) {
       if (opt.move) {
-        _movePathSync(srcFilename, destFilename, { overwrite })
+        _movePathSync(srcFilename, destFilename, { force: overwrite })
       } else {
-        _copyPathSync(srcFilename, destFilename, { overwrite })
+        _copyPathSync(srcFilename, destFilename, { force: overwrite })
       }
     }
 

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

@@ -1,8 +1,8 @@
 import * as path from 'node:path'
+import * as fs from 'node:fs'
 import { _assert } from '@naturalcycles/js-lib'
-import * as fs from 'fs-extra'
 import { dimGrey, yellow } from '../colors'
-import { fastGlob } from '../index'
+import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'
 import { decryptObject, decryptRandomIVBuffer } from '../security/crypto.util'
 
 export interface DecryptCLIOptions {
@@ -44,9 +44,9 @@ export function secretsDecrypt(
       )
       plainFilename = filename.replace('.json', '.plain.json')
 
-      const json = decryptObject(JSON.parse(fs.readFileSync(filename, 'utf8')), encKey)
+      const json = decryptObject(_readJsonSync(filename), encKey)
 
-      fs.writeFileSync(plainFilename, JSON.stringify(json, null, 2))
+      _writeJsonSync(plainFilename, json, { spaces: 2 })
     } else {
       const enc = fs.readFileSync(filename)
       const plain = decryptRandomIVBuffer(enc, encKey)

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

@@ -1,8 +1,8 @@
+import * as fs from 'node:fs'
 import * as path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
-import * as fs from 'fs-extra'
 import { dimGrey, yellow } from '../colors'
-import { fastGlob } from '../index'
+import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'
 import { encryptObject, encryptRandomIVBuffer } from '../security/crypto.util'
 
 export interface EncryptCLIOptions {
@@ -41,9 +41,9 @@ export function secretsEncrypt(
       )
       encFilename = filename.replace('.plain', '')
 
-      const json = encryptObject(JSON.parse(fs.readFileSync(filename, 'utf8')), encKey)
+      const json = encryptObject(_readJsonSync(filename), encKey)
 
-      fs.writeFileSync(encFilename, JSON.stringify(json, null, 2))
+      _writeJsonSync(encFilename, json, { spaces: 2 })
     } else {
       const plain = fs.readFileSync(filename)
       const enc = encryptRandomIVBuffer(plain, encKey)

package/src/security/secret.util.ts

@@ -122,7 +122,7 @@ export function secretOptional<T = string>(k: string, parseJson = false): T | un
   if (!v) return
 
   if (parseJson) {
-    v = _jsonParseIfPossible(v) as any
+    v = _jsonParseIfPossible(v)
   }
 
   return v as T

package/src/stream/ndjson/pipelineFromNDJsonFile.ts

@@ -1,6 +1,6 @@
 import { createUnzip, ZlibOptions } from 'node:zlib'
+import * as fs from 'node:fs'
 import { _hb } from '@naturalcycles/js-lib'
-import * as fs from 'fs-extra'
 import { transformTap, _pipeline, transformSplit } from '../..'
 import { dimWhite, grey } from '../../colors'
 import { NDJsonStats } from './ndjson.model'

package/src/stream/ndjson/pipelineToNDJsonFile.ts

@@ -1,7 +1,7 @@
 import { createGzip, ZlibOptions } from 'node:zlib'
+import * as fs from 'node:fs'
 import { AppError } from '@naturalcycles/js-lib'
-import * as fs from 'fs-extra'
-import { transformTap, _pipeline } from '../..'
+import { transformTap, _pipeline, _pathExistsSync, _ensureFileSync } from '../..'
 import { grey } from '../../colors'
 import { NDJsonStats } from './ndjson.model'
 import { transformToNDJson, TransformToNDJsonOptions } from './transformToNDJson'
@@ -37,14 +37,14 @@ export async function pipelineToNDJsonFile(
 ): Promise<NDJsonStats> {
   const { filePath, gzip, protectFromOverwrite = false } = opt
 
-  if (protectFromOverwrite && fs.pathExistsSync(filePath)) {
+  if (protectFromOverwrite && _pathExistsSync(filePath)) {
     throw new AppError(`pipelineToNDJsonFile: output file exists: ${filePath}`)
   }
 
   const started = Date.now()
   let rows = 0
 
-  fs.ensureFileSync(filePath)
+  _ensureFileSync(filePath)
 
   console.log(`>> ${grey(filePath)} started...`)
 

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

@@ -1,5 +1,5 @@
 import { JsonSchema } from '@naturalcycles/js-lib'
-import { _readJsonFileSync, fastGlob } from '../..'
+import { _readJsonSync, fastGlob } from '../..'
 import type { FastGlobOptions } from '../..'
 import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
 
@@ -12,7 +12,7 @@ import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
  * @experimental
  */
 export function readJsonSchemas(patterns: string | string[], opt?: FastGlobOptions): JsonSchema[] {
-  return fastGlob.sync(patterns, opt).map(fileName => _readJsonFileSync(fileName))
+  return fastGlob.sync(patterns, opt).map(fileName => _readJsonSync(fileName))
 }
 
 /**

package/src/validation/ajv/ajvSchema.ts

@@ -8,7 +8,7 @@ import {
   CommonLogger,
 } from '@naturalcycles/js-lib'
 import Ajv, { ValidateFunction } from 'ajv'
-import { _readJsonFileSync, inspectAny, requireFileToExist } from '../../index'
+import { _readJsonSync, inspectAny, requireFileToExist } from '../../index'
 import { AjvValidationError } from './ajvValidationError'
 import { getAjv } from './getAjv'
 
@@ -131,7 +131,7 @@ export class AjvSchema<T = unknown> {
     cfg: Partial<AjvSchemaCfg> = {},
   ): AjvSchema<T> {
     requireFileToExist(filePath)
-    const schema = _readJsonFileSync<JsonSchema<T>>(filePath)
+    const schema = _readJsonSync<JsonSchema<T>>(filePath)
     return new AjvSchema<T>(schema, cfg)
   }