@naturalcycles/backend-lib 9.37.0 → 9.39.0

package/dist/db/httpDB.d.ts

@@ -1,8 +1,8 @@
 import type { CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBSupport, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
 import { BaseCommonDB } from '@naturalcycles/db-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 { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 export interface HttpDBCfg extends FetcherOptions {
     baseUrl: string;
 }
@@ -17,7 +17,7 @@ export declare class HttpDB extends BaseCommonDB implements CommonDB {
     private fetcher;
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
     resetCache(table?: string): Promise<void>;
     getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][], opt?: CommonDBOptions): Promise<ROW[]>;
     runQuery<ROW extends ObjectWithId>(query: DBQuery<ROW>, opt?: CommonDBOptions): Promise<RunQueryResult<ROW>>;

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

@@ -2,9 +2,9 @@ import { type AjvValidationError, type SchemaHandledByAjv } from '@naturalcycles
 import type { BackendRequest } from '../../server/server.model.js';
 import { type ReqValidationOptions } from '../validateRequest.util.js';
 declare class AjvValidateRequest {
-    body<T>(req: BackendRequest, schema: SchemaHandledByAjv<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
-    query<T>(req: BackendRequest, schema: SchemaHandledByAjv<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
-    params<T>(req: BackendRequest, schema: SchemaHandledByAjv<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
+    body<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    query<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
+    params<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     /**
      * Does NOT mutate `req.headers`,
      * but returns validated/transformed headers.
@@ -13,7 +13,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<T>(req: BackendRequest, schema: SchemaHandledByAjv<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
+    headers<IN, OUT>(req: BackendRequest, schema: SchemaHandledByAjv<IN, OUT>, opt?: ReqValidationOptions<AjvValidationError>): OUT;
     private validate;
 }
 export declare const ajvValidateRequest: AjvValidateRequest;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.37.0",
+  "version": "9.39.0",
   "peerDependencies": {
     "@sentry/node": "^10"
   },
@@ -29,7 +29,7 @@
     "@sentry/node": "^10",
     "@types/ejs": "^3",
     "fastify": "^5",
-    "@naturalcycles/dev-lib": "20.6.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/db/httpDB.ts

@@ -9,8 +9,8 @@ import type {
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-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 { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 
 export interface HttpDBCfg extends FetcherOptions {
   baseUrl: string
@@ -51,9 +51,7 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     return await this.fetcher.get(`tables`)
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  override async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>> {
     return await this.fetcher.get(`${table}/schema`)
   }
 

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

@@ -1,7 +1,6 @@
 import { _lazyValue } from '@naturalcycles/js-lib'
-import type { JsonSchema } from '@naturalcycles/js-lib/json-schema'
 import type { StringMap } from '@naturalcycles/js-lib/types'
-import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv'
+import { AjvSchema, 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/validation/ajv/ajvValidateRequest.ts

@@ -8,27 +8,27 @@ import type { BackendRequest } from '../../server/server.model.js'
 import { handleValidationError, type ReqValidationOptions } from '../validateRequest.util.js'
 
 class AjvValidateRequest {
-  body<T>(
+  body<IN, OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<T>,
+    schema: SchemaHandledByAjv<IN, OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
-  ): T {
+  ): OUT {
     return this.validate(req, 'body', schema, opt)
   }
 
-  query<T>(
+  query<IN, OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<T>,
+    schema: SchemaHandledByAjv<IN, OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
-  ): T {
+  ): OUT {
     return this.validate(req, 'query', schema, opt)
   }
 
-  params<T>(
+  params<IN, OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<T>,
+    schema: SchemaHandledByAjv<IN, OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
-  ): T {
+  ): OUT {
     return this.validate(req, 'params', schema, opt)
   }
 
@@ -40,24 +40,24 @@ 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<T>(
+  headers<IN, OUT>(
     req: BackendRequest,
-    schema: SchemaHandledByAjv<T>,
+    schema: SchemaHandledByAjv<IN, OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
-  ): T {
+  ): OUT {
     const originalHeaders = _deepCopy(req.headers)
     const headers = this.validate(req, 'headers', schema, opt)
     req.headers = originalHeaders
     return headers
   }
 
-  private validate<T>(
+  private validate<IN, OUT>(
     req: BackendRequest,
     reqProperty: 'body' | 'params' | 'query' | 'headers',
-    schema: SchemaHandledByAjv<T>,
+    schema: SchemaHandledByAjv<IN, OUT>,
     opt: ReqValidationOptions<AjvValidationError> = {},
-  ): T {
-    const input: T = req[reqProperty] || {}
+  ): OUT {
+    const input: IN = req[reqProperty] || {}
     const ajvSchema = AjvSchema.create(schema)
 
     const [error, output] = ajvSchema.getValidationResult(input, {