@naturalcycles/backend-lib 9.15.0 → 9.16.0

package/dist/admin/adminMiddleware.js

@@ -1,4 +1,5 @@
-import { _memoFn, AppError } from '@naturalcycles/js-lib';
+import { _memoFn } from '@naturalcycles/js-lib/decorators';
+import { AppError } from '@naturalcycles/js-lib/error';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { srcDir } from '../paths.cnst.js';
 export function createAdminMiddleware(adminService, cfgDefaults = {}) {

package/dist/admin/base.admin.service.js

@@ -1,4 +1,4 @@
-import { _assert, AppError } from '@naturalcycles/js-lib';
+import { _assert, AppError } from '@naturalcycles/js-lib/error';
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors';
 const adminInfoDisabled = () => ({
     email: 'authDisabled',

package/dist/admin/firebase.shared.service.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { _Memo } from '@naturalcycles/js-lib';
+import { _Memo } from '@naturalcycles/js-lib/decorators';
 export class FirebaseSharedService {
     cfg;
     constructor(cfg) {

package/dist/admin/secureHeaderMiddleware.js

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
 import { timingSafeStringEqual } from '@naturalcycles/nodejs-lib';
 import { requireAdminPermissions } from './adminMiddleware.js';
 /**

package/dist/db/httpDB.d.ts

@@ -1,6 +1,8 @@
 import type { CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBSupport, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
 import { BaseCommonDB } from '@naturalcycles/db-lib';
-import type { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import type { FetcherOptions } from '@naturalcycles/js-lib/http';
+import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 export interface HttpDBCfg extends FetcherOptions {
     baseUrl: string;

package/dist/db/httpDB.js

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
-import { getFetcher } from '@naturalcycles/js-lib';
+import { getFetcher } from '@naturalcycles/js-lib/http';
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
  */

package/dist/db/httpDBRequestHandler.d.ts

@@ -1,6 +1,6 @@
 import type { CommonDB, CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib';
 import { DBQuery } from '@naturalcycles/db-lib';
-import type { ObjectWithId } from '@naturalcycles/js-lib';
+import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { BackendRouter } from '../server/server.model.js';
 export interface GetByIdsInput {
     table: string;

package/dist/db/httpDBRequestHandler.js

@@ -1,4 +1,5 @@
-import { DBQuery, InMemoryDB } from '@naturalcycles/db-lib';
+import { DBQuery } from '@naturalcycles/db-lib';
+import { InMemoryDB } from '@naturalcycles/db-lib/inmemory';
 import { commonDBOptionsSchema, commonDBSaveOptionsSchema, dbQuerySchema, } from '@naturalcycles/db-lib/validation';
 import { anyObjectSchema, arraySchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
 import { getDefaultRouter } from '../express/getDefaultRouter.js';

package/dist/deploy/backend.cfg.util.d.ts

@@ -1,4 +1,4 @@
-import type { StringMap } from '@naturalcycles/js-lib';
+import type { StringMap } from '@naturalcycles/js-lib/types';
 export interface BackendCfg {
     gaeProject: string;
     gaeProjectByBranch?: StringMap;

package/dist/deploy/deploy.model.d.ts

@@ -1,4 +1,4 @@
-import type { UnixTimestamp } from '@naturalcycles/js-lib';
+import type { UnixTimestamp } from '@naturalcycles/js-lib/types';
 export interface DeployInfo {
     gaeProject: string;
     gaeService: string;

package/dist/deploy/deploy.util.js

@@ -1,4 +1,7 @@
-import { _assert, _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { _assert } from '@naturalcycles/js-lib/error';
+import { _mapValues, _merge } from '@naturalcycles/js-lib/object';
+import { _truncate } from '@naturalcycles/js-lib/string';
 import { sha256 } from '@naturalcycles/nodejs-lib';
 import { dimGrey, white } from '@naturalcycles/nodejs-lib/colors';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';

package/dist/deploy/deployGae.js

@@ -1,4 +1,6 @@
-import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib';
+import { _anyToError } from '@naturalcycles/js-lib/error';
+import { pRetry } from '@naturalcycles/js-lib/promise';
+import { _objectAssign } from '@naturalcycles/js-lib/types';
 import { appendToGithubSummary } from '@naturalcycles/nodejs-lib/env';
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';

package/dist/deploy/deployHealthCheck.js

@@ -1,5 +1,8 @@
 import { inspect } from 'node:util';
-import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib';
+import { _ms, _since } from '@naturalcycles/js-lib/datetime';
+import { getFetcher } from '@naturalcycles/js-lib/http';
+import { _filterFalsyValues } from '@naturalcycles/js-lib/object';
+import { pDelay } from '@naturalcycles/js-lib/promise';
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors';
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { coloredHttpCode } from '../server/request.log.util.js';

package/dist/deploy/deployInfo.util.d.ts

@@ -1,2 +1,2 @@
 import type { DeployInfo } from './deploy.model.js';
-export declare const getDeployInfo: ((projectDir: string) => DeployInfo) & import("@naturalcycles/js-lib").MemoizedFunction;
+export declare const getDeployInfo: ((projectDir: string) => DeployInfo) & import("@naturalcycles/js-lib/decorators").MemoizedFunction;

package/dist/deploy/deployInfo.util.js

@@ -1,4 +1,5 @@
-import { _memoFn, localTime } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { _memoFn } from '@naturalcycles/js-lib/decorators';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 export const getDeployInfo = _memoFn((projectDir) => {
     const deployInfoPath = `${projectDir}/deployInfo.json`;

package/dist/env/env.shared.service.d.ts

@@ -1,4 +1,4 @@
-import type { StringMap } from '@naturalcycles/js-lib';
+import type { StringMap } from '@naturalcycles/js-lib/types';
 export interface BaseEnv {
     name: string;
 }

package/dist/env/env.shared.service.js

@@ -1,4 +1,5 @@
-import { _assert, _by } from '@naturalcycles/js-lib';
+import { _by } from '@naturalcycles/js-lib';
+import { _assert } from '@naturalcycles/js-lib/error';
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 export class EnvSharedService {
     constructor(cfg) {

package/dist/express/startServer.js

@@ -1,6 +1,7 @@
 import { __decorate } from "tslib";
 import os from 'node:os';
-import { _Memo, _ms } from '@naturalcycles/js-lib';
+import { _ms } from '@naturalcycles/js-lib/datetime';
+import { _Memo } from '@naturalcycles/js-lib/decorators';
 import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib/colors';
 import { createDefaultApp } from './createDefaultApp.js';
 const { NODE_OPTIONS, APP_ENV } = process.env;

package/dist/sentry/sentry.shared.service.d.ts

@@ -1,4 +1,5 @@
-import type { CommonLogger, Primitive, StringMap } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { Primitive, StringMap } from '@naturalcycles/js-lib/types';
 import type { Breadcrumb, SeverityLevel } from '@sentry/node';
 import type * as SentryLib from '@sentry/node';
 export interface SentrySharedServiceCfg {

package/dist/sentry/sentry.shared.service.js

@@ -1,4 +1,4 @@
-import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib';
+import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib/error';
 import { _inspect } from '@naturalcycles/nodejs-lib';
 import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js';
 const sentrySeverityMap = {

package/dist/server/asyncLocalStorageMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { CommonLogger } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { BackendRequest, BackendRequestHandler } from './server.model.js';
 export interface RequestLocalStorage {
     req: BackendRequest;

package/dist/server/basicAuthMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { StringMap } from '@naturalcycles/js-lib';
+import type { StringMap } from '@naturalcycles/js-lib/types';
 import type { BackendRequestHandler } from './server.model.js';
 export interface BasicAuthMiddlewareCfg {
     /**

package/dist/server/basicAuthMiddleware.js

@@ -1,4 +1,4 @@
-import { _split } from '@naturalcycles/js-lib';
+import { _split } from '@naturalcycles/js-lib/string';
 import { base64ToString, timingSafeStringEqual } from '@naturalcycles/nodejs-lib';
 export function basicAuthMiddleware(cfg) {
     const { realm } = cfg;

package/dist/server/bodyParserTimeoutMiddleware.js

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
 import { respondWithError } from './genericErrorMiddleware.js';
 const code = 'BODY_PARSER_TIMEOUT';
 /**

package/dist/server/genericErrorMiddleware.d.ts

@@ -1,4 +1,4 @@
-import { type ErrorObject } from '@naturalcycles/js-lib';
+import type { ErrorObject } from '@naturalcycles/js-lib/error';
 import type { BackendErrorRequestHandler, BackendRequest, BackendResponse } from './server.model.js';
 export interface GenericErrorMiddlewareCfg {
     errorReportingService?: ErrorReportingService;

package/dist/server/genericErrorMiddleware.js

@@ -1,5 +1,5 @@
-import { _objectAssign, } from '@naturalcycles/js-lib';
-import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib';
+import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib/error';
+import { _objectAssign } from '@naturalcycles/js-lib/types';
 const { APP_ENV } = process.env;
 const includeErrorStack = APP_ENV === 'dev';
 // Hacky way to store the errorService, so it's available to `respondWithError` function

package/dist/server/logMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { CommonLogger } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { BackendRequestHandler } from './server.model.js';
 /**
  * Logger that logs in "GCP structured log" format.

package/dist/server/requestLoggerMiddleware.js

@@ -1,4 +1,4 @@
-import { _since } from '@naturalcycles/js-lib';
+import { _since } from '@naturalcycles/js-lib/datetime';
 import { onFinished } from '../onFinished.js';
 /**
  * Experimental request logger for Cloud Run.

package/dist/server/requestTimeoutMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { NumberOfSeconds } from '@naturalcycles/js-lib';
+import type { NumberOfSeconds } from '@naturalcycles/js-lib/types';
 import type { BackendRequest, BackendRequestHandler, BackendResponse } from './server.model.js';
 export interface RequestTimeoutMiddlewareCfg {
     /**

package/dist/server/requestTimeoutMiddleware.js

@@ -1,4 +1,5 @@
-import { _ms, AppError } from '@naturalcycles/js-lib';
+import { _ms } from '@naturalcycles/js-lib/datetime';
+import { AppError } from '@naturalcycles/js-lib/error';
 import { onFinished } from '../onFinished.js';
 import { respondWithError } from './genericErrorMiddleware.js';
 import { getRequestEndpoint } from './request.util.js';

package/dist/server/safeJsonMiddleware.js

@@ -1,4 +1,4 @@
-import { _safeJsonStringify } from '@naturalcycles/js-lib';
+import { _safeJsonStringify } from '@naturalcycles/js-lib/string';
 /**
  * Replaces express's built-in req.json() function with the safe one,
  * protected from circular references.

package/dist/server/server.model.d.ts

@@ -1,4 +1,5 @@
-import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib';
+import type { CommonLogFunction } from '@naturalcycles/js-lib/log';
+import type { Promisable } from '@naturalcycles/js-lib/types';
 import type { Application, IRouter, NextFunction, Request, Response } from 'express';
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.

package/dist/server/serverStatsMiddleware.js

@@ -1,4 +1,8 @@
-import { _get, _mapValues, _mb, _ms, _percentile, _sortBy, _stringMapEntries, _stringMapValues, _sum, NumberStack, } from '@naturalcycles/js-lib';
+import { _mb, _sortBy, _sum } from '@naturalcycles/js-lib';
+import { _ms } from '@naturalcycles/js-lib/datetime';
+import { _percentile, NumberStack } from '@naturalcycles/js-lib/math';
+import { _get, _mapValues } from '@naturalcycles/js-lib/object';
+import { _stringMapEntries, _stringMapValues } from '@naturalcycles/js-lib/types';
 import { onFinished } from '../onFinished.js';
 import { getRequestEndpoint } from './request.util.js';
 const { GAE_INSTANCE } = process.env;

package/dist/server/serverStatusMiddleware.js

@@ -1,4 +1,5 @@
-import { _filterNullishValues, localTime } from '@naturalcycles/js-lib';
+import { localTime } from '@naturalcycles/js-lib/datetime';
+import { _filterNullishValues } from '@naturalcycles/js-lib/object';
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib';
 import { getDeployInfo } from '../deploy/deployInfo.util.js';
 const { versions, arch, platform } = process;

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -1,4 +1,4 @@
-import { _since } from '@naturalcycles/js-lib';
+import { _since } from '@naturalcycles/js-lib/datetime';
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors';
 import { onFinished } from '../onFinished.js';
 import { logRequestWithColors } from './request.log.util.js';

package/dist/testing/express.test.service.d.ts

@@ -1,4 +1,4 @@
-import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib';
+import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib/http';
 import { type BackendRequestHandlerCfg, type DefaultAppCfg } from '../express/createDefaultApp.js';
 import type { BackendApplication } from '../server/server.model.js';
 export interface ExpressApp extends Fetcher, AsyncDisposable {

package/dist/testing/express.test.service.js

@@ -1,4 +1,5 @@
-import { getFetcher, pDelay } from '@naturalcycles/js-lib';
+import { getFetcher } from '@naturalcycles/js-lib/http';
+import { pDelay } from '@naturalcycles/js-lib/promise';
 import { createDefaultApp, } from '../express/createDefaultApp.js';
 const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 // Example:

package/dist/validation/ajv/ajvValidateRequest.js

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 class AjvValidateRequest {
     body(req, schema, opt = {}) {
         return this.validate(req, 'body', schema, opt);

package/dist/validation/joi/joiValidateRequest.js

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 import { getValidationResult } from '@naturalcycles/nodejs-lib/joi';
 class ValidateRequest {
     body(req, schema, opt = {}) {

package/dist/validation/zod/zodValidateRequest.js

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 import { zSafeValidate } from '@naturalcycles/js-lib/zod';
 class ZodValidateRequest {
     body(req, schema, opt = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.15.0",
+  "version": "9.16.0",
   "peerDependencies": {
     "@sentry/node": "^9"
   },

package/src/admin/adminMiddleware.ts

@@ -1,4 +1,5 @@
-import { _memoFn, AppError } from '@naturalcycles/js-lib'
+import { _memoFn } from '@naturalcycles/js-lib/decorators'
+import { AppError } from '@naturalcycles/js-lib/error'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { srcDir } from '../paths.cnst.js'
 import type { BackendRequestHandler } from '../server/server.model.js'

package/src/admin/base.admin.service.ts

@@ -1,4 +1,4 @@
-import { _assert, AppError } from '@naturalcycles/js-lib'
+import { _assert, AppError } from '@naturalcycles/js-lib/error'
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors'
 import type FirebaseAdmin from 'firebase-admin'
 import type { BackendRequest, BackendRequestHandler } from '../server/server.model.js'

package/src/admin/firebase.shared.service.ts

@@ -1,4 +1,4 @@
-import { _Memo } from '@naturalcycles/js-lib'
+import { _Memo } from '@naturalcycles/js-lib/decorators'
 import type { AppOptions, ServiceAccount } from 'firebase-admin'
 import type FirebaseAdmin from 'firebase-admin'
 

package/src/admin/secureHeaderMiddleware.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
 import { timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from '../server/server.model.js'
 import type { AdminMiddleware, RequireAdminCfg } from './adminMiddleware.js'

package/src/db/httpDB.ts

@@ -9,13 +9,10 @@ import type {
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
-import type {
-  Fetcher,
-  FetcherOptions,
-  JsonSchemaRootObject,
-  ObjectWithId,
-} from '@naturalcycles/js-lib'
-import { getFetcher } from '@naturalcycles/js-lib'
+import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib/http'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 
 export interface HttpDBCfg extends FetcherOptions {

package/src/db/httpDBRequestHandler.ts

@@ -1,11 +1,12 @@
 import type { CommonDB, CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib'
-import { DBQuery, InMemoryDB } from '@naturalcycles/db-lib'
+import { DBQuery } from '@naturalcycles/db-lib'
+import { InMemoryDB } from '@naturalcycles/db-lib/inmemory'
 import {
   commonDBOptionsSchema,
   commonDBSaveOptionsSchema,
   dbQuerySchema,
 } from '@naturalcycles/db-lib/validation'
-import type { ObjectWithId } from '@naturalcycles/js-lib'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import {
   anyObjectSchema,
   arraySchema,

package/src/deploy/backend.cfg.util.ts

@@ -1,4 +1,4 @@
-import type { StringMap } from '@naturalcycles/js-lib'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2'

package/src/deploy/deploy.model.ts

@@ -1,4 +1,4 @@
-import type { UnixTimestamp } from '@naturalcycles/js-lib'
+import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 
 export interface DeployInfo {
   gaeProject: string

package/src/deploy/deploy.util.ts

@@ -1,4 +1,7 @@
-import { _assert, _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _assert } from '@naturalcycles/js-lib/error'
+import { _mapValues, _merge } from '@naturalcycles/js-lib/object'
+import { _truncate } from '@naturalcycles/js-lib/string'
 import { sha256 } from '@naturalcycles/nodejs-lib'
 import { dimGrey, white } from '@naturalcycles/nodejs-lib/colors'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'

package/src/deploy/deployGae.ts

@@ -1,4 +1,6 @@
-import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
+import { _anyToError } from '@naturalcycles/js-lib/error'
+import { pRetry } from '@naturalcycles/js-lib/promise'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
 import { appendToGithubSummary } from '@naturalcycles/nodejs-lib/env'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'

package/src/deploy/deployHealthCheck.ts

@@ -1,7 +1,10 @@
 import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib'
+import { _ms, _since } from '@naturalcycles/js-lib/datetime'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import { _filterFalsyValues } from '@naturalcycles/js-lib/object'
+import { pDelay } from '@naturalcycles/js-lib/promise'
+import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'
 import { coloredHttpCode } from '../server/request.log.util.js'

package/src/deploy/deployInfo.util.ts

@@ -1,4 +1,5 @@
-import { _memoFn, localTime } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _memoFn } from '@naturalcycles/js-lib/decorators'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import type { DeployInfo } from './deploy.model.js'
 

package/src/env/env.shared.service.ts

@@ -1,5 +1,6 @@
-import type { StringMap } from '@naturalcycles/js-lib'
-import { _assert, _by } from '@naturalcycles/js-lib'
+import { _by } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 
 export interface BaseEnv {

package/src/express/startServer.ts

@@ -1,6 +1,7 @@
 import type { Server } from 'node:http'
 import os from 'node:os'
-import { _Memo, _ms } from '@naturalcycles/js-lib'
+import { _ms } from '@naturalcycles/js-lib/datetime'
+import { _Memo } from '@naturalcycles/js-lib/decorators'
 import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib/colors'
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
 import type { BackendApplication } from '../server/server.model.js'

package/src/sentry/sentry.shared.service.ts

@@ -1,5 +1,6 @@
-import type { CommonLogger, CommonLogLevel, Primitive, StringMap } from '@naturalcycles/js-lib'
-import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib'
+import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib/error'
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
+import type { Primitive, StringMap } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '@naturalcycles/nodejs-lib'
 import { _inspect } from '@naturalcycles/nodejs-lib'
 import type { Breadcrumb, SeverityLevel } from '@sentry/node'

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import type { CommonLogger } from '@naturalcycles/js-lib'
 import { _lazyValue } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { ciLogger, devLogger, gcpStructuredLogger } from './logMiddleware.js'
 import type { BackendRequest, BackendRequestHandler } from './server.model.js'
 

package/src/server/basicAuthMiddleware.ts

@@ -1,5 +1,5 @@
-import type { StringMap } from '@naturalcycles/js-lib'
-import { _split } from '@naturalcycles/js-lib'
+import { _split } from '@naturalcycles/js-lib/string'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 import { base64ToString, timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from './server.model.js'
 

package/src/server/bodyParserTimeoutMiddleware.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
 import { respondWithError } from './genericErrorMiddleware.js'
 import type { BackendRequestHandler } from './server.model.js'
 

package/src/server/genericErrorMiddleware.ts

@@ -1,9 +1,6 @@
-import {
-  _objectAssign,
-  type BackendErrorResponseObject,
-  type ErrorObject,
-} from '@naturalcycles/js-lib'
-import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib'
+import type { BackendErrorResponseObject, ErrorObject } from '@naturalcycles/js-lib/error'
+import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib/error'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
 import type { BackendErrorRequestHandler, BackendRequest, BackendResponse } from './server.model.js'
 
 export interface GenericErrorMiddlewareCfg {

package/src/server/logMiddleware.ts

@@ -1,5 +1,6 @@
 import { inspect } from 'node:util'
-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 { _inspect } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import type { BackendRequestHandler } from './server.model.js'

package/src/server/request.log.util.ts

@@ -1,4 +1,4 @@
-import type { CommonLogLevel } from '@naturalcycles/js-lib'
+import type { CommonLogLevel } from '@naturalcycles/js-lib/log'
 import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib/colors'
 import type { BackendRequest } from './server.model.js'
 

package/src/server/requestLoggerMiddleware.ts

@@ -1,5 +1,5 @@
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _since } from '@naturalcycles/js-lib'
+import { _since } from '@naturalcycles/js-lib/datetime'
+import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import type { BackendRequest, BackendRequestHandler } from './server.model.js'
 

package/src/server/requestTimeoutMiddleware.ts

@@ -1,5 +1,6 @@
-import type { NumberOfSeconds } from '@naturalcycles/js-lib'
-import { _ms, AppError } from '@naturalcycles/js-lib'
+import { _ms } from '@naturalcycles/js-lib/datetime'
+import { AppError } from '@naturalcycles/js-lib/error'
+import type { NumberOfSeconds } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import { respondWithError } from './genericErrorMiddleware.js'
 import { getRequestEndpoint } from './request.util.js'

package/src/server/safeJsonMiddleware.ts

@@ -1,4 +1,4 @@
-import { _safeJsonStringify } from '@naturalcycles/js-lib'
+import { _safeJsonStringify } from '@naturalcycles/js-lib/string'
 import type { BackendRequestHandler, BackendResponse } from './server.model.js'
 
 /**

package/src/server/server.model.ts

@@ -1,4 +1,5 @@
-import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib'
+import type { CommonLogFunction } from '@naturalcycles/js-lib/log'
+import type { Promisable } from '@naturalcycles/js-lib/types'
 import type { Application, IRouter, NextFunction, Request, Response } from 'express'
 
 /**

package/src/server/server.util.ts

@@ -1,6 +1,6 @@
 import type { Server } from 'node:http'
 import type { Socket } from 'node:net'
-import type { StringMap } from '@naturalcycles/js-lib'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 
 export interface DestroyableServer extends Server {
   destroy: () => Promise<void>

package/src/server/serverStatsMiddleware.ts

@@ -1,16 +1,8 @@
-import type { StringMap } from '@naturalcycles/js-lib'
-import {
-  _get,
-  _mapValues,
-  _mb,
-  _ms,
-  _percentile,
-  _sortBy,
-  _stringMapEntries,
-  _stringMapValues,
-  _sum,
-  NumberStack,
-} from '@naturalcycles/js-lib'
+import { _mb, _sortBy, _sum } from '@naturalcycles/js-lib'
+import { _ms } from '@naturalcycles/js-lib/datetime'
+import { _percentile, NumberStack } from '@naturalcycles/js-lib/math'
+import { _get, _mapValues } from '@naturalcycles/js-lib/object'
+import { _stringMapEntries, _stringMapValues, type StringMap } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import { getRequestEndpoint } from './request.util.js'
 import type { BackendRequestHandler } from './server.model.js'

package/src/server/serverStatusMiddleware.ts

@@ -1,4 +1,5 @@
-import { _filterNullishValues, localTime } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _filterNullishValues } from '@naturalcycles/js-lib/object'
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib'
 import { getDeployInfo } from '../deploy/deployInfo.util.js'
 import type { BackendRequestHandler } from './server.model.js'

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -1,5 +1,5 @@
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _since } from '@naturalcycles/js-lib'
+import { _since } from '@naturalcycles/js-lib/datetime'
+import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { onFinished } from '../onFinished.js'
 import { logRequestWithColors } from './request.log.util.js'

package/src/testing/express.test.service.ts

@@ -1,7 +1,8 @@
 import type { Server } from 'node:http'
 import type { AddressInfo } from 'node:net'
-import type { Fetcher, FetcherOptions, FetchFunction } from '@naturalcycles/js-lib'
-import { getFetcher, pDelay } from '@naturalcycles/js-lib'
+import type { Fetcher, FetcherOptions, FetchFunction } from '@naturalcycles/js-lib/http'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import { pDelay } from '@naturalcycles/js-lib/promise'
 import {
   type BackendRequestHandlerCfg,
   createDefaultApp,

package/src/validation/ajv/ajvValidateRequest.ts

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
+import { _get } from '@naturalcycles/js-lib/object'
 import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
 import type { BackendRequest } from '../../server/server.model.js'
 import type { ReqValidationOptions } from '../joi/joiValidateRequest.js'

package/src/validation/joi/joiValidateRequest.ts

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
+import { _get } from '@naturalcycles/js-lib/object'
 import type { AnySchema, JoiValidationError } from '@naturalcycles/nodejs-lib/joi'
 import { getValidationResult } from '@naturalcycles/nodejs-lib/joi'
 import type { BackendRequest } from '../../server/server.model.js'

package/src/validation/zod/zodValidateRequest.ts

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
+import { _get } from '@naturalcycles/js-lib/object'
 import { type ZodType, type ZodValidationError, zSafeValidate } from '@naturalcycles/js-lib/zod'
 import type { BackendRequest } from '../../server/server.model.js'
 import type { ReqValidationOptions } from '../joi/joiValidateRequest.js'