@naturalcycles/db-lib 10.42.2 → 10.43.0

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

@@ -173,8 +173,8 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Validates (unless `skipValidation=true` passed).
      */
     private validateAndConvert;
-    getTableSchema(): Promise<JsonSchema<any, DBM>>;
-    createTable(schema: JsonSchema<any, DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
+    getTableSchema(): Promise<JsonSchema<DBM>>;
+    createTable(schema: JsonSchema<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
      * Proxy to this.cfg.db.ping
      */

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

@@ -89,7 +89,7 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * It removes the knowledge from CommonDao about the validation library used
      * and abstracts it away.
      */
-    validateBM?: ValidationFunction<BM, BM, any>;
+    validateBM?: ValidationFunction<BM, any>;
     /**
      * Used by e.g Datastore.
      */

package/dist/testing/test.model.d.ts

@@ -19,7 +19,7 @@ export interface TestItemTM {
     even?: boolean;
 }
 export declare const testItemTMSchema: any;
-export declare const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, TestItemBM, false>;
+export declare const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, false>;
 export declare function createTestItemDBM(num?: number): TestItemDBM;
 export declare function createTestItemBM(num?: number): TestItemBM;
 export declare function createTestItemsDBM(count?: number): TestItemDBM[];

package/dist/validation/index.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDBOptions } from '../db.model.js';
-export declare const commonDBOptionsSchema: () => JsonSchemaObjectBuilder<CommonDBOptions, CommonDBOptions>;
+export declare const commonDBOptionsSchema: () => JsonSchemaObjectBuilder<CommonDBOptions, false>;
 export declare const commonDBSaveOptionsSchema: <ROW extends ObjectWithId>() => any;
 export declare const dbQueryFilterOperatorSchema: any;
 export declare const dbQueryFilterSchema: <ROW extends ObjectWithId>() => any;

package/package.json

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

package/readme.md

@@ -303,14 +303,6 @@ Passing empty array will actually return an array of empty objects (documented e
 .select(['id']) //=> [ { id: 'id1' }, { id: 'id2' }, ... ]
 ```
 
-# Exports
-
-- `/` root
-- `/adapter/file`
-- `/adapter/cachedb`
-- `/testing`
-  - dbTest
-  - daoTest
-  - Test models, utils, etc
-- `/validation`
-  - Joi validation schemas for DBQuery, CommonDBOptions, CommonSchema, etc
+## chore-counter
+
+1

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

@@ -109,7 +109,7 @@ export interface CommonDaoCfg<
    * It removes the knowledge from CommonDao about the validation library used
    * and abstracts it away.
    */
-  validateBM?: ValidationFunction<BM, BM, any>
+  validateBM?: ValidationFunction<BM, any>
 
   /**
    * Used by e.g Datastore.

package/src/commondao/common.dao.ts

@@ -926,11 +926,11 @@ export class CommonDao<
     return convertedValue
   }
 
-  async getTableSchema(): Promise<JsonSchema<any, DBM>> {
+  async getTableSchema(): Promise<JsonSchema<DBM>> {
     return await this.cfg.db.getTableSchema<DBM>(this.cfg.table)
   }
 
-  async createTable(schema: JsonSchema<any, DBM>, opt?: CommonDaoCreateOptions): Promise<void> {
+  async createTable(schema: JsonSchema<DBM>, opt?: CommonDaoCreateOptions): Promise<void> {
     this.requireWriteAccess()
     await this.cfg.db.createTable(this.cfg.table, schema, opt)
   }

package/src/testing/test.model.ts

@@ -31,7 +31,7 @@ export const testItemTMSchema = j.object<TestItemTM>({
   even: j.boolean().optional(),
 })
 
-export const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, TestItemBM, false> =
+export const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, false> =
   j.object.dbEntity<TestItemBM>({
     // todo: figure out how to not copy-paste these 3 fields
     id: j.string(), // todo: not strictly needed here

package/src/validation/index.ts

@@ -11,12 +11,9 @@ import type { DBQueryFilter, DBQueryOrder } from '../query/dbQuery.js'
 const dbTransactionSchema = j.object.any().castAs<DBTransaction>()
 
 // Schema that accepts any value (string, number, boolean, object, array, null)
-const anyValueSchema = new JsonSchemaAnyBuilder<any, any, false>({})
+const anyValueSchema = new JsonSchemaAnyBuilder<any, false>({})
 
-export const commonDBOptionsSchema = (): JsonSchemaObjectBuilder<
-  CommonDBOptions,
-  CommonDBOptions
-> =>
+export const commonDBOptionsSchema = (): JsonSchemaObjectBuilder<CommonDBOptions, false> =>
   j.object<CommonDBOptions>({
     tx: dbTransactionSchema.optional(),
   })