@naturalcycles/nodejs-lib 15.1.0 → 15.3.0

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,5 +1,4 @@
-import 'dotenv/config' // ensure .env is read before requiring keys
-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,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 type { UnixTimestamp } from '@naturalcycles/js-lib/types'
+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/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'

package/src/validation/ajv/ajvSchema.ts

@@ -1,10 +1,8 @@
-import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib'
-import {
-  _filterNullishValues,
-  _isObject,
-  _substringBefore,
-  JsonSchemaAnyBuilder,
-} from '@naturalcycles/js-lib'
+import { _isObject } from '@naturalcycles/js-lib'
+import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib/json-schema'
+import { JsonSchemaAnyBuilder } from '@naturalcycles/js-lib/json-schema'
+import { _filterNullishValues } from '@naturalcycles/js-lib/object'
+import { _substringBefore } from '@naturalcycles/js-lib/string'
 import type { Ajv, ValidateFunction } from 'ajv'
 import { fs2 } from '../../fs/fs2.js'
 import { _inspect } from '../../string/inspect.js'

package/src/validation/ajv/ajvValidationError.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 {

package/src/validation/joi/joi.shared.schemas.ts

@@ -1,3 +1,9 @@
+import {
+  _numberEnumKeys,
+  _numberEnumValues,
+  _stringEnumKeys,
+  _stringEnumValues,
+} from '@naturalcycles/js-lib'
 import type {
   BaseDBEntity,
   IANATimezone,
@@ -6,13 +12,7 @@ import type {
   StringEnum,
   UnixTimestamp,
   UnixTimestampMillis,
-} from '@naturalcycles/js-lib'
-import {
-  _numberEnumKeys,
-  _numberEnumValues,
-  _stringEnumKeys,
-  _stringEnumValues,
-} from '@naturalcycles/js-lib'
+} from '@naturalcycles/js-lib/types'
 import type { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi'
 import { Joi } from './joi.extensions.js'
 import type { NumberSchema } from './number.extensions.js'

package/src/validation/joi/joi.validation.error.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'
 
 /**

package/src/validation/joi/joi.validation.util.ts

@@ -6,7 +6,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 type { AnySchema, ValidationError, ValidationOptions } from 'joi'
 import type { JoiValidationErrorData } from './joi.validation.error.js'
 import { JoiValidationError } from './joi.validation.error.js'

package/src/validation/joi/string.extensions.ts

@@ -1,5 +1,5 @@
-import type { IsoDate } from '@naturalcycles/js-lib'
-import { localTime } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import type { IsoDate } from '@naturalcycles/js-lib/types'
 import type Joi from 'joi'
 import type { Extension, StringSchema as JoiStringSchema } from 'joi'
 

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'