@naturalcycles/db-lib 10.3.0 → 10.4.0

package/dist/commondao/common.dao.d.ts

@@ -1,6 +1,6 @@
 import type { Transform } from 'node:stream';
 import type { AsyncMapper, BaseDBEntity, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, StringMap, UnixTimestampMillis, Unsaved } from '@naturalcycles/js-lib';
-import { ZodSchema } from '@naturalcycles/js-lib/zod';
+import { ZodType } from '@naturalcycles/js-lib/zod';
 import type { ObjectSchema, ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { AjvSchema } from '@naturalcycles/nodejs-lib';
 import type { CommonDBTransactionOptions, DBTransaction, RunQueryResult } from '../db.model.js';
@@ -160,7 +160,7 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Does NOT mutate the object.
      * Validates (unless `skipValidation=true` passed).
      */
-    validateAndConvert<T>(obj: Partial<T>, schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined, op?: 'load' | 'save', // this is to skip validation if validateOnLoad/Save is false
+    validateAndConvert<T>(obj: Partial<T>, schema: ObjectSchema<T> | AjvSchema<T> | ZodType<T> | undefined, op?: 'load' | 'save', // this is to skip validation if validateOnLoad/Save is false
     opt?: CommonDaoOptions): any;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;

package/dist/commondao/common.dao.js

@@ -1,5 +1,5 @@
 import { _assert, _deepCopy, _deepJsonEquals, _filterUndefinedValues, _isTruthy, _objectAssignExact, _passthroughPredicate, _since, _truncate, _typeCast, _uniqBy, AppError, ErrorMode, localTime, pMap, SKIP, } from '@naturalcycles/js-lib';
-import { ZodSchema, zSafeValidate } from '@naturalcycles/js-lib/zod';
+import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod';
 import { _pipeline, AjvSchema, getValidationResult, stringId, transformChunk, transformLogProgress, transformMap, transformNoOp, writableVoid, } from '@naturalcycles/nodejs-lib';
 import { DBLibError } from '../cnst.js';
 import { RunnableDBQuery } from '../query/dbQuery.js';
@@ -953,7 +953,7 @@ export class CommonDao {
         const objectName = table;
         let error;
         let convertedValue;
-        if (schema instanceof ZodSchema) {
+        if (schema instanceof ZodType) {
             // Zod schema
             const vr = zSafeValidate(obj, schema);
             error = vr.error;

package/dist/commondao/common.dao.model.d.ts

@@ -1,5 +1,5 @@
 import type { BaseDBEntity, CommonLogger, ErrorMode, NumberOfMilliseconds, Promisable, UnixTimestamp } from '@naturalcycles/js-lib';
-import type { ZodError, ZodSchema } from '@naturalcycles/js-lib/zod';
+import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod';
 import type { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchema, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import type { CommonDB } from '../common.db.js';
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model.js';
@@ -74,7 +74,7 @@ export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntit
      * Return original `err` to pass the error through (will be thrown in CommonDao).
      * Return modified/new `Error` if needed.
      */
-    onValidationError: (err: JoiValidationError | AjvValidationError | ZodError) => Error | false;
+    onValidationError: (err: JoiValidationError | AjvValidationError | ZodValidationError) => Error | false;
 }
 export declare enum CommonDaoLogLevel {
     /**
@@ -100,7 +100,7 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
     /**
      * Joi, AjvSchema or ZodSchema is supported.
      */
-    bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>;
+    bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodType<BM>;
     excludeFromIndexes?: (keyof DBM)[];
     /**
      * Defaults to true.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.3.0",
+  "version": "10.4.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^14"

package/src/commondao/common.dao.model.ts

@@ -6,7 +6,7 @@ import type {
   Promisable,
   UnixTimestamp,
 } from '@naturalcycles/js-lib'
-import type { ZodError, ZodSchema } from '@naturalcycles/js-lib/zod'
+import type { ZodType, ZodValidationError } from '@naturalcycles/js-lib/zod'
 import type {
   AjvSchema,
   AjvValidationError,
@@ -97,7 +97,9 @@ export interface CommonDaoHooks<BM extends BaseDBEntity, DBM extends BaseDBEntit
    * Return original `err` to pass the error through (will be thrown in CommonDao).
    * Return modified/new `Error` if needed.
    */
-  onValidationError: (err: JoiValidationError | AjvValidationError | ZodError) => Error | false
+  onValidationError: (
+    err: JoiValidationError | AjvValidationError | ZodValidationError,
+  ) => Error | false
 }
 
 export enum CommonDaoLogLevel {
@@ -130,7 +132,7 @@ export interface CommonDaoCfg<
   /**
    * Joi, AjvSchema or ZodSchema is supported.
    */
-  bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>
+  bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodType<BM>
 
   excludeFromIndexes?: (keyof DBM)[]
 

package/src/commondao/common.dao.ts

@@ -29,7 +29,7 @@ import {
   SKIP,
 } from '@naturalcycles/js-lib'
 import type { ZodValidationError } from '@naturalcycles/js-lib/zod'
-import { ZodSchema, zSafeValidate } from '@naturalcycles/js-lib/zod'
+import { ZodType, zSafeValidate } from '@naturalcycles/js-lib/zod'
 import type {
   AjvValidationError,
   JoiValidationError,
@@ -1216,7 +1216,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
    */
   validateAndConvert<T>(
     obj: Partial<T>,
-    schema: ObjectSchema<T> | AjvSchema<T> | ZodSchema<T> | undefined,
+    schema: ObjectSchema<T> | AjvSchema<T> | ZodType<T> | undefined,
     op?: 'load' | 'save', // this is to skip validation if validateOnLoad/Save is false
     opt: CommonDaoOptions = {},
   ): any {
@@ -1245,10 +1245,10 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     const table = opt.table || this.cfg.table
     const objectName = table
 
-    let error: JoiValidationError | AjvValidationError | ZodValidationError<T> | undefined
+    let error: JoiValidationError | AjvValidationError | ZodValidationError | undefined
     let convertedValue: any
 
-    if (schema instanceof ZodSchema) {
+    if (schema instanceof ZodType) {
       // Zod schema
       const vr = zSafeValidate(obj as T, schema)
       error = vr.error