@naturalcycles/backend-lib 9.33.1 → 9.34.0

package/dist/cloudrun/cloudRun.d.ts

@@ -100,7 +100,7 @@ export interface CloudRunEnv {
 /**
  * @experimental
  */
-declare class CloudRunService {
+declare class CloudRunUtil {
     /**
      * Turns an object into a string representation where each
      * key-value pair is represented as `key1=value1,key2=value2,...`.
@@ -108,5 +108,5 @@ declare class CloudRunService {
     stringifyObject(obj: AnyObject): string;
     readonly defaultStartupProbeConfig: CloudRunStartupProbeConfig;
 }
-export declare const cloudRunService: CloudRunService;
+export declare const cloudRunUtil: CloudRunUtil;
 export {};

package/dist/cloudrun/cloudRun.js

@@ -2,7 +2,7 @@ import { _filterUndefinedValues } from '@naturalcycles/js-lib/object';
 /**
  * @experimental
  */
-class CloudRunService {
+class CloudRunUtil {
     /**
      * Turns an object into a string representation where each
      * key-value pair is represented as `key1=value1,key2=value2,...`.
@@ -22,4 +22,4 @@ class CloudRunService {
         periodSeconds: 2,
     };
 }
-export const cloudRunService = new CloudRunService();
+export const cloudRunUtil = new CloudRunUtil();

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

@@ -1,10 +1,11 @@
-import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv';
+import type { ZodType } from '@naturalcycles/js-lib/zod';
+import { AjvSchema, type AjvValidationError } from '@naturalcycles/nodejs-lib/ajv';
 import type { BackendRequest } from '../../server/server.model.js';
 import { type ReqValidationOptions } from '../validateRequest.util.js';
 declare class AjvValidateRequest {
-    body<T>(req: BackendRequest, schema: AjvSchema<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
-    query<T>(req: BackendRequest, schema: AjvSchema<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
-    params<T>(req: BackendRequest, schema: AjvSchema<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
+    body<T>(req: BackendRequest, schema: AjvSchema<T> | ZodType<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
+    query<T>(req: BackendRequest, schema: AjvSchema<T> | ZodType<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
+    params<T>(req: BackendRequest, schema: AjvSchema<T> | ZodType<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
     /**
      * Does NOT mutate `req.headers`,
      * but returns validated/transformed headers.

package/dist/validation/ajv/ajvValidateRequest.js

@@ -1,4 +1,5 @@
 import { _deepCopy } from '@naturalcycles/js-lib/object';
+import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { handleValidationError } from '../validateRequest.util.js';
 class AjvValidateRequest {
     body(req, schema, opt = {}) {
@@ -26,7 +27,8 @@ class AjvValidateRequest {
     }
     validate(req, reqProperty, schema, opt = {}) {
         const input = req[reqProperty] || {};
-        const [error, output] = schema.getValidationResult(input, {
+        const ajvSchema = AjvSchema.create(schema);
+        const [error, output] = ajvSchema.getValidationResult(input, {
             inputName: `request ${reqProperty}`,
         });
         if (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.33.1",
+  "version": "9.34.0",
   "peerDependencies": {
     "@sentry/node": "^10"
   },

package/src/cloudrun/cloudRun.ts

@@ -132,7 +132,7 @@ export interface CloudRunEnv {
 /**
  * @experimental
  */
-class CloudRunService {
+class CloudRunUtil {
   /**
    * Turns an object into a string representation where each
    * key-value pair is represented as `key1=value1,key2=value2,...`.
@@ -154,4 +154,4 @@ class CloudRunService {
   }
 }
 
-export const cloudRunService = new CloudRunService()
+export const cloudRunUtil = new CloudRunUtil()

package/src/validation/ajv/ajvValidateRequest.ts

@@ -1,12 +1,13 @@
 import { _deepCopy } from '@naturalcycles/js-lib/object'
-import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
+import type { ZodType } from '@naturalcycles/js-lib/zod'
+import { AjvSchema, type AjvValidationError } from '@naturalcycles/nodejs-lib/ajv'
 import type { BackendRequest } from '../../server/server.model.js'
 import { handleValidationError, type ReqValidationOptions } from '../validateRequest.util.js'
 
 class AjvValidateRequest {
   body<T>(
     req: BackendRequest,
-    schema: AjvSchema<T>,
+    schema: AjvSchema<T> | ZodType<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
     return this.validate(req, 'body', schema, opt)
@@ -14,7 +15,7 @@ class AjvValidateRequest {
 
   query<T>(
     req: BackendRequest,
-    schema: AjvSchema<T>,
+    schema: AjvSchema<T> | ZodType<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
     return this.validate(req, 'query', schema, opt)
@@ -22,7 +23,7 @@ class AjvValidateRequest {
 
   params<T>(
     req: BackendRequest,
-    schema: AjvSchema<T>,
+    schema: AjvSchema<T> | ZodType<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
     return this.validate(req, 'params', schema, opt)
@@ -50,12 +51,13 @@ class AjvValidateRequest {
   private validate<T>(
     req: BackendRequest,
     reqProperty: 'body' | 'params' | 'query' | 'headers',
-    schema: AjvSchema<T>,
+    schema: AjvSchema<T> | ZodType<T>,
     opt: ReqValidationOptions<AjvValidationError> = {},
   ): T {
     const input: T = req[reqProperty] || {}
+    const ajvSchema = AjvSchema.create(schema)
 
-    const [error, output] = schema.getValidationResult(input, {
+    const [error, output] = ajvSchema.getValidationResult(input, {
       inputName: `request ${reqProperty}`,
     })