@naturalcycles/backend-lib 9.17.0 → 9.19.0

package/dist/admin/adminMiddleware.js

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

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

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

package/dist/admin/secureHeaderMiddleware.js

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

package/dist/deploy/deploy.util.js

@@ -1,7 +1,7 @@
-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 { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
+import { _assert } from '@naturalcycles/js-lib/error/assert.js';
+import { _mapValues, _merge } from '@naturalcycles/js-lib/object/object.util.js';
+import { _truncate } from '@naturalcycles/js-lib/string/string.util.js';
 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,5 +1,5 @@
 import { _anyToError } from '@naturalcycles/js-lib/error';
-import { pRetry } from '@naturalcycles/js-lib/promise';
+import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { _objectAssign } from '@naturalcycles/js-lib/types';
 import { appendToGithubSummary } from '@naturalcycles/nodejs-lib/env';
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2';

package/dist/deploy/deployHealthCheck.js

@@ -1,8 +1,8 @@
 import { inspect } from 'node:util';
 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 { _filterFalsyValues } from '@naturalcycles/js-lib/object/object.util.js';
+import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js';
 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/decorators").MemoizedFunction;
+export declare const getDeployInfo: ((projectDir: string) => DeployInfo) & import("@naturalcycles/js-lib/decorators/memoFn.js").MemoizedFunction;

package/dist/deploy/deployInfo.util.js

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

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

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

package/dist/express/startServer.js

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

package/dist/server/basicAuthMiddleware.js

@@ -1,4 +1,4 @@
-import { _split } from '@naturalcycles/js-lib/string';
+import { _split } from '@naturalcycles/js-lib/string/string.util.js';
 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/error';
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import { respondWithError } from './genericErrorMiddleware.js';
 const code = 'BODY_PARSER_TIMEOUT';
 /**

package/dist/server/requestLoggerMiddleware.js

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

package/dist/server/requestTimeoutMiddleware.js

@@ -1,5 +1,5 @@
-import { _ms } from '@naturalcycles/js-lib/datetime';
-import { AppError } from '@naturalcycles/js-lib/error';
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 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/string';
+import { _safeJsonStringify } from '@naturalcycles/js-lib/string/safeJsonStringify.js';
 /**
  * Replaces express's built-in req.json() function with the safe one,
  * protected from circular references.

package/dist/server/serverStatsMiddleware.js

@@ -1,7 +1,9 @@
-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 { _mb } from '@naturalcycles/js-lib';
+import { _sortBy, _sum } from '@naturalcycles/js-lib/array/array.util.js';
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { _percentile } from '@naturalcycles/js-lib/math/math.util.js';
+import { NumberStack } from '@naturalcycles/js-lib/math/stack.util.js';
+import { _get, _mapValues } from '@naturalcycles/js-lib/object/object.util.js';
 import { _stringMapEntries, _stringMapValues } from '@naturalcycles/js-lib/types';
 import { onFinished } from '../onFinished.js';
 import { getRequestEndpoint } from './request.util.js';

package/dist/server/serverStatusMiddleware.js

@@ -1,5 +1,5 @@
-import { localTime } from '@naturalcycles/js-lib/datetime';
-import { _filterNullishValues } from '@naturalcycles/js-lib/object';
+import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
+import { _filterNullishValues } from '@naturalcycles/js-lib/object/object.util.js';
 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/datetime';
+import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
 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.js

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

package/dist/validation/ajv/ajvValidateRequest.js

@@ -19,13 +19,10 @@ class AjvValidateRequest {
      * Keep in mind that this will also remove all values that are not in the schema.
      */
     headers(req, schema, opt = {}) {
-        return this.validate(req, 'headers', schema, {
-            mutate: false,
-            ...opt,
-        });
+        return this.validate(req, 'headers', schema, opt);
     }
     validate(req, reqProperty, schema, opt = {}) {
-        const { mutate = true } = opt;
+        const { mutate } = opt;
         const originalProperty = req[reqProperty] || {};
         const item = mutate ? originalProperty : { ...originalProperty };
         // Ajv mutates the input

package/dist/validation/joi/joiValidateRequest.js

@@ -20,13 +20,10 @@ class ValidateRequest {
      * Keep in mind that this will also remove all values that are not in the schema.
      */
     headers(req, schema, opt = {}) {
-        return this.validate(req, 'headers', schema, {
-            mutate: false,
-            ...opt,
-        });
+        return this.validate(req, 'headers', schema, opt);
     }
     validate(req, reqProperty, schema, opt = {}) {
-        const { mutate = true } = opt;
+        const { mutate } = opt;
         const originalProperty = req[reqProperty] || {};
         // Joi does not mutate the input
         const { error, value } = getValidationResult(originalProperty, schema, `request ${reqProperty}`);

package/dist/validation/validateRequest.util.d.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib/error';
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 export declare function handleValidationError<T, ERR extends AppError>(error: ERR, originalProperty: T, opt?: ReqValidationOptions<ERR>): never;
 export interface ReqValidationOptions<ERR extends AppError> {
     /**
@@ -12,10 +12,9 @@ export interface ReqValidationOptions<ERR extends AppError> {
      */
     report?: boolean | ((err: ERR) => boolean);
     /**
-     * When set to true, the validated object will not be replaced with the Joi-converted value.
+     * Defaults to false.
      *
-     * Defaults to true.
-     * Exception is `headers` validation, where the default is `false`.
+     * When set to true, the validated object will be replaced with the converted value.
      *
      * To avoid mutation - shallow copy is performed.
      */

package/dist/validation/validateRequest.util.js

@@ -1,5 +1,5 @@
-import { AppError } from '@naturalcycles/js-lib/error';
-import { _get } from '@naturalcycles/js-lib/object';
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
+import { _get } from '@naturalcycles/js-lib/object/object.util.js';
 export function handleValidationError(error, originalProperty, opt = {}) {
     // const item: T = opt.mutate ? { ...req[reqProperty] } : (req[reqProperty] || {})
     let report;

package/dist/validation/zod/zodValidateRequest.js

@@ -20,13 +20,10 @@ class ZodValidateRequest {
      * Keep in mind that this will also remove all values that are not in the schema.
      */
     headers(req, schema, opt = {}) {
-        return this.validate(req, 'headers', schema, {
-            mutate: false,
-            ...opt,
-        });
+        return this.validate(req, 'headers', schema, opt);
     }
     validate(req, reqProperty, schema, opt = {}) {
-        const { mutate = true } = opt;
+        const { mutate } = opt;
         const originalProperty = req[reqProperty] || {};
         // Zod does not mutate the input
         const { error, data } = zSafeValidate(originalProperty, schema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.17.0",
+  "version": "9.19.0",
   "peerDependencies": {
     "@sentry/node": "^9"
   },
@@ -26,20 +26,20 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "*",
     "@sentry/node": "^9",
     "@types/ejs": "^3",
-    "fastify": "^5"
+    "fastify": "^5",
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
-    "./cfg/tsconfig.json": "./cfg/tsconfig.json",
     ".": "./dist/index.js",
+    "./cfg/tsconfig.json": "./cfg/tsconfig.json",
     "./admin": "./dist/admin/index.js",
+    "./admin/*.js": "./dist/admin/*.js",
     "./db": "./dist/db/index.js",
     "./deploy": "./dist/deploy/index.js",
-    "./express/createDefaultApp": "./dist/express/createDefaultApp.js",
-    "./express/getDefaultRouter": "./dist/express/getDefaultRouter.js",
-    "./express/startServer": "./dist/express/startServer.js",
+    "./deploy/*.js": "./dist/deploy/*.js",
+    "./express/*.js": "./dist/express/*.js",
     "./ajvValidateRequest": "./dist/validation/ajv/ajvValidateRequest.js",
     "./joiValidateRequest": "./dist/validation/joi/joiValidateRequest.js",
     "./zodValidateRequest": "./dist/validation/zod/zodValidateRequest.js",

package/src/admin/adminMiddleware.ts

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

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

@@ -1,4 +1,4 @@
-import { _Memo } from '@naturalcycles/js-lib/decorators'
+import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js'
 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/error'
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from '../server/server.model.js'
 import type { AdminMiddleware, RequireAdminCfg } from './adminMiddleware.js'

package/src/deploy/deploy.util.ts

@@ -1,7 +1,7 @@
-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 { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
+import { _assert } from '@naturalcycles/js-lib/error/assert.js'
+import { _mapValues, _merge } from '@naturalcycles/js-lib/object/object.util.js'
+import { _truncate } from '@naturalcycles/js-lib/string/string.util.js'
 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,5 +1,5 @@
 import { _anyToError } from '@naturalcycles/js-lib/error'
-import { pRetry } from '@naturalcycles/js-lib/promise'
+import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import { _objectAssign } from '@naturalcycles/js-lib/types'
 import { appendToGithubSummary } from '@naturalcycles/nodejs-lib/env'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'

package/src/deploy/deployHealthCheck.ts

@@ -2,8 +2,8 @@ import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
 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 { _filterFalsyValues } from '@naturalcycles/js-lib/object/object.util.js'
+import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'

package/src/deploy/deployInfo.util.ts

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

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

@@ -1,5 +1,5 @@
-import { _by } from '@naturalcycles/js-lib'
-import { _assert } from '@naturalcycles/js-lib/error'
+import { _by } from '@naturalcycles/js-lib/array/array.util.js'
+import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import type { StringMap } from '@naturalcycles/js-lib/types'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 

package/src/express/startServer.ts

@@ -1,7 +1,7 @@
 import type { Server } from 'node:http'
 import os from 'node:os'
-import { _ms } from '@naturalcycles/js-lib/datetime'
-import { _Memo } from '@naturalcycles/js-lib/decorators'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js'
 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/server/basicAuthMiddleware.ts

@@ -1,4 +1,4 @@
-import { _split } from '@naturalcycles/js-lib/string'
+import { _split } from '@naturalcycles/js-lib/string/string.util.js'
 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/error'
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { respondWithError } from './genericErrorMiddleware.js'
 import type { BackendRequestHandler } from './server.model.js'
 

package/src/server/requestLoggerMiddleware.ts

@@ -1,4 +1,4 @@
-import { _since } from '@naturalcycles/js-lib/datetime'
+import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
 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,5 @@
-import { _ms } from '@naturalcycles/js-lib/datetime'
-import { AppError } from '@naturalcycles/js-lib/error'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import type { NumberOfSeconds } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import { respondWithError } from './genericErrorMiddleware.js'

package/src/server/safeJsonMiddleware.ts

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

package/src/server/serverStatsMiddleware.ts

@@ -1,7 +1,9 @@
-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 { _mb } from '@naturalcycles/js-lib'
+import { _sortBy, _sum } from '@naturalcycles/js-lib/array/array.util.js'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { _percentile } from '@naturalcycles/js-lib/math/math.util.js'
+import { NumberStack } from '@naturalcycles/js-lib/math/stack.util.js'
+import { _get, _mapValues } from '@naturalcycles/js-lib/object/object.util.js'
 import { _stringMapEntries, _stringMapValues, type StringMap } from '@naturalcycles/js-lib/types'
 import { onFinished } from '../onFinished.js'
 import { getRequestEndpoint } from './request.util.js'

package/src/server/serverStatusMiddleware.ts

@@ -1,5 +1,5 @@
-import { localTime } from '@naturalcycles/js-lib/datetime'
-import { _filterNullishValues } from '@naturalcycles/js-lib/object'
+import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
+import { _filterNullishValues } from '@naturalcycles/js-lib/object/object.util.js'
 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,4 +1,4 @@
-import { _since } from '@naturalcycles/js-lib/datetime'
+import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { onFinished } from '../onFinished.js'

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

@@ -2,7 +2,7 @@ import type { Server } from 'node:http'
 import type { AddressInfo } from 'node:net'
 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 { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
 import {
   type BackendRequestHandlerCfg,
   createDefaultApp,

package/src/validation/ajv/ajvValidateRequest.ts

@@ -41,10 +41,7 @@ class AjvValidateRequest {
     schema: AjvSchema<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
-    return this.validate(req, 'headers', schema, {
-      mutate: false,
-      ...opt,
-    })
+    return this.validate(req, 'headers', schema, opt)
   }
 
   private validate<T>(
@@ -53,7 +50,7 @@ class AjvValidateRequest {
     schema: AjvSchema<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
-    const { mutate = true } = opt
+    const { mutate } = opt
     const originalProperty = req[reqProperty] || {}
     const item: T = mutate ? originalProperty : { ...originalProperty }
 

package/src/validation/joi/joiValidateRequest.ts

@@ -42,10 +42,7 @@ class ValidateRequest {
     schema: AnySchema<T>,
     opt: ReqValidationOptions<JoiValidationError> = {},
   ): T {
-    return this.validate(req, 'headers', schema, {
-      mutate: false,
-      ...opt,
-    })
+    return this.validate(req, 'headers', schema, opt)
   }
 
   private validate<T>(
@@ -54,7 +51,7 @@ class ValidateRequest {
     schema: AnySchema<T>,
     opt: ReqValidationOptions<JoiValidationError> = {},
   ): T {
-    const { mutate = true } = opt
+    const { mutate } = opt
     const originalProperty = req[reqProperty] || {}
 
     // Joi does not mutate the input

package/src/validation/validateRequest.util.ts

@@ -1,5 +1,5 @@
-import { AppError } from '@naturalcycles/js-lib/error'
-import { _get } from '@naturalcycles/js-lib/object'
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
+import { _get } from '@naturalcycles/js-lib/object/object.util.js'
 
 export function handleValidationError<T, ERR extends AppError>(
   error: ERR,
@@ -54,10 +54,9 @@ export interface ReqValidationOptions<ERR extends AppError> {
   report?: boolean | ((err: ERR) => boolean)
 
   /**
-   * When set to true, the validated object will not be replaced with the Joi-converted value.
+   * Defaults to false.
    *
-   * Defaults to true.
-   * Exception is `headers` validation, where the default is `false`.
+   * When set to true, the validated object will be replaced with the converted value.
    *
    * To avoid mutation - shallow copy is performed.
    */

package/src/validation/zod/zodValidateRequest.ts

@@ -41,10 +41,7 @@ class ZodValidateRequest {
     schema: ZodType<T>,
     opt: ReqValidationOptions<ZodValidationError> = {},
   ): T {
-    return this.validate(req, 'headers', schema, {
-      mutate: false,
-      ...opt,
-    })
+    return this.validate(req, 'headers', schema, opt)
   }
 
   private validate<T>(
@@ -53,7 +50,7 @@ class ZodValidateRequest {
     schema: ZodType<T>,
     opt: ReqValidationOptions<ZodValidationError> = {},
   ): T {
-    const { mutate = true } = opt
+    const { mutate } = opt
     const originalProperty = req[reqProperty] || {}
 
     // Zod does not mutate the input