@naturalcycles/backend-lib 9.51.0 → 9.52.0

package/dist/express/createDefaultApp.d.ts

@@ -1,7 +1,7 @@
 import type { Options, OptionsJson, OptionsUrlencoded } from 'body-parser';
 import type { CorsOptions } from 'cors';
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js';
-import { type GenericErrorMiddlewareCfg } from '../server/genericErrorMiddleware.js';
+import type { GenericErrorMiddlewareCfg } from '../server/genericErrorMiddleware.js';
 import type { BackendApplication, BackendRequestHandler } from '../server/server.model.js';
 export declare function createDefaultApp(cfg: DefaultAppCfg): Promise<BackendApplication>;
 /**

package/dist/express/createDefaultApp.js

@@ -1,6 +1,6 @@
 import { asyncLocalStorageMiddleware } from '../server/asyncLocalStorageMiddleware.js';
 import { compressionMiddleware } from '../server/compressionMiddleware.js';
-import { genericErrorMiddleware, } from '../server/genericErrorMiddleware.js';
+import { genericErrorMiddleware } from '../server/genericErrorMiddleware.js';
 import { logMiddleware } from '../server/logMiddleware.js';
 import { methodOverrideMiddleware } from '../server/methodOverrideMiddleware.js';
 import { notFoundMiddleware } from '../server/notFoundMiddleware.js';

package/dist/express/startServer.d.ts

@@ -1,7 +1,7 @@
 import type { Server } from 'node:http';
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js';
 import type { BackendApplication } from '../server/server.model.js';
-import { type DefaultAppCfg } from './createDefaultApp.js';
+import type { DefaultAppCfg } from './createDefaultApp.js';
 export declare class BackendServer {
     private cfg;
     constructor(cfg: StartServerCfg);

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

@@ -1,5 +1,5 @@
 import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib/http';
-import { type BackendRequestHandlerCfg, type DefaultAppCfg } from '../express/createDefaultApp.js';
+import type { BackendRequestHandlerCfg, DefaultAppCfg } from '../express/createDefaultApp.js';
 import type { BackendApplication } from '../server/server.model.js';
 export interface ExpressApp extends Fetcher, AsyncDisposable {
     close: () => Promise<void>;

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

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

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

@@ -1,22 +1,22 @@
-import { type AjvValidationError, type SchemaHandledByAjv } from '@naturalcycles/nodejs-lib/ajv';
+import type { AjvValidationError, SchemaHandledByAjv } from '@naturalcycles/nodejs-lib/ajv';
 import type { BackendRequest } from '../../server/server.model.js';
-import { type ReqValidationOptions } from '../validateRequest.util.js';
+import type { ReqValidationOptions } from '../validateRequest.util.js';
 declare class AjvValidateRequest {
-    body<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    body<OUT>(req: BackendRequest, schema: SchemaHandledByAjv<OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     /**
      * Query validation uses type coercion (unlike body validation),
      * so the passed in schemas do not need to specify only string values.
      *
      * Coercion mutates the input, even if the end result is that the input failed the validation.
      */
