@naturalcycles/js-lib 14.108.1 → 14.109.2

package/dist-esm/types.js

@@ -18,25 +18,17 @@ export const _passNothingPredicate = () => false;
  * Needed due to https://github.com/microsoft/TypeScript/issues/13778
  * Only affects typings, no runtime effect.
  */
-export function _stringMapValues(m) {
-    return Object.values(m);
-}
+export const _stringMapValues = Object.values;
 /**
  * Needed due to https://github.com/microsoft/TypeScript/issues/13778
  * Only affects typings, no runtime effect.
  */
-export function _stringMapEntries(m) {
-    return Object.entries(m);
-}
+export const _stringMapEntries = Object.entries;
 /**
  * Like `Object.keys`, but returns keys typed as `keyof T`, not as just `string`.
  * This is how TypeScript should work, actually.
- *
- * @experimental
  */
-export function _objectKeys(obj) {
-    return Object.keys(obj);
-}
+export const _objectKeys = Object.keys;
 /**
  * Utility function that helps to cast *existing variable* to needed type T.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.108.1",
+  "version": "14.109.2",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -17,13 +17,11 @@
     "@naturalcycles/time-lib": "^3.5.1",
     "@types/node": "^18.0.0",
     "expect-type": "^0.13.0",
-    "jest": "^28.0.3",
-    "patch-package": "^6.2.1",
+    "jest": "^29.0.0",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",
-    "vuepress-plugin-typescript": "^0.3.1",
-    "weak-napi": "^2.0.2"
+    "vuepress-plugin-typescript": "^0.3.1"
   },
   "files": [
     "dist",

package/src/array/array.util.ts

@@ -1,6 +1,6 @@
 import { _isNotNullish } from '../is.util'
-import { RecursiveArray } from '../lodash.types'
-import { FalsyValue, Mapper, Predicate, StringMap } from '../types'
+import type { RecursiveArray } from '../lodash.types'
+import type { FalsyValue, Mapper, Predicate, StringMap } from '../types'
 
 /**
  * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the

package/src/datetime/dateInterval.ts

@@ -1,4 +1,5 @@
-import { Inclusiveness, LocalDate, LocalDateConfig, LocalDateUnit } from './localDate'
+import type { Inclusiveness, LocalDateConfig, LocalDateUnit } from './localDate'
+import { LocalDate } from './localDate'
 
 export type DateIntervalConfig = DateInterval | DateIntervalString
 export type DateIntervalString = string

package/src/datetime/localDate.ts

@@ -1,5 +1,5 @@
 import { _assert } from '../error/assert'
-import {
+import type {
   IsoDateString,
   IsoDateTimeString,
   UnixTimestampMillisNumber,

package/src/datetime/localTime.ts

@@ -1,12 +1,13 @@
 import { _assert } from '../error/assert'
 import { _ms } from '../time/time.util'
-import {
+import type {
   IsoDateString,
   IsoDateTimeString,
   UnixTimestampMillisNumber,
   UnixTimestampNumber,
 } from '../types'
-import { Inclusiveness, LocalDate } from './localDate'
+import type { Inclusiveness } from './localDate'
+import { LocalDate } from './localDate'
 
 export type LocalTimeUnit = 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second'
 

package/src/datetime/timeInterval.ts

@@ -1,6 +1,7 @@
-import { UnixTimestampNumber } from '../types'
-import { Inclusiveness } from './localDate'
-import { LocalTime, LocalTimeConfig } from './localTime'
+import type { UnixTimestampNumber } from '../types'
+import type { Inclusiveness } from './localDate'
+import type { LocalTimeConfig } from './localTime'
+import { LocalTime } from './localTime'
 
 export type TimeIntervalConfig = TimeInterval | TimeIntervalString
 export type TimeIntervalString = string

package/src/decorators/asyncMemo.decorator.ts

@@ -1,8 +1,9 @@
-import { CommonLogger } from '../log/commonLogger'
+import type { CommonLogger } from '../log/commonLogger'
 import { _since } from '../time/time.util'
-import { AnyObject } from '../types'
+import type { AnyObject } from '../types'
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
-import { AsyncMemoCache, jsonMemoSerializer, MapMemoCache } from './memo.util'
+import type { AsyncMemoCache } from './memo.util'
+import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface AsyncMemoOptions {
   /**

package/src/decorators/debounce.decorator.ts

@@ -1,4 +1,5 @@
-import { DebounceOptions, ThrottleOptions, _debounce, _throttle } from './debounce'
+import type { DebounceOptions, ThrottleOptions } from './debounce'
+import { _debounce, _throttle } from './debounce'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Debounce(wait: number, opt: DebounceOptions = {}): MethodDecorator {

package/src/decorators/debounce.ts

@@ -1,4 +1,4 @@
-import { AnyFunction } from '../types'
+import type { AnyFunction } from '../types'
 
 export interface Cancelable {
   cancel(): void

package/src/decorators/decorator.util.ts

@@ -1,4 +1,4 @@
-import { AnyObject, InstanceId } from '../index'
+import type { AnyObject, InstanceId } from '../index'
 
 /**
  * @returns

package/src/decorators/logMethod.decorator.ts

@@ -1,4 +1,5 @@
-import { SimpleMovingAverage, _stringifyAny, CommonLogger, _assert } from '..'
+import type { CommonLogger } from '..'
+import { SimpleMovingAverage, _stringifyAny, _assert } from '..'
 import { _ms } from '../time/time.util'
 import { _getArgsSignature, _getMethodSignature } from './decorator.util'
 

package/src/decorators/memo.decorator.ts

@@ -1,8 +1,9 @@
-import { CommonLogger } from '../log/commonLogger'
+import type { CommonLogger } from '../log/commonLogger'
 import { _since } from '../time/time.util'
-import { AnyObject } from '../types'
+import type { AnyObject } from '../types'
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util'
-import { jsonMemoSerializer, MapMemoCache, MemoCache } from './memo.util'
+import type { MemoCache } from './memo.util'
+import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface MemoOptions {
   /**

package/src/decorators/memo.util.ts

@@ -1,5 +1,5 @@
 import { _isPrimitive } from '..'
-import { Promisable } from '../typeFest'
+import type { Promisable } from '../typeFest'
 
 export type MemoSerializer = (args: any[]) => any
 

package/src/decorators/memoFn.ts

@@ -1,7 +1,8 @@
 import { _since } from '../time/time.util'
 import { _getArgsSignature } from './decorator.util'
-import { MemoOptions } from './memo.decorator'
-import { jsonMemoSerializer, MapMemoCache, MemoCache } from './memo.util'
+import type { MemoOptions } from './memo.decorator'
+import type { MemoCache } from './memo.util'
+import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface MemoizedFunction {
   cache: MemoCache

package/src/decorators/memoFnAsync.ts

@@ -1,7 +1,8 @@
 import { _since } from '../time/time.util'
-import { AsyncMemoOptions } from './asyncMemo.decorator'
+import type { AsyncMemoOptions } from './asyncMemo.decorator'
 import { _getArgsSignature } from './decorator.util'
-import { AsyncMemoCache, jsonMemoSerializer, MapMemoCache } from './memo.util'
+import type { AsyncMemoCache } from './memo.util'
+import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface MemoizedAsyncFunction {
   cache: AsyncMemoCache

package/src/decorators/memoSimple.decorator.ts

@@ -11,9 +11,10 @@ Otherwise resorts to JSON.stringify.
 Benchmark shows similar perf for ObjectCache and MapCache.
  */
 
