@naturalcycles/nodejs-lib 15.2.0 → 15.3.0

package/dist/validation/ajv/ajvSchema.js

@@ -1,4 +1,7 @@
-import { _filterNullishValues, _isObject, _substringBefore, JsonSchemaAnyBuilder, } from '@naturalcycles/js-lib';
+import { _isObject } from '@naturalcycles/js-lib';
+import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema';
+import { _filterNullishValues } from '@naturalcycles/js-lib/object';
+import { _substringBefore } from '@naturalcycles/js-lib/string';
 import { fs2 } from '../../fs/fs2.js';
 import { _inspect } from '../../string/inspect.js';
 import { AjvValidationError } from './ajvValidationError.js';

package/dist/validation/ajv/ajvValidationError.d.ts

@@ -1,5 +1,5 @@
-import type { ErrorData } from '@naturalcycles/js-lib';
-import { AppError } from '@naturalcycles/js-lib';
+import type { ErrorData } from '@naturalcycles/js-lib/error';
+import { AppError } from '@naturalcycles/js-lib/error';
 import type { ErrorObject } from 'ajv';
 export interface AjvValidationErrorData extends ErrorData {
     errors: ErrorObject[];

package/dist/validation/ajv/ajvValidationError.js

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
 export class AjvValidationError extends AppError {
     constructor(message, data) {
         super(message, data, {

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import type { BaseDBEntity, IANATimezone, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib';
+import type { BaseDBEntity, IANATimezone, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import type { NumberSchema } from './number.extensions.js';
 import type { StringSchema } from './string.extensions.js';
@@ -10,7 +10,7 @@ export declare const numberSchema: NumberSchema<number>;
 export declare const numberSchemaTyped: <T>() => NumberSchema<T>;
 export declare const integerSchema: NumberSchema<number>;
 export declare const percentageSchema: NumberSchema<number>;
-export declare const dateStringSchema: StringSchema<import("@naturalcycles/js-lib").IsoDate>;
+export declare const dateStringSchema: StringSchema<import("@naturalcycles/js-lib/types").IsoDate>;
 export declare const binarySchema: import("joi").BinarySchema<Buffer<ArrayBufferLike>>;
 export declare const dateObjectSchema: ObjectSchema<any>;
 export declare const dateIntervalStringSchema: StringSchema<string>;

package/dist/validation/joi/joi.validation.error.d.ts

@@ -1,5 +1,5 @@
-import type { ErrorData } from '@naturalcycles/js-lib';
-import { AppError } from '@naturalcycles/js-lib';
+import type { ErrorData } from '@naturalcycles/js-lib/error';
+import { AppError } from '@naturalcycles/js-lib/error';
 import type { ValidationErrorItem } from 'joi';
 /**
  * Example of ValidationErrorItem:

package/dist/validation/joi/joi.validation.error.js

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
 export class JoiValidationError extends AppError {
     constructor(message, data) {
         super(message, data, {

package/dist/validation/joi/joi.validation.util.js

@@ -5,7 +5,8 @@
  *
  * "Converts" mean e.g trims all strings from leading/trailing spaces.
  */
-import { _hb, _isObject, _truncateMiddle } from '@naturalcycles/js-lib';
+import { _hb, _isObject } from '@naturalcycles/js-lib';
+import { _truncateMiddle } from '@naturalcycles/js-lib/string';
 import { JoiValidationError } from './joi.validation.error.js';
 // Strip colors in production (for e.g Sentry reporting)
 // const stripColors = process.env.NODE_ENV === 'production' || !!process.env.GAE_INSTANCE

package/dist/validation/joi/string.extensions.d.ts

@@ -1,4 +1,4 @@
-import type { IsoDate } from '@naturalcycles/js-lib';
+import type { IsoDate } from '@naturalcycles/js-lib/types';
 import type Joi from 'joi';
 import type { Extension, StringSchema as JoiStringSchema } from 'joi';
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {

package/dist/validation/joi/string.extensions.js

@@ -1,4 +1,4 @@
-import { localTime } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
 export function stringExtensions(joi) {
     return {
         type: 'string',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.2.0",
+  "version": "15.3.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/bin/generate-build-info.ts

@@ -2,7 +2,7 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import type { UnixTimestamp } from '@naturalcycles/js-lib'
+import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
 import { generateBuildInfo } from '../util/buildInfo.util.js'

package/src/cache/lruMemoCache.ts

@@ -1,4 +1,4 @@
-import type { MemoCache } from '@naturalcycles/js-lib'
+import type { MemoCache } from '@naturalcycles/js-lib/decorators'
 import { LRUCache } from 'lru-cache'
 
 // Partial, to be able to provide default `max`

package/src/csv/csvReader.ts

@@ -1,7 +1,7 @@
 // Inspired by: https://gist.github.com/Jezternz/c8e9fafc2c114e079829974e3764db75
 
-import type { AnyObject } from '@naturalcycles/js-lib'
-import { _assert } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 
 export interface CSVReaderConfig {
   /**

package/src/csv/csvWriter.ts

@@ -1,7 +1,7 @@
 // Inspired by: https://github.com/ryu1kn/csv-writer/
 
-import type { AnyObject } from '@naturalcycles/js-lib'
-import { _assert } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 
 export interface CSVWriterConfig {
   /**

package/src/csv/transformToCSV.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'node:stream'
-import type { AnyObject } from '@naturalcycles/js-lib'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import type { TransformTyped } from '../stream/stream.model.js'
 import type { CSVWriterConfig } from './csvWriter.js'
 import { CSVWriter } from './csvWriter.js'

package/src/diff/tableDiff.ts

@@ -1,5 +1,5 @@
-import type { AnyObject } from '@naturalcycles/js-lib'
-import { _truncate } from '@naturalcycles/js-lib'
+import { _truncate } from '@naturalcycles/js-lib/string'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 
 export interface TableDiffOptions {
   /**

package/src/exec2.ts

@@ -1,11 +1,12 @@
 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 { _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'
 
 /**

package/src/fs/fs2.ts

@@ -18,7 +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 { _jsonParse } from '@naturalcycles/js-lib'
+import { _jsonParse } from '@naturalcycles/js-lib/string'
 
 /**
  * fs2 conveniently groups filesystem functions together.

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/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,6 +1,8 @@
 import os from 'node:os'
-import type { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
-import { pDelay, setGlobalStringifyFunction } from '@naturalcycles/js-lib'
+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 {

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/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,5 +1,5 @@
-import type { AbortableAsyncMapper } from '@naturalcycles/js-lib'
-import { ErrorMode } from '@naturalcycles/js-lib'
+import { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
 import {
   createReadStreamAsNDJSON,
   createWriteStreamAsNDJSON,

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,5 +1,5 @@
-import type { AbortableAsyncMapper } from '@naturalcycles/js-lib'
-import { ErrorMode } from '@naturalcycles/js-lib'
+import { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { AbortableAsyncMapper } from '@naturalcycles/js-lib/types'
 import {
   createReadStreamAsNDJSON,
   type TransformLogProgressOptions,

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,5 +1,6 @@
-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 '../zip/zip.util.js'
 

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'

package/src/stream/transform/transformMap.ts

@@ -1,21 +1,18 @@
-import type {
-  AbortableAsyncMapper,
-  AsyncPredicate,
-  CommonLogger,
-  Promisable,
-  StringMap,
-  UnixTimestampMillis,
-} from '@naturalcycles/js-lib'
+import { _hc } from '@naturalcycles/js-lib'
+import { _since } from '@naturalcycles/js-lib/datetime'
+import { _anyToError, ErrorMode } from '@naturalcycles/js-lib/error'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { pFilter } from '@naturalcycles/js-lib/promise'
+import { _stringify } from '@naturalcycles/js-lib/string'
 import {
-  _anyToError,
-  _hc,
-  _since,
-  _stringify,
+  type AbortableAsyncMapper,
+  type AsyncPredicate,
   END,
-  ErrorMode,
-  pFilter,
+  type Promisable,
   SKIP,
-} from '@naturalcycles/js-lib'
+  type StringMap,
+  type UnixTimestampMillis,
+} from '@naturalcycles/js-lib/types'
 import through2Concurrent from 'through2-concurrent'
 import { yellow } from '../../colors/colors.js'
 import type { AbortableTransform } from '../pipeline/pipeline.js'

package/src/stream/transform/transformMapSimple.ts

@@ -1,6 +1,7 @@
 import { Transform } from 'node:stream'
-import type { CommonLogger, IndexedMapper } from '@naturalcycles/js-lib'
-import { ErrorMode } from '@naturalcycles/js-lib'
+import { ErrorMode } from '@naturalcycles/js-lib/error'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import type { IndexedMapper } from '@naturalcycles/js-lib/types'
 import type { TransformTyped } from '../stream.model.js'
 
 export interface TransformMapSimpleOptions {

package/src/stream/transform/transformMapSync.ts

@@ -1,10 +1,7 @@
-import type {
-  CommonLogger,
-  IndexedMapper,
-  Predicate,
-  UnixTimestampMillis,
-} from '@naturalcycles/js-lib'
-import { _anyToError, END, ErrorMode, SKIP } from '@naturalcycles/js-lib'
+import { _anyToError, ErrorMode } from '@naturalcycles/js-lib/error'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import type { IndexedMapper, Predicate, UnixTimestampMillis } from '@naturalcycles/js-lib/types'
+import { END, SKIP } from '@naturalcycles/js-lib/types'
 import { yellow } from '../../colors/colors.js'
 import { AbortableTransform } from '../pipeline/pipeline.js'
 import type { TransformTyped } from '../stream.model.js'

package/src/stream/transform/transformTap.ts

@@ -1,5 +1,6 @@
 import { Transform } from 'node:stream'
-import type { AsyncIndexedMapper, CommonLogger } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import type { AsyncIndexedMapper } from '@naturalcycles/js-lib/types'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
 
 export interface TransformTapOptions extends TransformOptions {

package/src/stream/transform/transformThrottle.ts

@@ -1,11 +1,12 @@
 import { Transform } from 'node:stream'
+import { _ms, _since, localTime } from '@naturalcycles/js-lib/datetime'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
+import { pDefer } from '@naturalcycles/js-lib/promise'
 import type {
-  DeferredPromise,
   NumberOfSeconds,
   PositiveInteger,
   UnixTimestampMillis,
-} from '@naturalcycles/js-lib'
-import { _ms, _since, localTime, pDefer } from '@naturalcycles/js-lib'
+} from '@naturalcycles/js-lib/types'
 import type { TransformTyped } from '../stream.model.js'
 
 export interface TransformThrottleOptions {

package/src/stream/transform/worker/transformMultiThreaded.ts

@@ -1,6 +1,8 @@
 import { Worker } from 'node:worker_threads'
-import type { AnyObject, DeferredPromise } from '@naturalcycles/js-lib'
-import { _range, pDefer } from '@naturalcycles/js-lib'
+import { _range } from '@naturalcycles/js-lib'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
+import { pDefer } from '@naturalcycles/js-lib/promise'
+import type { AnyObject } from '@naturalcycles/js-lib/types'
 import through2Concurrent from 'through2-concurrent'
 import type { TransformTyped } from '../../stream.model.js'
 import type { WorkerInput, WorkerOutput } from './transformMultiThreaded.model.js'

package/src/stream/writable/writableForEach.ts

@@ -1,5 +1,5 @@
-import type { AsyncIndexedMapper, IndexedMapper } from '@naturalcycles/js-lib'
-import { _passNothingPredicate } from '@naturalcycles/js-lib'
+import type { AsyncIndexedMapper, IndexedMapper } from '@naturalcycles/js-lib/types'
+import { _passNothingPredicate } from '@naturalcycles/js-lib/types'
 import type { TransformMapOptions } from '../index.js'
 import { transformMap, transformMapSync } from '../index.js'
 import type { WritableTyped } from '../stream.model.js'

package/src/stream/writable/writableVoid.ts

@@ -1,5 +1,5 @@
 import { Writable } from 'node:stream'
-import type { DeferredPromise } from '@naturalcycles/js-lib'
+import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
 import type { TransformOptions } from '../stream.model.js'
 
 export interface WritableVoidOptions extends TransformOptions {

package/src/string/inspect.ts

@@ -1,7 +1,7 @@
 import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
-import type { JsonStringifyFunction, StringifyOptions } from '@naturalcycles/js-lib'
-import { _stringify } from '@naturalcycles/js-lib'
+import type { JsonStringifyFunction, StringifyOptions } from '@naturalcycles/js-lib/string'
+import { _stringify } from '@naturalcycles/js-lib/string'
 
 export interface InspectAnyOptions extends StringifyOptions, InspectOptions {}
 

package/src/util/buildInfo.util.ts

@@ -1,5 +1,7 @@
-import type { AnyObject, BuildInfo, UnixTimestamp } from '@naturalcycles/js-lib'
-import { _filterUndefinedValues, localTime } from '@naturalcycles/js-lib'
+import type { BuildInfo } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _filterUndefinedValues } from '@naturalcycles/js-lib/object'
+import type { AnyObject, UnixTimestamp } from '@naturalcycles/js-lib/types'
 import { fs2 } from '../fs/fs2.js'
 import { git2 } from './git2.js'
 

package/src/util/env.util.ts

@@ -1,4 +1,4 @@
-import type { ValuesOf } from '@naturalcycles/js-lib'
+import type { ValuesOf } from '@naturalcycles/js-lib/types'
 import { fs2 } from '../fs/fs2.js'
 
 /**

package/src/util/git2.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'node:child_process'
 import { basename } from 'node:path'
-import type { UnixTimestamp } from '@naturalcycles/js-lib'
+import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 import { exec2 } from '../exec2.js'
 
 /**

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

@@ -1,4 +1,4 @@
-import type { JsonSchema } from '@naturalcycles/js-lib'
+import type { JsonSchema } from '@naturalcycles/js-lib/json-schema'
 import type { GlobOptions } from 'tinyglobby'
 import { globSync } from 'tinyglobby'
 import { fs2 } from '../../fs/fs2.js'