@naturalcycles/nodejs-lib 15.1.0 → 15.2.0

package/dist/bin/slack-this.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { SlackService } from '../index.js';
 import { runScript } from '../script/runScript.js';
-import { _yargs } from '../yargs/index.js';
+import { _yargs } from '../yargs/yargs.util.js';
 runScript(async () => {
     const { channel, msg, username, emoji, webhook: webhookUrl, } = _yargs().options({
         channel: {

package/dist/{util/exec2.js → exec2.js}

@@ -1,7 +1,7 @@
 import { execSync, spawn, spawnSync } from 'node:child_process';
 import { _substringAfterLast, } from '@naturalcycles/js-lib';
 import { _since, AppError } from '@naturalcycles/js-lib';
-import { dimGrey, dimRed, hasColors, white } from '../colors/colors.js';
+import { dimGrey, dimRed, hasColors, white } from './colors/colors.js';
 /**
  * Set of utility functions to work with Spawn / Exec.
  *

package/dist/fs/fs2.d.ts

@@ -1,7 +1,5 @@
 import type { RmOptions } from 'node:fs';
 import fs from 'node:fs';
-import type { DumpOptions } from 'js-yaml';
-import type { ReadableTyped, TransformTyped } from '../stream/stream.model.js';
 /**
  * fs2 conveniently groups filesystem functions together.
  * Supposed to be almost a drop-in replacement for these things together:
@@ -23,20 +21,14 @@ declare class FS2 {
     readBufferAsync(filePath: string): Promise<Buffer>;
     readJson<T = unknown>(filePath: string): T;
     readJsonAsync<T = unknown>(filePath: string): Promise<T>;
-    readYaml<T = unknown>(filePath: string): T;
-    readYamlAsync<T = unknown>(filePath: string): Promise<T>;
     writeFile(filePath: string, data: string | Buffer): void;
     writeFileAsync(filePath: string, data: string | Buffer): Promise<void>;
     writeJson(filePath: string, data: any, opt?: JsonOptions): void;
     writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
-    writeYaml(filePath: string, data: any, opt?: DumpOptions): void;
-    writeYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void>;
     appendFile(filePath: string, data: string | Buffer): void;
     appendFileAsync(filePath: string, data: string | Buffer): Promise<void>;
     outputJson(filePath: string, data: any, opt?: JsonOptions): void;
     outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
-    outputYaml(filePath: string, data: any, opt?: DumpOptions): void;
-    outputYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void>;
     outputFile(filePath: string, data: string | Buffer): void;
     outputFileAsync(filePath: string, data: string | Buffer): Promise<void>;
     pathExists(filePath: string): boolean;
@@ -80,8 +72,6 @@ declare class FS2 {
     readdirAsync: typeof fs.promises.readdir;
     createWriteStream: typeof fs.createWriteStream;
     createReadStream: typeof fs.createReadStream;
-    createReadStreamAsNDJSON<ROW = any>(inputPath: string): ReadableTyped<ROW>;
-    createWriteStreamAsNDJSON(outputPath: string): TransformTyped<any, any>[];
 }
 export declare const fs2: FS2;
 export interface JsonOptions {

package/dist/fs/fs2.js

@@ -16,11 +16,7 @@ Credit to: fs-extra (https://github.com/jprichardson/node-fs-extra)
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
 import path from 'node:path';
-import { createGzip, createUnzip } from 'node:zlib';
-import { _isTruthy, _jsonParse } from '@naturalcycles/js-lib';
-import yaml from 'js-yaml';
-import { transformToNDJson } from '../stream/ndjson/transformToNDJson.js';
-import { transformSplitOnNewline } from '../stream/transform/transformSplit.js';
+import { _jsonParse } from '@naturalcycles/js-lib';
 /**
  * fs2 conveniently groups filesystem functions together.
  * Supposed to be almost a drop-in replacement for these things together:
@@ -60,12 +56,6 @@ class FS2 {
         // eslint-disable-next-line @typescript-eslint/return-await
         return _jsonParse(str);
     }
-    readYaml(filePath) {
-        return yaml.load(fs.readFileSync(filePath, 'utf8'));
-    }
-    async readYamlAsync(filePath) {
-        return yaml.load(await fsp.readFile(filePath, 'utf8'));
-    }
     writeFile(filePath, data) {
         fs.writeFileSync(filePath, data);
     }
@@ -80,14 +70,6 @@ class FS2 {
         const str = stringify(data, opt);
         await fsp.writeFile(filePath, str);
     }
-    writeYaml(filePath, data, opt) {
-        const str = yaml.dump(data, opt);
-        fs.writeFileSync(filePath, str);
-    }
-    async writeYamlAsync(filePath, data, opt) {
-        const str = yaml.dump(data, opt);
-        await fsp.writeFile(filePath, str);
-    }
     appendFile(filePath, data) {
         fs.appendFileSync(filePath, data);
     }
@@ -102,14 +84,6 @@ class FS2 {
         const str = stringify(data, opt);
         await this.outputFileAsync(filePath, str);
     }
-    outputYaml(filePath, data, opt) {
-        const str = yaml.dump(data, opt);
-        this.outputFile(filePath, str);
-    }
-    async outputYamlAsync(filePath, data, opt) {
-        const str = yaml.dump(data, opt);
-        await this.outputFileAsync(filePath, str);
-    }
     outputFile(filePath, data) {
         const dirPath = path.dirname(filePath);
         if (!fs.existsSync(dirPath)) {
@@ -289,64 +263,6 @@ class FS2 {
     readdirAsync = fsp.readdir;
     createWriteStream = fs.createWriteStream;
     createReadStream = fs.createReadStream;
-    /*
-    Returns a Readable of [already parsed] NDJSON objects.
-  
-    Replaces a list of operations:
-    - requireFileToExist(inputPath)
-    - fs.createReadStream
-    - createUnzip (only if path ends with '.gz')
-    - transformSplitOnNewline
-    - transformJsonParse
-  
-    To add a Limit or Offset: just add .take() or .drop(), example:
-  
-    _pipeline([
-      fs2.createReadStreamAsNDJSON().take(100),
-      transformX(),
-    ])
-     */
-    createReadStreamAsNDJSON(inputPath) {
-        this.requireFileToExist(inputPath);
-        let stream = fs
-            .createReadStream(inputPath, {
-            highWaterMark: 64 * 1024, // no observed speedup
-        })
-            .on('error', err => stream.emit('error', err));
-        if (inputPath.endsWith('.gz')) {
-            stream = stream.pipe(createUnzip({
-                chunkSize: 64 * 1024, // speedup from ~3200 to 3800 rps!
-            }));
-        }
-        return stream.pipe(transformSplitOnNewline()).map(line => JSON.parse(line));
-        // For some crazy reason .map is much faster than transformJsonParse!
-        // ~5000 vs ~4000 rps !!!
-        // .on('error', err => stream.emit('error', err))
-        // .pipe(transformJsonParse<ROW>())
-    }
-    /*
-    Returns an array of Transforms, so that you can ...destructure them at
-    the end of the _pipeline.
-  
-    Replaces a list of operations:
-    - transformToNDJson
-    - createGzip (only if path ends with '.gz')
-    - fs.createWriteStream
-     */
-    createWriteStreamAsNDJSON(outputPath) {
-        this.ensureFile(outputPath);
-        return [
-            transformToNDJson(),
-            outputPath.endsWith('.gz')
-                ? createGzip({
-                // chunkSize: 64 * 1024, // no observed speedup
-                })
-                : undefined,
-            fs.createWriteStream(outputPath, {
-            // highWaterMark: 64 * 1024, // no observed speedup
-            }),
-        ].filter(_isTruthy);
-    }
 }
 export const fs2 = new FS2();
 function stringify(data, opt) {

package/dist/fs/yaml2.d.ts

@@ -0,0 +1,11 @@
+import type { DumpOptions } from 'js-yaml';
+declare class Yaml2 {
+    readYaml<T = unknown>(filePath: string): T;
+    readYamlAsync<T = unknown>(filePath: string): Promise<T>;
+    writeYaml(filePath: string, data: any, opt?: DumpOptions): void;
+    writeYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void>;
+    outputYaml(filePath: string, data: any, opt?: DumpOptions): void;
+    outputYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void>;
+}
+export declare const yaml2: Yaml2;
+export {};

package/dist/fs/yaml2.js

@@ -0,0 +1,29 @@
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import yaml from 'js-yaml';
+import { fs2 } from './fs2.js';
+class Yaml2 {
+    readYaml(filePath) {
+        return yaml.load(fs.readFileSync(filePath, 'utf8'));
+    }
+    async readYamlAsync(filePath) {
+        return yaml.load(await fsp.readFile(filePath, 'utf8'));
+    }
+    writeYaml(filePath, data, opt) {
+        const str = yaml.dump(data, opt);
+        fs.writeFileSync(filePath, str);
+    }
+    async writeYamlAsync(filePath, data, opt) {
+        const str = yaml.dump(data, opt);
+        await fsp.writeFile(filePath, str);
+    }
+    outputYaml(filePath, data, opt) {
+        const str = yaml.dump(data, opt);
+        fs2.outputFile(filePath, str);
+    }
+    async outputYamlAsync(filePath, data, opt) {
+        const str = yaml.dump(data, opt);
+        await fs2.outputFileAsync(filePath, str);
+    }
+}
+export const yaml2 = new Yaml2();

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from './buffer/buffer.util.js';
-export * from './colors/colors.js';
 export * from './diff/tableDiff.js';
 export * from './infra/process.util.js';
 export * from './log/log.util.js';
@@ -14,7 +13,4 @@ export * from './slack/slack.service.model.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';
-export * from './util/exec2.js';
 export * from './util/git2.js';
-export * from './util/lruMemoCache.js';
-export * from './util/zip.util.js';

package/dist/index.js

@@ -1,5 +1,4 @@
 export * from './buffer/buffer.util.js';
-export * from './colors/colors.js';
 export * from './diff/tableDiff.js';
 export * from './infra/process.util.js';
 export * from './log/log.util.js';
@@ -14,7 +13,4 @@ export * from './slack/slack.service.model.js';
 export * from './string/inspect.js';
 export * from './util/buildInfo.util.js';
 export * from './util/env.util.js';
-export * from './util/exec2.js';
 export * from './util/git2.js';
-export * from './util/lruMemoCache.js';
-export * from './util/zip.util.js';

package/dist/script/runScript.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import type { CommonLogger } from '@naturalcycles/js-lib';
 export interface RunScriptOptions {
     /**

package/dist/script/runScript.js

@@ -1,7 +1,5 @@
-import 'dotenv/config';
 import os from 'node:os';
 import { pDelay, setGlobalStringifyFunction } from '@naturalcycles/js-lib';
-import { dimGrey } from '../colors/colors.js';
 import { inspectStringifyFn } from '../string/inspect.js';
 const { DEBUG_RUN_SCRIPT } = process.env;
 /**
@@ -23,7 +21,6 @@ const { DEBUG_RUN_SCRIPT } = process.env;
  * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn, opt = {}) {
-    checkAndlogEnvironment();
     setGlobalStringifyFunction(inspectStringifyFn);
     const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt;
     if (registerUncaughtExceptionHandlers || DEBUG_RUN_SCRIPT) {
@@ -42,6 +39,8 @@ export function runScript(fn, opt = {}) {
     const timeout = setTimeout(() => { }, 10000000);
     void (async () => {
         try {
+            await import('dotenv/config');
+            await checkAndlogEnvironment();
             await fn();
             await pDelay(); // to ensure all async operations are completed
             if (DEBUG_RUN_SCRIPT)
@@ -62,7 +61,8 @@ export function runScript(fn, opt = {}) {
         }
     })();
 }
-function checkAndlogEnvironment() {
+async function checkAndlogEnvironment() {
+    const { dimGrey } = await import('../colors/colors.js');
     const { platform, arch, versions: { node }, env: { CPU_LIMIT, NODE_OPTIONS, TZ }, } = process;
     const cpuLimit = Number(CPU_LIMIT) || undefined;
     const availableParallelism = os.availableParallelism?.();

package/dist/stream/index.d.ts

@@ -1,3 +1,5 @@
+export * from './ndjson/createReadStreamAsNDJSON.js';
+export * from './ndjson/createWriteStreamAsNDJSON.js';
 export * from './ndjson/ndjson.model.js';
 export * from './ndjson/ndjsonMap.js';
 export * from './ndjson/ndjsonStreamForEach.js';

package/dist/stream/index.js

@@ -1,3 +1,5 @@
+export * from './ndjson/createReadStreamAsNDJSON.js';
+export * from './ndjson/createWriteStreamAsNDJSON.js';
 export * from './ndjson/ndjson.model.js';
 export * from './ndjson/ndjsonMap.js';
 export * from './ndjson/ndjsonStreamForEach.js';

package/dist/stream/ndjson/createReadStreamAsNDJSON.d.ts

@@ -0,0 +1,19 @@
+import type { ReadableTyped } from '../stream.model.js';
+/**
+  Returns a Readable of [already parsed] NDJSON objects.
+ 
+  Replaces a list of operations:
+  - requireFileToExist(inputPath)
+  - fs.createReadStream
+  - createUnzip (only if path ends with '.gz')
+  - transformSplitOnNewline
+  - transformJsonParse
+ 
+  To add a Limit or Offset: just add .take() or .drop(), example:
+ 
+  _pipeline([
+    fs2.createReadStreamAsNDJSON().take(100),
+    transformX(),
+  ])
+ */
+export declare function createReadStreamAsNDJSON<ROW = any>(inputPath: string): ReadableTyped<ROW>;

package/dist/stream/ndjson/createReadStreamAsNDJSON.js

@@ -0,0 +1,38 @@
+import { createUnzip } from 'node:zlib';
+import { fs2 } from '../../fs/fs2.js';
+import { transformSplitOnNewline } from '../transform/transformSplit.js';
+/**
+  Returns a Readable of [already parsed] NDJSON objects.
+ 
+  Replaces a list of operations:
+  - requireFileToExist(inputPath)
+  - fs.createReadStream
+  - createUnzip (only if path ends with '.gz')
+  - transformSplitOnNewline
+  - transformJsonParse
+ 
+  To add a Limit or Offset: just add .take() or .drop(), example:
+ 
+  _pipeline([
+    fs2.createReadStreamAsNDJSON().take(100),
+    transformX(),
+  ])
+ */
+export function createReadStreamAsNDJSON(inputPath) {
+    fs2.requireFileToExist(inputPath);
+    let stream = fs2
+        .createReadStream(inputPath, {
+        highWaterMark: 64 * 1024, // no observed speedup
+    })
+        .on('error', err => stream.emit('error', err));
+    if (inputPath.endsWith('.gz')) {
+        stream = stream.pipe(createUnzip({
+            chunkSize: 64 * 1024, // speedup from ~3200 to 3800 rps!
+        }));
+    }
+    return stream.pipe(transformSplitOnNewline()).map(line => JSON.parse(line));
+    // For some crazy reason .map is much faster than transformJsonParse!
+    // ~5000 vs ~4000 rps !!!
+    // .on('error', err => stream.emit('error', err))
+    // .pipe(transformJsonParse<ROW>())
+}

package/dist/stream/ndjson/createWriteStreamAsNDJSON.d.ts

@@ -0,0 +1,11 @@
+import type { TransformTyped } from '../stream.model.js';
+/**
+  Returns an array of Transforms, so that you can ...destructure them at
+  the end of the _pipeline.
+ 
+  Replaces a list of operations:
+  - transformToNDJson
+  - createGzip (only if path ends with '.gz')
+  - fs.createWriteStream
+ */
+export declare function createWriteStreamAsNDJSON(outputPath: string): TransformTyped<any, any>[];

package/dist/stream/ndjson/createWriteStreamAsNDJSON.js

@@ -0,0 +1,27 @@
+import { createGzip } from 'node:zlib';
+import { _isTruthy } from '@naturalcycles/js-lib';
+import { fs2 } from '../../fs/fs2.js';
+import { transformToNDJson } from './transformToNDJson.js';
+/**
+  Returns an array of Transforms, so that you can ...destructure them at
+  the end of the _pipeline.
+ 
+  Replaces a list of operations:
+  - transformToNDJson
+  - createGzip (only if path ends with '.gz')
+  - fs.createWriteStream
+ */
+export function createWriteStreamAsNDJSON(outputPath) {
+    fs2.ensureFile(outputPath);
+    return [
+        transformToNDJson(),
+        outputPath.endsWith('.gz')
+            ? createGzip({
+            // chunkSize: 64 * 1024, // no observed speedup
+            })
+            : undefined,
+        fs2.createWriteStream(outputPath, {
+        // highWaterMark: 64 * 1024, // no observed speedup
+        }),
+    ].filter(_isTruthy);
+}

package/dist/stream/ndjson/ndjsonMap.d.ts

@@ -1,5 +1,5 @@
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '../index.js';
+import { type TransformLogProgressOptions, type TransformMapOptions } from '../index.js';
 export interface NDJSONMapOptions<IN = any, OUT = IN> extends TransformMapOptions<IN, OUT>, TransformLogProgressOptions<IN> {
     inputFilePath: string;
     outputFilePath: string;

package/dist/stream/ndjson/ndjsonMap.js

@@ -1,5 +1,5 @@
 import { ErrorMode } from '@naturalcycles/js-lib';
-import { fs2 } from '../../fs/index.js';
+import { createReadStreamAsNDJSON, createWriteStreamAsNDJSON, } from '../index.js';
 import { _pipeline, transformLimit, transformLogProgress, transformMap } from '../index.js';
 /**
  * Unzips input file automatically, if it ends with `.gz`.
@@ -11,9 +11,7 @@ export async function ndjsonMap(mapper, opt) {
         inputFilePath,
         outputFilePath,
     });
-    const readable = fs2
-        .createReadStreamAsNDJSON(inputFilePath)
-        .take(limitInput || Number.POSITIVE_INFINITY);
+    const readable = createReadStreamAsNDJSON(inputFilePath).take(limitInput || Number.POSITIVE_INFINITY);
     await _pipeline([
         readable,
         transformLogProgress({ metric: 'read', ...opt }),
@@ -24,6 +22,6 @@ export async function ndjsonMap(mapper, opt) {
         }),
         transformLimit({ limit: limitOutput, sourceReadable: readable }),
         transformLogProgress({ metric: 'saved', logEvery: logEveryOutput }),
-        ...fs2.createWriteStreamAsNDJSON(outputFilePath),
+        ...createWriteStreamAsNDJSON(outputFilePath),
     ]);
 }

package/dist/stream/ndjson/ndjsonStreamForEach.d.ts

@@ -1,5 +1,5 @@
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib';
-import type { TransformLogProgressOptions, TransformMapOptions } from '../index.js';
+import { type TransformLogProgressOptions, type TransformMapOptions } from '../index.js';
 export interface NDJSONStreamForEachOptions<IN = any> extends TransformMapOptions<IN, void>, TransformLogProgressOptions<IN> {
     inputFilePath: string;
 }

package/dist/stream/ndjson/ndjsonStreamForEach.js

@@ -1,12 +1,12 @@
 import { ErrorMode } from '@naturalcycles/js-lib';
-import { fs2 } from '../../fs/index.js';
+import { createReadStreamAsNDJSON, } from '../index.js';
 import { _pipeline, transformLogProgress, transformMap, writableVoid } from '../index.js';
 /**
  * Convenience function to `forEach` through an ndjson file.
  */
 export async function ndjsonStreamForEach(mapper, opt) {
     await _pipeline([
-        fs2.createReadStreamAsNDJSON(opt.inputFilePath),
+        createReadStreamAsNDJSON(opt.inputFilePath),
         transformMap(mapper, {
             errorMode: ErrorMode.THROW_AGGREGATED,
             ...opt,

package/dist/stream/sizeStack.js

@@ -1,6 +1,6 @@
 import { _hb, NumberStack } from '@naturalcycles/js-lib';
 import { yellow } from '../colors/colors.js';
-import { gzipBuffer } from '../util/zip.util.js';
+import { gzipBuffer } from '../zip/zip.util.js';
 export class SizeStack extends NumberStack {
     name;
     constructor(name, size) {

package/dist/util/env.util.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import type { ValuesOf } from '@naturalcycles/js-lib';
 /**
  * @example

package/dist/util/env.util.js

@@ -1,4 +1,3 @@
-import 'dotenv/config'; // ensure .env is read before requiring keys
 import { fs2 } from '../fs/fs2.js';
 /**
  * @example

package/dist/util/git2.js

@@ -1,7 +1,6 @@
 import { execSync } from 'node:child_process';
 import { basename } from 'node:path';
-import { grey } from '../colors/colors.js';
-import { exec2 } from './exec2.js';
+import { exec2 } from '../exec2.js';
 /**
  * Set of utility functions to work with git.
  */
@@ -34,7 +33,7 @@ class Git2 {
         const cmd = `git commit -a --no-verify -m "${msg}"`;
         // const cmd = `git`
         // const args = ['commit', '-a', '--no-verify', '-m', msg]
-        console.log(grey(cmd));
+        console.log(cmd);
         try {
             execSync(cmd, {
                 stdio: 'inherit',

package/dist/{util → zip}/zip.util.js

@@ -4,7 +4,6 @@ const deflate = promisify(zlib.deflate.bind(zlib));
 const inflate = promisify(zlib.inflate.bind(zlib));
 const gzip = promisify(zlib.gzip.bind(zlib));
 const gunzip = promisify(zlib.gunzip.bind(zlib));
-// string > compressed buffer
 /**
  * deflateBuffer uses `deflate`.
  * It's 9 bytes shorter than `gzip`.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.1.0",
+  "version": "15.2.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -27,14 +27,21 @@
   },
   "exports": {
     ".": "./dist/index.js",
+    "./lruMemoCache": "./dist/cache/lruMemoCache.js",
+    "./colors": "./dist/colors/colors.js",
     "./csv": "./dist/csv/index.js",
-    "./fs": "./dist/fs/index.js",
+    "./exec2": "./dist/exec2.js",
+    "./fs2": "./dist/fs/fs2.js",
+    "./env": "./dist/fs/json2env.js",
+    "./kpy": "./dist/fs/kpy.js",
+    "./yaml2": "./dist/fs/yaml2.js",
     "./glob": "./dist/glob/index.js",
-    "./jwt": "./dist/jwt/index.js",
+    "./jwt": "./dist/jwt/jwt.service.js",
     "./stream": "./dist/stream/index.js",
-    "./yargs": "./dist/yargs/index.js",
+    "./yargs": "./dist/yargs/yargs.util.js",
     "./ajv": "./dist/validation/ajv/index.js",
-    "./joi": "./dist/validation/joi/index.js"
+    "./joi": "./dist/validation/joi/index.js",
+    "./zip": "./dist/zip/zip.util.js"
   },
   "bin": {
     "kpy": "dist/bin/kpy.js",

package/src/bin/slack-this.ts

@@ -2,7 +2,7 @@
 
 import { SlackService } from '../index.js'
 import { runScript } from '../script/runScript.js'
-import { _yargs } from '../yargs/index.js'
+import { _yargs } from '../yargs/yargs.util.js'
 
 runScript(async () => {
   const {

package/src/{util/exec2.ts → exec2.ts}

@@ -6,7 +6,7 @@ import {
   type UnixTimestampMillis,
 } from '@naturalcycles/js-lib'
 import { _since, AppError } from '@naturalcycles/js-lib'
-import { dimGrey, dimRed, hasColors, white } from '../colors/colors.js'
+import { dimGrey, dimRed, hasColors, white } from './colors/colors.js'
 
 /**
  * Set of utility functions to work with Spawn / Exec.

package/src/fs/fs2.ts

@@ -18,13 +18,7 @@ import type { RmOptions, Stats } from 'node:fs'
 import fs from 'node:fs'
 import fsp from 'node:fs/promises'
 import path from 'node:path'
-import { createGzip, createUnzip } from 'node:zlib'
-import { _isTruthy, _jsonParse } from '@naturalcycles/js-lib'
-import type { DumpOptions } from 'js-yaml'
-import yaml from 'js-yaml'
-import { transformToNDJson } from '../stream/ndjson/transformToNDJson.js'
-import type { ReadableTyped, TransformTyped } from '../stream/stream.model.js'
-import { transformSplitOnNewline } from '../stream/transform/transformSplit.js'
+import { _jsonParse } from '@naturalcycles/js-lib'
 
 /**
  * fs2 conveniently groups filesystem functions together.
@@ -72,14 +66,6 @@ class FS2 {
     return _jsonParse(str)
   }
 
-  readYaml<T = unknown>(filePath: string): T {
-    return yaml.load(fs.readFileSync(filePath, 'utf8')) as T
-  }
-
-  async readYamlAsync<T = unknown>(filePath: string): Promise<T> {
-    return yaml.load(await fsp.readFile(filePath, 'utf8')) as T
-  }
-
   writeFile(filePath: string, data: string | Buffer): void {
     fs.writeFileSync(filePath, data)
   }
@@ -98,16 +84,6 @@ class FS2 {
     await fsp.writeFile(filePath, str)
   }
 
-  writeYaml(filePath: string, data: any, opt?: DumpOptions): void {
-    const str = yaml.dump(data, opt)
-    fs.writeFileSync(filePath, str)
-  }
-
-  async writeYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void> {
-    const str = yaml.dump(data, opt)
-    await fsp.writeFile(filePath, str)
-  }
-
   appendFile(filePath: string, data: string | Buffer): void {
     fs.appendFileSync(filePath, data)
   }
@@ -126,16 +102,6 @@ class FS2 {
     await this.outputFileAsync(filePath, str)
   }
 
-  outputYaml(filePath: string, data: any, opt?: DumpOptions): void {
-    const str = yaml.dump(data, opt)
-    this.outputFile(filePath, str)
-  }
-
-  async outputYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void> {
-    const str = yaml.dump(data, opt)
-    await this.outputFileAsync(filePath, str)
-  }
-
   outputFile(filePath: string, data: string | Buffer): void {
     const dirPath = path.dirname(filePath)
     if (!fs.existsSync(dirPath)) {
@@ -336,72 +302,6 @@ class FS2 {
   readdirAsync = fsp.readdir
   createWriteStream = fs.createWriteStream
   createReadStream = fs.createReadStream
-
-  /*
-  Returns a Readable of [already parsed] NDJSON objects.
-
-  Replaces a list of operations:
-  - requireFileToExist(inputPath)
-  - fs.createReadStream
-  - createUnzip (only if path ends with '.gz')
-  - transformSplitOnNewline
-  - transformJsonParse
-
-  To add a Limit or Offset: just add .take() or .drop(), example:
-
-  _pipeline([
-    fs2.createReadStreamAsNDJSON().take(100),
-    transformX(),
-  ])
-   */
-  createReadStreamAsNDJSON<ROW = any>(inputPath: string): ReadableTyped<ROW> {
-    this.requireFileToExist(inputPath)
-
-    let stream: ReadableTyped<ROW> = fs
-      .createReadStream(inputPath, {
-        highWaterMark: 64 * 1024, // no observed speedup
-      })
-      .on('error', err => stream.emit('error', err))
-
-    if (inputPath.endsWith('.gz')) {
-      stream = stream.pipe(
-        createUnzip({
-          chunkSize: 64 * 1024, // speedup from ~3200 to 3800 rps!
-        }),
-      )
-    }
-
-    return stream.pipe(transformSplitOnNewline()).map(line => JSON.parse(line))
-    // For some crazy reason .map is much faster than transformJsonParse!
-    // ~5000 vs ~4000 rps !!!
-    // .on('error', err => stream.emit('error', err))
-    // .pipe(transformJsonParse<ROW>())
-  }
-
-  /*
-  Returns an array of Transforms, so that you can ...destructure them at
-  the end of the _pipeline.
-
-  Replaces a list of operations:
-  - transformToNDJson
-  - createGzip (only if path ends with '.gz')
-  - fs.createWriteStream
-   */
-  createWriteStreamAsNDJSON(outputPath: string): TransformTyped<any, any>[] {
-    this.ensureFile(outputPath)
-
-    return [
-      transformToNDJson(),
-      outputPath.endsWith('.gz')
-        ? createGzip({
-            // chunkSize: 64 * 1024, // no observed speedup
-          })
-        : undefined,
-      fs.createWriteStream(outputPath, {
-        // highWaterMark: 64 * 1024, // no observed speedup
-      }),
-    ].filter(_isTruthy) as TransformTyped<any, any>[]
-  }
 }
 
 export const fs2 = new FS2()

package/src/fs/yaml2.ts

@@ -0,0 +1,37 @@
+import fs from 'node:fs'
+import fsp from 'node:fs/promises'
+import type { DumpOptions } from 'js-yaml'
+import yaml from 'js-yaml'
+import { fs2 } from './fs2.js'
+
+class Yaml2 {
+  readYaml<T = unknown>(filePath: string): T {
+    return yaml.load(fs.readFileSync(filePath, 'utf8')) as T
+  }
+
+  async readYamlAsync<T = unknown>(filePath: string): Promise<T> {
+    return yaml.load(await fsp.readFile(filePath, 'utf8')) as T
+  }
+
+  writeYaml(filePath: string, data: any, opt?: DumpOptions): void {
+    const str = yaml.dump(data, opt)
+    fs.writeFileSync(filePath, str)
+  }
+
+  async writeYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void> {
+    const str = yaml.dump(data, opt)
+    await fsp.writeFile(filePath, str)
+  }
+
+  outputYaml(filePath: string, data: any, opt?: DumpOptions): void {
+    const str = yaml.dump(data, opt)
+    fs2.outputFile(filePath, str)
+  }
+
+  async outputYamlAsync(filePath: string, data: any, opt?: DumpOptions): Promise<void> {
+    const str = yaml.dump(data, opt)
+    await fs2.outputFileAsync(filePath, str)
+  }
+}
+
+export const yaml2 = new Yaml2()

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from './buffer/buffer.util.js'
-export * from './colors/colors.js'
 export * from './diff/tableDiff.js'
 export * from './infra/process.util.js'
 export * from './log/log.util.js'
@@ -14,7 +13,4 @@ export * from './slack/slack.service.model.js'
 export * from './string/inspect.js'
 export * from './util/buildInfo.util.js'
 export * from './util/env.util.js'
-export * from './util/exec2.js'
 export * from './util/git2.js'
-export * from './util/lruMemoCache.js'
-export * from './util/zip.util.js'

package/src/script/runScript.ts

@@ -1,8 +1,6 @@
-import 'dotenv/config'
 import os from 'node:os'
 import type { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
 import { pDelay, setGlobalStringifyFunction } from '@naturalcycles/js-lib'
-import { dimGrey } from '../colors/colors.js'
 import { inspectStringifyFn } from '../string/inspect.js'
 
 export interface RunScriptOptions {
@@ -46,7 +44,6 @@ const { DEBUG_RUN_SCRIPT } = process.env
  * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {}): void {
-  checkAndlogEnvironment()
   setGlobalStringifyFunction(inspectStringifyFn)
 
   const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt
@@ -70,6 +67,9 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
 
   void (async () => {
     try {
+      await import('dotenv/config')
+      await checkAndlogEnvironment()
+
       await fn()
 
       await pDelay() // to ensure all async operations are completed
@@ -91,7 +91,9 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
   })()
 }
 
-function checkAndlogEnvironment(): void {
+async function checkAndlogEnvironment(): Promise<void> {
+  const { dimGrey } = await import('../colors/colors.js')
+
   const {
     platform,
     arch,

package/src/stream/index.ts

@@ -1,3 +1,5 @@
+export * from './ndjson/createReadStreamAsNDJSON.js'
+export * from './ndjson/createWriteStreamAsNDJSON.js'
 export * from './ndjson/ndjson.model.js'
 export * from './ndjson/ndjsonMap.js'
 export * from './ndjson/ndjsonStreamForEach.js'

package/src/stream/ndjson/createReadStreamAsNDJSON.ts

@@ -0,0 +1,46 @@
+import { createUnzip } from 'node:zlib'
+import { fs2 } from '../../fs/fs2.js'
+import type { ReadableTyped } from '../stream.model.js'
+import { transformSplitOnNewline } from '../transform/transformSplit.js'
+
+/**
+  Returns a Readable of [already parsed] NDJSON objects.
+ 
+  Replaces a list of operations:
+  - requireFileToExist(inputPath)
+  - fs.createReadStream
+  - createUnzip (only if path ends with '.gz')
+  - transformSplitOnNewline
+  - transformJsonParse
+ 
+  To add a Limit or Offset: just add .take() or .drop(), example:
+ 
+  _pipeline([
+    fs2.createReadStreamAsNDJSON().take(100),
+    transformX(),
+  ])
+ */
+
+export function createReadStreamAsNDJSON<ROW = any>(inputPath: string): ReadableTyped<ROW> {
+  fs2.requireFileToExist(inputPath)
+
+  let stream: ReadableTyped<ROW> = fs2
+    .createReadStream(inputPath, {
+      highWaterMark: 64 * 1024, // no observed speedup
+    })
+    .on('error', err => stream.emit('error', err))
+
+  if (inputPath.endsWith('.gz')) {
+    stream = stream.pipe(
+      createUnzip({
+        chunkSize: 64 * 1024, // speedup from ~3200 to 3800 rps!
+      }),
+    )
+  }
+
+  return stream.pipe(transformSplitOnNewline()).map(line => JSON.parse(line))
+  // For some crazy reason .map is much faster than transformJsonParse!
+  // ~5000 vs ~4000 rps !!!
+  // .on('error', err => stream.emit('error', err))
+  // .pipe(transformJsonParse<ROW>())
+}

package/src/stream/ndjson/createWriteStreamAsNDJSON.ts

@@ -0,0 +1,30 @@
+import { createGzip } from 'node:zlib'
+import { _isTruthy } from '@naturalcycles/js-lib'
+import { fs2 } from '../../fs/fs2.js'
+import type { TransformTyped } from '../stream.model.js'
+import { transformToNDJson } from './transformToNDJson.js'
+
+/**
+  Returns an array of Transforms, so that you can ...destructure them at
+  the end of the _pipeline.
+ 
+  Replaces a list of operations:
+  - transformToNDJson
+  - createGzip (only if path ends with '.gz')
+  - fs.createWriteStream
+ */
+export function createWriteStreamAsNDJSON(outputPath: string): TransformTyped<any, any>[] {
+  fs2.ensureFile(outputPath)
+
+  return [
+    transformToNDJson(),
+    outputPath.endsWith('.gz')
+      ? createGzip({
+          // chunkSize: 64 * 1024, // no observed speedup
+        })
+      : undefined,
+    fs2.createWriteStream(outputPath, {
+      // highWaterMark: 64 * 1024, // no observed speedup
+    }),
+  ].filter(_isTruthy) as TransformTyped<any, any>[]
+}

package/src/stream/ndjson/ndjsonMap.ts

@@ -1,7 +1,11 @@
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib'
 import { ErrorMode } from '@naturalcycles/js-lib'
-import { fs2 } from '../../fs/index.js'
-import type { TransformLogProgressOptions, TransformMapOptions } from '../index.js'
+import {
+  createReadStreamAsNDJSON,
+  createWriteStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
+} from '../index.js'
 import { _pipeline, transformLimit, transformLogProgress, transformMap } from '../index.js'
 
 export interface NDJSONMapOptions<IN = any, OUT = IN>
@@ -41,9 +45,9 @@ export async function ndjsonMap<IN = any, OUT = any>(
     outputFilePath,
   })
 
-  const readable = fs2
-    .createReadStreamAsNDJSON(inputFilePath)
-    .take(limitInput || Number.POSITIVE_INFINITY)
+  const readable = createReadStreamAsNDJSON(inputFilePath).take(
+    limitInput || Number.POSITIVE_INFINITY,
+  )
 
   await _pipeline([
     readable,
@@ -55,6 +59,6 @@ export async function ndjsonMap<IN = any, OUT = any>(
     }),
     transformLimit({ limit: limitOutput, sourceReadable: readable }),
     transformLogProgress({ metric: 'saved', logEvery: logEveryOutput }),
-    ...fs2.createWriteStreamAsNDJSON(outputFilePath),
+    ...createWriteStreamAsNDJSON(outputFilePath),
   ])
 }

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,7 +1,10 @@
 import type { AbortableAsyncMapper } from '@naturalcycles/js-lib'
 import { ErrorMode } from '@naturalcycles/js-lib'
-import { fs2 } from '../../fs/index.js'
-import type { TransformLogProgressOptions, TransformMapOptions } from '../index.js'
+import {
+  createReadStreamAsNDJSON,
+  type TransformLogProgressOptions,
+  type TransformMapOptions,
+} from '../index.js'
 import { _pipeline, transformLogProgress, transformMap, writableVoid } from '../index.js'
 
 export interface NDJSONStreamForEachOptions<IN = any>
@@ -18,7 +21,7 @@ export async function ndjsonStreamForEach<T>(
   opt: NDJSONStreamForEachOptions<T>,
 ): Promise<void> {
   await _pipeline([
-    fs2.createReadStreamAsNDJSON(opt.inputFilePath),
+    createReadStreamAsNDJSON(opt.inputFilePath),
     transformMap<T, any>(mapper, {
       errorMode: ErrorMode.THROW_AGGREGATED,
       ...opt,

package/src/stream/sizeStack.ts

@@ -1,7 +1,7 @@
 import type { CommonLogger } from '@naturalcycles/js-lib'
 import { _hb, NumberStack } from '@naturalcycles/js-lib'
 import { yellow } from '../colors/colors.js'
-import { gzipBuffer } from '../util/zip.util.js'
+import { gzipBuffer } from '../zip/zip.util.js'
 
 export class SizeStack extends NumberStack {
   constructor(

package/src/util/env.util.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config' // ensure .env is read before requiring keys
 import type { ValuesOf } from '@naturalcycles/js-lib'
 import { fs2 } from '../fs/fs2.js'
 

package/src/util/git2.ts

@@ -1,8 +1,7 @@
 import { execSync } from 'node:child_process'
 import { basename } from 'node:path'
 import type { UnixTimestamp } from '@naturalcycles/js-lib'
-import { grey } from '../colors/colors.js'
-import { exec2 } from './exec2.js'
+import { exec2 } from '../exec2.js'
 
 /**
  * Set of utility functions to work with git.
@@ -38,7 +37,7 @@ class Git2 {
     const cmd = `git commit -a --no-verify -m "${msg}"`
     // const cmd = `git`
     // const args = ['commit', '-a', '--no-verify', '-m', msg]
-    console.log(grey(cmd))
+    console.log(cmd)
 
     try {
       execSync(cmd, {

package/src/{util → zip}/zip.util.ts

@@ -7,8 +7,6 @@ const inflate = promisify(zlib.inflate.bind(zlib))
 const gzip = promisify(zlib.gzip.bind(zlib))
 const gunzip = promisify(zlib.gunzip.bind(zlib))
 
-// string > compressed buffer
-
 /**
  * deflateBuffer uses `deflate`.
  * It's 9 bytes shorter than `gzip`.

package/dist/fs/index.d.ts

@@ -1,3 +0,0 @@
-export * from './fs2.js';
-export * from './json2env.js';
-export * from './kpy.js';

package/dist/fs/index.js

@@ -1,3 +0,0 @@
-export * from './fs2.js';
-export * from './json2env.js';
-export * from './kpy.js';

package/dist/jwt/index.d.ts

@@ -1 +0,0 @@
-export * from './jwt.service.js';

package/dist/jwt/index.js

@@ -1 +0,0 @@
-export * from './jwt.service.js';

package/dist/yargs/index.d.ts

@@ -1 +0,0 @@
-export * from './yargs.util.js';

package/dist/yargs/index.js

@@ -1 +0,0 @@
-export * from './yargs.util.js';

package/src/fs/index.ts

@@ -1,3 +0,0 @@
-export * from './fs2.js'
-export * from './json2env.js'
-export * from './kpy.js'

package/src/jwt/index.ts

@@ -1 +0,0 @@
-export * from './jwt.service.js'

package/src/yargs/index.ts

@@ -1 +0,0 @@
-export * from './yargs.util.js'