-    query<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    query<OUT>(req: BackendRequest, schema: SchemaHandledByAjv<OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     /**
      * Params validation uses type coercion (unlike body validation),
      * so the passed in schemas do not need to specify only string values.
      *
      * Coercion mutates the input, even if the end result is that the input failed the validation.
      */
-    params<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    params<OUT>(req: BackendRequest, schema: SchemaHandledByAjv<OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     /**
      * Does NOT mutate `req.headers`,
      * but returns validated/transformed headers.
@@ -25,7 +25,7 @@ declare class AjvValidateRequest {
      * We want to non-mutate the `req.headers`, because we anticipate that
      * there may be additional consumers for `req.headers` (e.g middlewares, etc).
      */
-    headers<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    headers<OUT>(req: BackendRequest, schema: SchemaHandledByAjv<OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     private validate;
 }
 export declare const validateRequest: AjvValidateRequest;

package/dist/validation/ajv/validateRequest.js

@@ -1,4 +1,4 @@
-import { AjvSchema, getCoercingAjv, } from '@naturalcycles/nodejs-lib/ajv';
+import { AjvSchema, getCoercingAjv } from '@naturalcycles/nodejs-lib/ajv';
 import { handleValidationError } from '../validateRequest.util.js';
 class AjvValidateRequest {
     body(req, schema, opt = {}) {
@@ -45,7 +45,7 @@ class AjvValidateRequest {
         });
     }
     validate(req, reqProperty, schema, getOriginalInput, opt = {}) {
-        const input = (req[reqProperty] || {});
+        const input = req[reqProperty] || {};
         const { coerceTypes, mutateInput } = opt;
         const ajv = coerceTypes ? getCoercingAjv() : undefined;
         const ajvSchema = AjvSchema.create(schema, { ajv });

package/dist/validation/zod/zodValidateRequest.d.ts

@@ -1,6 +1,6 @@
-import { type ZodType, type ZodValidationError } from '@naturalcycles/js-lib/zod';
+import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod';
 import type { BackendRequest } from '../../server/server.model.js';
-import { type ReqValidationOptions } from '../validateRequest.util.js';
+import type { ReqValidationOptions } from '../validateRequest.util.js';
 declare class ZodValidateRequest {
     body<T>(req: BackendRequest, schema: ZodType<T>, opt?: ReqValidationOptions<ZodValidationError>): T;
     query<T>(req: BackendRequest, schema: ZodType<T>, opt?: ReqValidationOptions<ZodValidationError>): T;

package/dist/validation/zod/zodValidateRequest.js

@@ -25,7 +25,9 @@ class ZodValidateRequest {
     validate(req, reqProperty, schema, opt = {}) {
         const originalProperty = (req[reqProperty] || {});
         // Zod does not mutate the input
-        const [error, data] = zSafeValidate(originalProperty, schema);
+        const [error, data] = zSafeValidate(originalProperty, schema
+        // opt2?.itemName,
+        );
         if (error) {
             handleValidationError(error, originalProperty, opt);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.51.0",
+  "version": "9.52.0",
   "peerDependencies": {
     "@sentry/node": "^10"
   },
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@sentry/node": "^10",
-    "@types/ejs": "^3",
+    "@typescript/native-preview": "7.0.0-dev.20260201.1",
     "fastify": "^5",
     "@naturalcycles/dev-lib": "18.4.2"
   },
@@ -45,7 +45,7 @@
     "./deploy": "./dist/deploy/index.js",
     "./deploy/*.js": "./dist/deploy/*.js",
     "./express/*.js": "./dist/express/*.js",
-    "./ajvValidateRequest": "./dist/validation/ajv/validateRequest.js",
+    "./validateRequest": "./dist/validation/ajv/validateRequest.js",
     "./zodValidateRequest": "./dist/validation/zod/zodValidateRequest.js",
     "./onFinished": "./dist/onFinished.js",
     "./testing": "./dist/testing/index.js"

package/readme.md

@@ -9,3 +9,7 @@
 [![Actions](https://github.com/NaturalCycles/backend-lib/workflows/ci/badge.svg)](https://github.com/NaturalCycles/backend-lib/actions)
 
 # [Documentation](https://naturalcycles.github.io/backend-lib/)
+
+## chore-counter
+
+1

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

@@ -1,6 +1,7 @@
 import { _lazyValue } from '@naturalcycles/js-lib'
 import type { StringMap } from '@naturalcycles/js-lib/types'
-import { AjvSchema, type JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
+import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2'
 import { resourcesDir } from '../paths.cnst.js'

package/src/express/createDefaultApp.ts

@@ -3,10 +3,8 @@ import type { CorsOptions } from 'cors'
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
 import { asyncLocalStorageMiddleware } from '../server/asyncLocalStorageMiddleware.js'
 import { compressionMiddleware } from '../server/compressionMiddleware.js'
-import {
-  genericErrorMiddleware,
-  type GenericErrorMiddlewareCfg,
-} from '../server/genericErrorMiddleware.js'
+import { genericErrorMiddleware } from '../server/genericErrorMiddleware.js'
+import type { GenericErrorMiddlewareCfg } from '../server/genericErrorMiddleware.js'
 import { logMiddleware } from '../server/logMiddleware.js'
 import { methodOverrideMiddleware } from '../server/methodOverrideMiddleware.js'
 import { notFoundMiddleware } from '../server/notFoundMiddleware.js'

package/src/express/startServer.ts

@@ -5,7 +5,8 @@ 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'
-import { createDefaultApp, type DefaultAppCfg } from './createDefaultApp.js'
+import { createDefaultApp } from './createDefaultApp.js'
+import type { DefaultAppCfg } from './createDefaultApp.js'
 
 const { NODE_OPTIONS, APP_ENV } = process.env
 

package/src/server/logMiddleware.ts

@@ -1,6 +1,7 @@
 import { inspect } from 'node:util'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { _objectAssign, type AnyObject } from '@naturalcycles/js-lib/types'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
+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/serverStatsMiddleware.ts

@@ -5,7 +5,8 @@ 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 { _stringMapEntries, _stringMapValues } from '@naturalcycles/js-lib/types'
+import 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/testing/express.test.service.ts

@@ -3,11 +3,8 @@ 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/pDelay.js'
-import {
-  type BackendRequestHandlerCfg,
-  createDefaultApp,
-  type DefaultAppCfg,
-} from '../express/createDefaultApp.js'
+import { createDefaultApp } from '../express/createDefaultApp.js'
+import type { BackendRequestHandlerCfg, DefaultAppCfg } from '../express/createDefaultApp.js'
 import type { BackendApplication } from '../server/server.model.js'
 
 const nativeFetchFn: FetchFunction = async (url, init) => await globalThis.fetch(url, init)

package/src/validation/ajv/validateRequest.ts

@@ -1,16 +1,13 @@
-import {
-  AjvSchema,
-  type AjvValidationError,
-  getCoercingAjv,
-  type SchemaHandledByAjv,
-} from '@naturalcycles/nodejs-lib/ajv'
+import { AjvSchema, getCoercingAjv } from '@naturalcycles/nodejs-lib/ajv'
+import type { AjvValidationError, SchemaHandledByAjv } from '@naturalcycles/nodejs-lib/ajv'
 import type { BackendRequest } from '../../server/server.model.js'
-import { handleValidationError, type ReqValidationOptions } from '../validateRequest.util.js'
+import { handleValidationError } from '../validateRequest.util.js'
+import type { ReqValidationOptions } from '../validateRequest.util.js'
 
 class AjvValidateRequest {
-  body<IN, OUT>(
+  body<OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<IN, OUT>,
+    schema: SchemaHandledByAjv<OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): OUT {
     return this.validate(
@@ -28,9 +25,9 @@ class AjvValidateRequest {
    *
    * Coercion mutates the input, even if the end result is that the input failed the validation.
    */
-  query<IN, OUT>(
+  query<OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<IN, OUT>,
+    schema: SchemaHandledByAjv<OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): OUT {
     const originalQuery = JSON.stringify(req.query)
@@ -46,9 +43,9 @@ class AjvValidateRequest {
    *
    * Coercion mutates the input, even if the end result is that the input failed the validation.
    */
-  params<IN, OUT>(
+  params<OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<IN, OUT>,
+    schema: SchemaHandledByAjv<OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): OUT {
     const originalParams = JSON.stringify(req.params)
@@ -66,9 +63,9 @@ class AjvValidateRequest {
    * We want to non-mutate the `req.headers`, because we anticipate that
    * there may be additional consumers for `req.headers` (e.g middlewares, etc).
    */
-  headers<IN, OUT>(
+  headers<OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<IN, OUT>,
+    schema: SchemaHandledByAjv<OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): OUT {
     return this.validate(req, 'headers', schema, undefined, {
@@ -77,14 +74,14 @@ class AjvValidateRequest {
     })
   }
 
-  private validate<IN, OUT>(
+  private validate<OUT>(
     req: BackendRequest,
     reqProperty: 'body' | 'params' | 'query' | 'headers',
-    schema: SchemaHandledByAjv<IN, OUT>,
-    getOriginalInput?: () => IN,
+    schema: SchemaHandledByAjv<OUT>,
+    getOriginalInput?: () => unknown,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): OUT {
-    const input = (req[reqProperty] || {}) as IN
+    const input = req[reqProperty] || {}
 
     const { coerceTypes, mutateInput } = opt
     const ajv = coerceTypes ? getCoercingAjv() : undefined

package/src/validation/zod/zodValidateRequest.ts

@@ -1,6 +1,8 @@
-import { type ZodType, type ZodValidationError, zSafeValidate } from '@naturalcycles/js-lib/zod'
+import { zSafeValidate } from '@naturalcycles/js-lib/zod'
+import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod'
 import type { BackendRequest } from '../../server/server.model.js'
-import { handleValidationError, type ReqValidationOptions } from '../validateRequest.util.js'
+import { handleValidationError } from '../validateRequest.util.js'
+import type { ReqValidationOptions } from '../validateRequest.util.js'
 
 class ZodValidateRequest {
   body<T>(