@naturalcycles/db-lib 10.7.0 → 10.8.0

package/dist/commondao/common.dao.js

@@ -962,7 +962,14 @@ export class CommonDao {
         const objectName = table;
         let error;
         let convertedValue;
-        if (schema instanceof ZodType) {
+        if (this.cfg.validateBM) {
+            const [err, value] = this.cfg.validateBM(obj, {
+                itemName: table,
+            });
+            error = err;
+            convertedValue = value;
+        }
+        else if (schema instanceof ZodType) {
             // Zod schema
             const vr = zSafeValidate(obj, schema);
             error = vr.error;
@@ -977,14 +984,7 @@ export class CommonDao {
         }
         else {
             // Joi
-            const start = localTime.nowUnixMillis();
             const vr = getValidationResult(obj, schema, objectName);
-            const tookMillis = localTime.nowUnixMillis() - start;
-            this.cfg.onValidationTime?.({
-                tookMillis,
-                table,
-                obj,
-            });
             error = vr.error;
             convertedValue = vr.value;
         }

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

@@ -1,3 +1,4 @@
+import type { ValidationFunction } from '@naturalcycles/js-lib';
 import type { ErrorMode } from '@naturalcycles/js-lib/error';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { BaseDBEntity, NumberOfMilliseconds, Promisable, UnixTimestamp } from '@naturalcycles/js-lib/types';
@@ -105,6 +106,15 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Joi, AjvSchema or ZodSchema is supported.
      */
     bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodType<BM>;
+    /**
+     * Experimental alternative to bmSchema.
+     * "Bring your own validation function".
+     * It removes the knowledge from CommonDao about the validation library used
+     * and abstracts it away.
+     *
+     * @experimental
+     */
+    validateBM?: ValidationFunction<BM, any>;
     excludeFromIndexes?: (keyof DBM)[];
     /**
      * Defaults to true.
@@ -116,12 +126,6 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * If set to false - save (write) operations will skip validation (and conversion).
      */
     validateOnSave?: boolean;
-    /**
-     * The hook allows to get a callback, to instrument "validation time".
-     *
-     * @experimental
-     */
-    onValidationTime?: (data: OnValidationTimeData) => void;
     /**
      * Defaults to false.
      * Setting it to true will set saveMethod to `insert` for save/saveBatch, which will

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.7.0",
+  "version": "10.8.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "19.8.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "files": [
     "dist",

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

@@ -1,3 +1,4 @@
+import type { ValidationFunction } from '@naturalcycles/js-lib'
 import type { ErrorMode } from '@naturalcycles/js-lib/error'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import type {
@@ -132,6 +133,16 @@ export interface CommonDaoCfg<
    */
   bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodType<BM>
 
+  /**
+   * Experimental alternative to bmSchema.
+   * "Bring your own validation function".
+   * It removes the knowledge from CommonDao about the validation library used
+   * and abstracts it away.
+   *
+   * @experimental
+   */
+  validateBM?: ValidationFunction<BM, any>
+
   excludeFromIndexes?: (keyof DBM)[]
 
   /**
@@ -146,13 +157,6 @@ export interface CommonDaoCfg<
    */
   validateOnSave?: boolean
 
-  /**
-   * The hook allows to get a callback, to instrument "validation time".
-   *
-   * @experimental
-   */
-  onValidationTime?: (data: OnValidationTimeData) => void
-
   /**
    * Defaults to false.
    * Setting it to true will set saveMethod to `insert` for save/saveBatch, which will

package/src/commondao/common.dao.ts

@@ -1240,7 +1240,13 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     let error: JoiValidationError | AjvValidationError | ZodValidationError | undefined
     let convertedValue: any
 
-    if (schema instanceof ZodType) {
+    if (this.cfg.validateBM) {
+      const [err, value] = this.cfg.validateBM(obj as any as BM, {
+        itemName: table,
+      })
+      error = err
+      convertedValue = value
+    } else if (schema instanceof ZodType) {
       // Zod schema
       const vr = zSafeValidate(obj as T, schema)
       error = vr.error
@@ -1254,16 +1260,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
       })
     } else {
       // Joi
-      const start = localTime.nowUnixMillis()
       const vr = getValidationResult(obj, schema, objectName)
-      const tookMillis = localTime.nowUnixMillis() - start
-
-      this.cfg.onValidationTime?.({
-        tookMillis,
-        table,
-        obj,
-      })
-
       error = vr.error
       convertedValue = vr.value
     }