-import { CommonLogger } from '../log/commonLogger'
+import type { CommonLogger } from '../log/commonLogger'
 import { _getArgsSignature, _getTargetMethodSignature } from './decorator.util'
-import { jsonMemoSerializer, MapMemoCache, MemoCache } from './memo.util'
+import type { MemoCache } from './memo.util'
+import { jsonMemoSerializer, MapMemoCache } from './memo.util'
 
 export interface MemoOpts {
   logHit?: boolean

package/src/decorators/retry.decorator.ts

@@ -1,4 +1,5 @@
-import { pRetryFn, PRetryOptions } from '..'
+import type { PRetryOptions } from '..'
+import { pRetryFn } from '..'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Retry(opt: PRetryOptions = {}): MethodDecorator {

package/src/decorators/timeout.decorator.ts

@@ -1,5 +1,6 @@
 import { _assert } from '../error/assert'
-import { pTimeout, PTimeoutOptions } from '../promise/pTimeout'
+import type { PTimeoutOptions } from '../promise/pTimeout'
+import { pTimeout } from '../promise/pTimeout'
 import { _getMethodSignature } from './decorator.util'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention

package/src/enum.util.ts

@@ -1,4 +1,4 @@
-import { NumberEnum, StringEnum } from './types'
+import type { NumberEnum, StringEnum } from './types'
 
 /**
  * Returns all number keys of a number-enum.

package/src/error/app.error.ts

@@ -1,4 +1,4 @@
-import { ErrorData } from './error.model'
+import type { ErrorData } from './error.model'
 
 /**
  * Base class for all our (not system) errors.

package/src/error/assert.ts

@@ -1,4 +1,5 @@
-import { ErrorData, _deepEquals, _stringifyAny } from '..'
+import type { ErrorData } from '..'
+import { _deepEquals, _stringifyAny } from '..'
 import { AppError } from './app.error'
 
 /**

package/src/error/error.util.ts

@@ -1,14 +1,12 @@
-import {
-  AppError,
+import type {
   ErrorData,
   ErrorObject,
   HttpErrorData,
   HttpErrorResponse,
   StringifyAnyOptions,
-  _jsonParseIfPossible,
-  _stringifyAny,
   Class,
 } from '..'
+import { AppError, _jsonParseIfPossible, _stringifyAny } from '..'
 
 /**
  * Useful to ensure that error in `catch (err) { ... }`
@@ -89,11 +87,13 @@ export function _errorToErrorObject<DATA_TYPE extends ErrorData = ErrorData>(
   return obj
 }
 
-export function _errorObjectToAppError<DATA_TYPE>(o: ErrorObject<DATA_TYPE>): AppError<DATA_TYPE> {
+export function _errorObjectToAppError<DATA_TYPE extends ErrorData>(
+  o: ErrorObject<DATA_TYPE>,
+): AppError<DATA_TYPE> {
   return _errorObjectToError(o, AppError)
 }
 
-export function _errorObjectToError<DATA_TYPE, ERROR_TYPE extends Error>(
+export function _errorObjectToError<DATA_TYPE extends ErrorData, ERROR_TYPE extends Error>(
   o: ErrorObject<DATA_TYPE>,
   errorClass: Class<ERROR_TYPE> = Error as any,
 ): ERROR_TYPE {

package/src/error/http.error.ts

@@ -1,5 +1,5 @@
 import { AppError } from './app.error'
-import { HttpErrorData } from './error.model'
+import type { HttpErrorData } from './error.model'
 
 /**
  * Base class for HTTP errors - errors that define HTTP error code.

package/src/error/try.ts

@@ -1,4 +1,4 @@
-import { AnyFunction } from '../types'
+import type { AnyFunction } from '../types'
 import { AppError } from './app.error'
 
 /**

package/src/error/tryCatch.ts

@@ -1,5 +1,6 @@
-import { _anyToError, _since, _stringifyAny, CommonLogger } from '../index'
-import { AnyFunction } from '../types'
+import type { CommonLogger } from '../index'
+import { _anyToError, _since, _stringifyAny } from '../index'
+import type { AnyFunction } from '../types'
 
 export interface TryCatchOptions {
   /**

package/src/index.ts

@@ -2,18 +2,15 @@ export * from './array/array.util'
 export * from './lazy'
 export * from './string/url.util'
 export * from './array/range'
-import {
-  PromiseDecoratorCfg,
-  PromiseDecoratorResp,
-  _createPromiseDecorator,
-} from './decorators/createPromiseDecorator'
+import type { PromiseDecoratorCfg, PromiseDecoratorResp } from './decorators/createPromiseDecorator'
+import { _createPromiseDecorator } from './decorators/createPromiseDecorator'
 export * from './decorators/debounce'
 export * from './decorators/debounce.decorator'
 export * from './decorators/decorator.util'
 export * from './decorators/logMethod.decorator'
 export * from './decorators/memo.decorator'
 export * from './decorators/asyncMemo.decorator'
-import { MemoCache, AsyncMemoCache } from './decorators/memo.util'
+import type { MemoCache, AsyncMemoCache } from './decorators/memo.util'
 export * from './decorators/memoFn'
 export * from './decorators/memoFnAsync'
 export * from './decorators/retry.decorator'
@@ -21,7 +18,7 @@ export * from './decorators/timeout.decorator'
 export * from './error/app.error'
 export * from './error/assert'
 export * from './enum.util'
-import {
+import type {
   Admin401ErrorData,
   Admin403ErrorData,
   ErrorData,
@@ -33,10 +30,11 @@ export * from './error/error.util'
 import { ErrorMode } from './error/errorMode'
 export * from './error/http.error'
 export * from './error/try'
-import { TryCatchOptions, _TryCatch, _tryCatch } from './error/tryCatch'
+import type { TryCatchOptions } from './error/tryCatch'
+import { _TryCatch, _tryCatch } from './error/tryCatch'
 export * from './json-schema/from-data/generateJsonSchemaFromData'
 export * from './json-schema/jsonSchema.cnst'
-import {
+import type {
   JsonSchema,
   JsonSchemaAllOf,
   JsonSchemaAny,
@@ -56,11 +54,8 @@ import {
   JsonSchemaTuple,
 } from './json-schema/jsonSchema.model'
 export * from './json-schema/jsonSchema.util'
-import {
-  jsonSchema,
-  JsonSchemaAnyBuilder,
-  JsonSchemaBuilder,
-} from './json-schema/jsonSchemaBuilder'
+import type { JsonSchemaBuilder } from './json-schema/jsonSchemaBuilder'
+import { jsonSchema, JsonSchemaAnyBuilder } from './json-schema/jsonSchemaBuilder'
 export * from './math/math.util'
 export * from './math/sma'
 export * from './number/createDeterministicRandom'
@@ -70,26 +65,31 @@ export * from './object/object.util'
 export * from './object/sortObject'
 export * from './object/sortObjectDeep'
 import { AggregatedError } from './promise/AggregatedError'
-import { DeferredPromise, pDefer } from './promise/pDefer'
+import type { DeferredPromise } from './promise/pDefer'
+import { pDefer } from './promise/pDefer'
 export * from './promise/pDelay'
 export * from './promise/pFilter'
 export * from './promise/pHang'
-import { pMap, PMapOptions } from './promise/pMap'
+import type { PMapOptions } from './promise/pMap'
+import { pMap } from './promise/pMap'
 export * from './promise/pProps'
-import { pRetry, pRetryFn, PRetryOptions } from './promise/pRetry'
+import type { PRetryOptions } from './promise/pRetry'
+import { pRetry, pRetryFn } from './promise/pRetry'
 export * from './promise/pState'
-import { pTimeout, pTimeoutFn, PTimeoutOptions } from './promise/pTimeout'
+import type { PTimeoutOptions } from './promise/pTimeout'
+import { pTimeout, pTimeoutFn } from './promise/pTimeout'
 export * from './string/case'
 export * from './string/json.util'
 export * from './string/string.util'
 export * from './string/readingTime'
 export * from './string/escape'
 export * from './string/pupa'
-import { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny'
+import type { JsonStringifyFunction, StringifyAnyOptions } from './string/stringifyAny'
+import { _stringifyAny } from './string/stringifyAny'
 export * from './time/time.util'
 export * from './is.util'
 
-import {
+import type {
   Class,
   ConditionalExcept,
   ConditionalPick,
@@ -98,7 +98,7 @@ import {
   ReadonlyDeep,
   Simplify,
 } from './typeFest'
-import {
+import type {
   AsyncMapper,
   AsyncPredicate,
   BaseDBEntity,
@@ -144,7 +144,7 @@ import {
 export * from './types'
 export * from './unit/size.util'
 import { is } from './vendor/is'
-import {
+import type {
   CommonLogLevel,
   CommonLogFunction,
   CommonLogger,
@@ -152,7 +152,7 @@ import {
 } from './log/commonLogger'
 export * from './log/commonLogger'
 export * from './string/safeJsonStringify'
-import { PQueueCfg } from './promise/pQueue'
+import type { PQueueCfg } from './promise/pQueue'
 export * from './promise/pQueue'
 export * from './seq/seq'
 export * from './math/stack.util'
@@ -161,22 +161,22 @@ export * from './datetime/localDate'
 export * from './datetime/localTime'
 export * from './datetime/dateInterval'
 export * from './datetime/timeInterval'
-import {
+import type {
   LocalDateConfig,
   LocalDateFormatter,
   LocalDateUnit,
   LocalDateUnitStrict,
   Inclusiveness,
 } from './datetime/localDate'
-import {
+import type {
   LocalTimeConfig,
   LocalTimeFormatter,
   LocalTimeUnit,
   LocalTimeComponents,
   ISODayOfWeek,
 } from './datetime/localTime'
-import { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval'
-import { TimeIntervalConfig, TimeIntervalString } from './datetime/timeInterval'
+import type { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval'
+import type { TimeIntervalConfig, TimeIntervalString } from './datetime/timeInterval'
 
 export type {
   DateIntervalConfig,

package/src/is.util.ts

@@ -1,5 +1,5 @@
-import { Primitive } from './typeFest'
-import { AnyObject, FalsyValue, NullishValue } from './types'
+import type { Primitive } from './typeFest'
+import type { AnyObject, FalsyValue, NullishValue } from './types'
 
 type Nullish<T> = T extends NullishValue ? T : never
 type Truthy<T> = T extends FalsyValue ? never : T

package/src/json-schema/from-data/generateJsonSchemaFromData.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   JsonSchema,
   JsonSchemaArray,
   JsonSchemaBoolean,
@@ -8,10 +8,9 @@ import {
   JsonSchemaOneOf,
   JsonSchemaString,
   StringMap,
-  _stringMapEntries,
-  _uniq,
   AnyObject,
 } from '../..'
+import { _stringMapEntries, _uniq } from '../..'
 
 type PrimitiveType = 'undefined' | 'null' | 'boolean' | 'string' | 'number'
 type Type = PrimitiveType | 'array' | 'object'
@@ -21,7 +20,9 @@ type Type = PrimitiveType | 'array' | 'object'
  *
  * `additionalProperties` is set to `true`, cause it's safer.
  */
-export function generateJsonSchemaFromData<T = unknown>(rows: AnyObject[]): JsonSchemaObject<T> {
+export function generateJsonSchemaFromData<T extends AnyObject = AnyObject>(
+  rows: AnyObject[],
+): JsonSchemaObject<T> {
   return objectToJsonSchema(rows as any) as JsonSchemaObject<T>
 }
 

package/src/json-schema/jsonSchema.cnst.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   JsonSchema,
   JsonSchemaAny,
   JsonSchemaNumber,

package/src/json-schema/jsonSchema.model.ts

@@ -1,4 +1,4 @@
-import { AnyObject, StringMap } from '../types'
+import type { AnyObject, StringMap } from '../types'
 
 // eslint-disable-next-line unused-imports/no-unused-vars
 export type JsonSchema<T = unknown> =
@@ -14,7 +14,7 @@ export type JsonSchema<T = unknown> =
   | JsonSchemaNumber
   | JsonSchemaBoolean
   | JsonSchemaNull
-  | JsonSchemaObject<T>
+  | JsonSchemaObject
   | JsonSchemaArray<T>
   | JsonSchemaTuple<T>
 

package/src/json-schema/jsonSchema.util.ts

@@ -1,13 +1,13 @@
-import { _uniq } from '../index'
+import { _uniq, AnyObject } from '../index'
 import { _filterNullishValues } from '../object/object.util'
-import { JsonSchemaObject } from './jsonSchema.model'
+import type { JsonSchemaObject } from './jsonSchema.model'
 
 /**
  * Merges s2 into s1 (mutates s1) and returns s1.
  * Does not mutate s2.
  * API similar to Object.assign(s1, s2)
  */
-export function mergeJsonSchemaObjects<T1, T2>(
+export function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObject>(
   s1: JsonSchemaObject<T1>,
   s2: JsonSchemaObject<T2>,
 ): JsonSchemaObject<T1 & T2> {

package/src/json-schema/jsonSchemaBuilder.ts

@@ -1,18 +1,16 @@
 import { _uniq } from '../array/array.util'
-import {
+import type {
   BaseDBEntity,
   JsonSchemaAllOf,
   JsonSchemaArray,
   JsonSchemaOneOf,
   JsonSchemaTuple,
-  mergeJsonSchemaObjects,
   SavedDBEntity,
-  _deepCopy,
-  _sortObject,
   AnyObject,
 } from '../index'
+import { mergeJsonSchemaObjects, _deepCopy, _sortObject } from '../index'
 import { JSON_SCHEMA_ORDER } from './jsonSchema.cnst'
-import {
+import type {
   JsonSchema,
   JsonSchemaAny,
   JsonSchemaBoolean,

package/src/json-schema/jsonSchemas.ts

@@ -1,4 +1,4 @@
-import { BaseDBEntity, SavedDBEntity } from '../types'
+import type { BaseDBEntity, SavedDBEntity } from '../types'
 import { jsonSchema } from './jsonSchemaBuilder'
 
 export const baseDBEntityJsonSchema = jsonSchema.object<BaseDBEntity>({

package/src/lazy.ts

@@ -1,4 +1,4 @@
-import { AnyFunction, AnyObject } from './types'
+import type { AnyFunction, AnyObject } from './types'
 
 /**
  * const value = lazyValue(() => expensiveComputation())

package/src/object/object.util.ts

@@ -1,6 +1,6 @@
 import { _isEmpty, _isObject } from '../is.util'
-import { PropertyPath } from '../lodash.types'
-import { AnyObject, ObjectMapper, ObjectPredicate, StringMap, ValueOf } from '../types'
+import type { PropertyPath } from '../lodash.types'
+import type { AnyObject, ObjectMapper, ObjectPredicate, StringMap, ValueOf } from '../types'
 
 /**
  * Returns clone of `obj` with only `props` preserved.

package/src/object/sortObject.ts

@@ -1,4 +1,5 @@
-import { _omit, AnyObject } from '../index'
+import type { AnyObject } from '../index'
+import { _omit } from '../index'
 
 /**
  * Returns new object with keys sorder in the given order.

package/src/promise/pFilter.ts

@@ -1,4 +1,4 @@
-import { AsyncPredicate } from '../types'
+import type { AsyncPredicate } from '../types'
 
 export async function pFilter<T>(iterable: Iterable<T>, filterFn: AsyncPredicate<T>): Promise<T[]> {
   const items = [...iterable]

package/src/promise/pMap.ts

@@ -7,7 +7,8 @@ Improvements:
 - Compatible with pProps (that had typings issues)
  */
 
-import { AbortableAsyncMapper, END, ErrorMode, SKIP } from '..'
+import type { AbortableAsyncMapper } from '..'
+import { END, ErrorMode, SKIP } from '..'
 import { AggregatedError } from './AggregatedError'
 
 export interface PMapOptions {

package/src/promise/pQueue.ts

@@ -1,6 +1,7 @@
 import { ErrorMode } from '../error/errorMode'
-import { CommonLogger } from '../log/commonLogger'
-import { DeferredPromise, pDefer } from './pDefer'
+import type { CommonLogger } from '../log/commonLogger'
+import type { DeferredPromise } from './pDefer'
+import { pDefer } from './pDefer'
 
 export interface PQueueCfg {
   concurrency: number

package/src/promise/pRetry.ts

@@ -1,4 +1,5 @@
-import { _since, _stringifyAny, AnyFunction, AppError, CommonLogger, ErrorData } from '..'
+import type { AnyFunction, AppError, CommonLogger, ErrorData } from '..'
+import { _since, _stringifyAny } from '..'
 import { TimeoutError } from './pTimeout'
 
 export interface PRetryOptions {