@naturalcycles/nodejs-lib 15.1.0 → 15.3.0

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

@@ -1,12 +1,13 @@
 import { execSync, spawn, spawnSync } from 'node:child_process'
-import {
-  _substringAfterLast,
-  type AnyObject,
-  type NumberOfMilliseconds,
-  type UnixTimestampMillis,
-} from '@naturalcycles/js-lib'
-import { _since, AppError } from '@naturalcycles/js-lib'
-import { dimGrey, dimRed, hasColors, white } from '../colors/colors.js'
+import { _since } from '@naturalcycles/js-lib/datetime'
+import { AppError } from '@naturalcycles/js-lib/error'
+import { _substringAfterLast } from '@naturalcycles/js-lib/string'
+import type {
+  AnyObject,
+  NumberOfMilliseconds,
+  UnixTimestampMillis,
+} from '@naturalcycles/js-lib/types'
+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/string'
 
 /**
  * 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/json2env.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs'
-import type { AnyObject } from '@naturalcycles/js-lib'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import { dimGrey } from '../colors/colors.js'
 import { fs2 } from './fs2.js'
 

package/src/fs/kpy.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _since, localTime } from '@naturalcycles/js-lib'
+import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { glob, globSync } from 'tinyglobby'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors.js'
 import { fs2 } from './fs2.js'

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/jwt/jwt.service.ts

@@ -1,5 +1,6 @@
-import type { AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
-import { _assert, _errorDataAppend } from '@naturalcycles/js-lib'
+import type { ErrorData } from '@naturalcycles/js-lib/error'
+import { _assert, _errorDataAppend } from '@naturalcycles/js-lib/error'
+import type { AnyObject, JWTString } from '@naturalcycles/js-lib/types'
 import type { AnySchema } from 'joi'
 import type { Algorithm, JwtHeader, SignOptions, VerifyOptions } from 'jsonwebtoken'
 import jsonwebtoken from 'jsonwebtoken'

package/src/log/log.util.ts

@@ -1,4 +1,4 @@
-import { commonLoggerCreate } from '@naturalcycles/js-lib'
+import { commonLoggerCreate } from '@naturalcycles/js-lib/log'
 import { _inspect } from '../string/inspect.js'
 
 /**

package/src/script/runScript.ts

@@ -1,8 +1,8 @@
-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 type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { pDelay } from '@naturalcycles/js-lib/promise'
+import { setGlobalStringifyFunction } from '@naturalcycles/js-lib/string'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import { inspectStringifyFn } from '../string/inspect.js'
 
 export interface RunScriptOptions {
@@ -46,7 +46,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 +69,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 +93,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/secret/secrets-decrypt.util.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { _assert } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
 import { globSync } from 'tinyglobby'
 import { dimGrey, yellow } from '../colors/colors.js'
 import { fs2 } from '../fs/fs2.js'

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

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { _assert } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
 import { globSync } from 'tinyglobby'
 import { dimGrey, yellow } from '../colors/colors.js'
 import { fs2 } from '../fs/fs2.js'

package/src/security/crypto.util.ts

@@ -1,6 +1,5 @@
 import crypto from 'node:crypto'
-import type { Base64String, StringMap } from '@naturalcycles/js-lib'
-import { _stringMapEntries } from '@naturalcycles/js-lib'
+import { _stringMapEntries, type Base64String, type StringMap } from '@naturalcycles/js-lib/types'
 import { md5AsBuffer, sha256AsBuffer } from './hash.util.js'
 
 const algorithm = 'aes-256-cbc'

package/src/security/hash.util.ts

@@ -1,6 +1,6 @@
 import type { BinaryToTextEncoding } from 'node:crypto'
 import { hash as cryptoHash } from 'node:crypto'
-import type { Base64String, Base64UrlString } from '@naturalcycles/js-lib'
+import type { Base64String, Base64UrlString } from '@naturalcycles/js-lib/types'
 
 export function md5(s: string | Buffer, outputEncoding: BinaryToTextEncoding = 'hex'): string {
   return hash(s, 'md5', outputEncoding)

package/src/security/secret.util.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs'
-import type { Base64String, StringMap } from '@naturalcycles/js-lib'
-import { _assert, _jsonParseIfPossible } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
+import { _jsonParseIfPossible } from '@naturalcycles/js-lib/string'
+import type { Base64String, StringMap } from '@naturalcycles/js-lib/types'
 import { decryptObject, decryptRandomIVBuffer } from './crypto.util.js'
 
 let loaded = false

package/src/slack/slack.service.model.ts

@@ -1,4 +1,5 @@
-import type { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '../index.js'
 
 /**

package/src/slack/slack.service.ts

@@ -1,5 +1,13 @@
-import type { AnyObject, CommonLogger, CommonLogLevel, Fetcher } from '@naturalcycles/js-lib'
-import { _omit, commonLoggerMinLevel, getFetcher, localTime, PQueue } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { type Fetcher, getFetcher } from '@naturalcycles/js-lib/http'
+import {
+  type CommonLogger,
+  commonLoggerMinLevel,
+  type CommonLogLevel,
+} from '@naturalcycles/js-lib/log'
+import { _omit } from '@naturalcycles/js-lib/object'
+import { PQueue } from '@naturalcycles/js-lib/promise'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '../index.js'
 import { _inspect } from '../index.js'
 import type {

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/ndjson.model.ts

@@ -1,4 +1,5 @@
-import { _hb, _ms } from '@naturalcycles/js-lib'
+import { _hb } from '@naturalcycles/js-lib'
+import { _ms } from '@naturalcycles/js-lib/datetime'
 import { boldWhite, dimWhite } from '../../colors/colors.js'
 
 export class NDJsonStats {

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 { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
+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 { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
+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/ndjson/transformJsonParse.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'node:stream'
-import type { Reviver } from '@naturalcycles/js-lib'
+import type { Reviver } from '@naturalcycles/js-lib/types'
 import type { TransformTyped } from '../stream.model.js'
 
 export interface TransformJsonParseOptions {

package/src/stream/ndjson/transformToNDJson.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'node:stream'
-import { _sortObjectDeep } from '@naturalcycles/js-lib'
+import { _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import type { TransformTyped } from '../stream.model.js'
 
 export interface TransformToNDJsonOptions {

package/src/stream/pipeline/pipeline.ts

@@ -1,8 +1,10 @@
 import type { Readable, Writable } from 'node:stream'
 import { Transform } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
-import type { AnyFunction, DeferredPromise } from '@naturalcycles/js-lib'
-import { _last, pDefer } from '@naturalcycles/js-lib'
+import { _last } from '@naturalcycles/js-lib'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
+import { pDefer } from '@naturalcycles/js-lib/promise'
+import type { AnyFunction } from '@naturalcycles/js-lib/types'
 import { writablePushToArray } from '../writable/writablePushToArray.js'
 
 type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream

package/src/stream/progressLogger.ts

@@ -1,7 +1,10 @@
 import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
-import type { AnyObject, CommonLogger, UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _mb, _since, localTime, SimpleMovingAverage } from '@naturalcycles/js-lib'
+import { _mb } from '@naturalcycles/js-lib'
+import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { SimpleMovingAverage } from '@naturalcycles/js-lib/math'
+import type { AnyObject, UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { boldWhite, dimGrey, hasColors, white, yellow } from '../colors/colors.js'
 import { SizeStack } from './sizeStack.js'
 import type { ReadableMapper } from './stream.model.js'

package/src/stream/readable/readableForEach.ts

@@ -1,5 +1,5 @@
-import type { AbortableAsyncMapper, IndexedMapper } from '@naturalcycles/js-lib'
-import { _passNothingPredicate } from '@naturalcycles/js-lib'
+import type { AbortableAsyncMapper, IndexedMapper } from '@naturalcycles/js-lib/types'
+import { _passNothingPredicate } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '../index.js'
 import { _pipeline } from '../index.js'
 import type { TransformMapOptions } from '../transform/transformMap.js'

package/src/stream/readable/readableFromArray.ts

@@ -1,7 +1,7 @@
 import type { ReadableOptions } from 'node:stream'
 import { Readable } from 'node:stream'
-import type { AbortableAsyncMapper } from '@naturalcycles/js-lib'
-import { _passthroughMapper } from '@naturalcycles/js-lib'
+import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
+import { _passthroughMapper } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '../stream.model.js'
 
 /**

package/src/stream/sizeStack.ts

@@ -1,7 +1,8 @@
-import type { CommonLogger } from '@naturalcycles/js-lib'
-import { _hb, NumberStack } from '@naturalcycles/js-lib'
+import { _hb } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { NumberStack } from '@naturalcycles/js-lib/math'
 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/stream/stream.model.ts

@@ -1,5 +1,5 @@
 import type { Readable, Transform, Writable } from 'node:stream'
-import type { Promisable } from '@naturalcycles/js-lib'
+import type { Promisable } from '@naturalcycles/js-lib/types'
 
 export interface ReadableSignalOptions {
   /** allows destroying the stream if the signal is aborted. */

package/src/stream/stream.util.ts

@@ -1,5 +1,5 @@
 import type { Readable } from 'node:stream'
-import type { CommonLogger } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 
 export function pipelineClose(
   name: string,

package/src/stream/transform/transformFilter.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'node:stream'
-import type { AsyncPredicate, Predicate } from '@naturalcycles/js-lib'
+import type { AsyncPredicate, Predicate } from '@naturalcycles/js-lib/types'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 import type { TransformMapOptions } from './transformMap.js'
 import { transformMap } from './transformMap.js'

package/src/stream/transform/transformLimit.ts

@@ -1,5 +1,5 @@
 import type { Readable } from 'node:stream'
-import type { CommonLogger } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { AbortableTransform, transformNoOp } from '../index.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 import { pipelineClose } from '../stream.util.js'