@naturalcycles/db-lib 8.50.0 → 8.50.2

package/dist/adapter/cachedb/cache.db.d.ts

@@ -21,14 +21,14 @@ export declare class CacheDB extends BaseCommonDB implements CommonDB {
      * Resets InMemory DB data
      */
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends Partial<ObjectWithId>>(table: string): Promise<JsonSchemaRootObject<ROW>>;
-    createTable<ROW extends Partial<ObjectWithId>>(table: string, schema: JsonSchemaObject<ROW>, opt?: CacheDBCreateOptions): Promise<void>;
-    getByIds<ROW extends Partial<ObjectWithId>>(table: string, ids: ROW['id'][], opt?: CacheDBSaveOptions<ROW>): Promise<ROW[]>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CacheDBCreateOptions): Promise<void>;
+    getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][], opt?: CacheDBSaveOptions<ROW>): Promise<ROW[]>;
     saveBatch<ROW extends Partial<ObjectWithId>>(table: string, rows: ROW[], opt?: CacheDBSaveOptions<ROW>): Promise<void>;
-    runQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CacheDBSaveOptions<ROW>): Promise<RunQueryResult<ROW>>;
-    runQueryCount<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CacheDBOptions): Promise<number>;
-    streamQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CacheDBStreamOptions): Readable;
-    deleteByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CacheDBOptions): Promise<number>;
-    updateByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CacheDBOptions): Promise<number>;
+    runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CacheDBSaveOptions<ROW>): Promise<RunQueryResult<ROW>>;
+    runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CacheDBOptions): Promise<number>;
+    streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CacheDBStreamOptions): Readable;
+    deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CacheDBOptions): Promise<number>;
+    updateByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CacheDBOptions): Promise<number>;
     commitTransaction(tx: DBTransaction, opt?: CommonDBOptions): Promise<void>;
 }

package/dist/base.common.db.d.ts

@@ -11,15 +11,15 @@ import { DBTransaction } from './transaction/dbTransaction';
 export declare class BaseCommonDB implements CommonDB {
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends Partial<ObjectWithId>>(table: string): Promise<JsonSchemaRootObject<ROW>>;
-    createTable<ROW extends Partial<ObjectWithId>>(table: string, schema: JsonSchemaObject<ROW>): Promise<void>;
-    getByIds<ROW extends Partial<ObjectWithId>>(table: string, ids: ROW['id'][]): Promise<ROW[]>;
-    deleteByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<number>;
-    updateByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CommonDBOptions): Promise<number>;
-    runQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<RunQueryResult<ROW>>;
-    runQueryCount<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<number>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>): Promise<void>;
+    getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][]): Promise<ROW[]>;
+    deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<number>;
+    updateByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CommonDBOptions): Promise<number>;
+    runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<RunQueryResult<ROW>>;
+    runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<number>;
     saveBatch<ROW extends Partial<ObjectWithId>>(table: string, rows: ROW[], opt?: CommonDBSaveOptions<ROW>): Promise<void>;
-    streamQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): ReadableTyped<ROW>;
+    streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): ReadableTyped<ROW>;
     /**
      * Naive implementation.
      * Doesn't support rollback on error, hence doesn't pass dbTest.

package/dist/common.db.d.ts

@@ -21,23 +21,23 @@ export interface CommonDB {
      *
      * This is important for the code to rely on it, and it's verified by dbTest
      */
-    getTableSchema<ROW extends Partial<ObjectWithId>>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
     /**
      * Will do like `create table ...` for mysql.
      * Caution! dropIfExists defaults to false. If set to true - will actually DROP the table!
      */
-    createTable<ROW extends Partial<ObjectWithId>>(table: string, schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
+    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
     /**
      * Order of items returned is not guaranteed to match order of ids.
      * (Such limitation exists because Datastore doesn't support it).
      */
-    getByIds<ROW extends Partial<ObjectWithId>>(table: string, ids: ROW['id'][], opt?: CommonDBOptions): Promise<ROW[]>;
+    getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][], opt?: CommonDBOptions): Promise<ROW[]>;
     /**
      * Order by 'id' is not supported by all implementations (for example, Datastore doesn't support it).
      */
-    runQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<RunQueryResult<ROW>>;
-    runQueryCount<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
-    streamQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CommonDBStreamOptions): ReadableTyped<ROW>;
+    runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<RunQueryResult<ROW>>;
+    runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
+    streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBStreamOptions): ReadableTyped<ROW>;
     /**
      * rows can have missing ids only if DB supports auto-generating them (like mysql auto_increment).
      */
@@ -46,7 +46,7 @@ export interface CommonDB {
      * Returns number of deleted items.
      * Not supported by all implementations (e.g Datastore will always return same number as number of ids).
      */
-    deleteByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
+    deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>;
     /**
      * Applies patch to the rows returned by the query.
      *
@@ -65,7 +65,7 @@ export interface CommonDB {
      *
      * Returns number of rows affected.
      */
-    updateByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CommonDBOptions): Promise<number>;
+    updateByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, patch: DBPatch<ROW>, opt?: CommonDBOptions): Promise<number>;
     /**
      * Should be implemented as a Transaction (best effort), which means that
      * either ALL or NONE of the operations should be applied.

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

@@ -9,7 +9,7 @@ import { CommonDaoCfg, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOp
  * DBM = Database model (how it's stored in DB)
  * BM = Backend model (optimized for API access)
  */
-export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends Partial<ObjectWithId<ID>> = BM, ID extends string | number = NonNullable<BM['id']>> {
+export declare class CommonDao<BM extends ObjectWithId<ID>, DBM extends ObjectWithId<ID> = BM, ID extends string | number = BM['id']> {
     cfg: CommonDaoCfg<BM, DBM, ID>;
     constructor(cfg: CommonDaoCfg<BM, DBM, ID>);
     create(part?: Partial<BM>, opt?: CommonDaoOptions): Saved<BM>;
@@ -137,7 +137,7 @@ export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
+    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | undefined, modelType?: DBModelType | string, opt?: CommonDaoOptions): OUT;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**

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

@@ -44,7 +44,7 @@ export declare enum CommonDaoLogLevel {
      */
     DATA_FULL = 30
 }
-export interface CommonDaoCfg<BM extends Partial<ObjectWithId<ID>>, DBM extends Partial<ObjectWithId<ID>> = BM, ID extends string | number = NonNullable<BM['id']>> {
+export interface CommonDaoCfg<BM extends ObjectWithId<ID>, DBM extends ObjectWithId<ID> = BM, ID extends string | number = BM['id']> {
     db: CommonDB;
     table: string;
     /**

package/dist/query/dbQuery.d.ts

@@ -84,7 +84,7 @@ export declare class DBQuery<ROW extends Partial<ObjectWithId> = AnyObjectWithId
 /**
  * DBQuery that has additional method to support Fluent API style.
  */
-export declare class RunnableDBQuery<BM extends Partial<ObjectWithId<ID>>, DBM extends Partial<ObjectWithId<ID>> = BM, ID extends string | number = NonNullable<BM['id']>> extends DBQuery<DBM> {
+export declare class RunnableDBQuery<BM extends ObjectWithId<ID>, DBM extends ObjectWithId<ID> = BM, ID extends string | number = BM['id']> extends DBQuery<DBM> {
     dao: CommonDao<BM, DBM, ID>;
     /**
      * Pass `table` to override table.

package/package.json

@@ -41,7 +41,7 @@
   "engines": {
     "node": ">=14.15"
   },
-  "version": "8.50.0",
+  "version": "8.50.2",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/adapter/cachedb/cache.db.ts

@@ -53,13 +53,13 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return await this.cfg.downstreamDB.getTables()
   }
 
-  override async getTableSchema<ROW extends Partial<ObjectWithId>>(
+  override async getTableSchema<ROW extends ObjectWithId>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
     return await this.cfg.downstreamDB.getTableSchema<ROW>(table)
   }
 
-  override async createTable<ROW extends Partial<ObjectWithId>>(
+  override async createTable<ROW extends ObjectWithId>(
     table: string,
     schema: JsonSchemaObject<ROW>,
     opt: CacheDBCreateOptions = {},
@@ -73,7 +73,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async getByIds<ROW extends Partial<ObjectWithId>>(
+  override async getByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     opt: CacheDBSaveOptions<ROW> = {},
@@ -84,9 +84,9 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     if (!opt.skipCache && !this.cfg.skipCache) {
       const results = await this.cfg.cacheDB.getByIds<ROW>(table, ids, opt)
 
-      results.forEach(r => (resultMap[r.id!] = r))
+      results.forEach(r => (resultMap[r.id] = r))
 
-      missingIds.push(...ids.filter(id => !resultMap[id!]))
+      missingIds.push(...ids.filter(id => !resultMap[id]))
 
       if (this.cfg.logCached) {
         this.cfg.logger?.log(
@@ -99,7 +99,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
     if (missingIds.length && !opt.onlyCache && !this.cfg.onlyCache) {
       const results = await this.cfg.downstreamDB.getByIds<ROW>(table, missingIds, opt)
-      results.forEach(r => (resultMap[r.id!] = r))
+      results.forEach(r => (resultMap[r.id] = r))
 
       if (this.cfg.logDownstream) {
         this.cfg.logger?.log(
@@ -116,7 +116,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
 
     // return in right order
-    return ids.map(id => resultMap[id!]).filter(_isTruthy)
+    return ids.map(id => resultMap[id]).filter(_isTruthy)
   }
 
   override async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -148,7 +148,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async runQuery<ROW extends Partial<ObjectWithId>>(
+  override async runQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt: CacheDBSaveOptions<ROW> = {},
   ): Promise<RunQueryResult<ROW>> {
@@ -178,7 +178,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return { rows, ...queryResult }
   }
 
-  override async runQueryCount<ROW extends Partial<ObjectWithId>>(
+  override async runQueryCount<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt: CacheDBOptions = {},
   ): Promise<number> {
@@ -195,7 +195,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return count
   }
 
-  override streamQuery<ROW extends Partial<ObjectWithId>>(
+  override streamQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt: CacheDBStreamOptions = {},
   ): Readable {
@@ -234,7 +234,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return stream
   }
 
-  override async deleteByQuery<ROW extends Partial<ObjectWithId>>(
+  override async deleteByQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt: CacheDBOptions = {},
   ): Promise<number> {
@@ -266,7 +266,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return deletedIds
   }
 
-  override async updateByQuery<ROW extends Partial<ObjectWithId>>(
+  override async updateByQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
     opt: CacheDBOptions = {},

package/src/base.common.db.ts

@@ -20,31 +20,28 @@ export class BaseCommonDB implements CommonDB {
     throw new Error('getTables is not implemented')
   }
 
-  async getTableSchema<ROW extends Partial<ObjectWithId>>(
+  async getTableSchema<ROW extends ObjectWithId>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
     throw new Error('getTableSchema is not implemented')
   }
 
-  async createTable<ROW extends Partial<ObjectWithId>>(
+  async createTable<ROW extends ObjectWithId>(
     table: string,
     schema: JsonSchemaObject<ROW>,
   ): Promise<void> {
     // no-op
   }
 
-  async getByIds<ROW extends Partial<ObjectWithId>>(
-    table: string,
-    ids: ROW['id'][],
-  ): Promise<ROW[]> {
+  async getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][]): Promise<ROW[]> {
     throw new Error('getByIds is not implemented')
   }
 
-  async deleteByQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<number> {
+  async deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<number> {
     throw new Error('deleteByQuery is not implemented')
   }
 
-  async updateByQuery<ROW extends Partial<ObjectWithId>>(
+  async updateByQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
     opt?: CommonDBOptions,
@@ -52,11 +49,11 @@ export class BaseCommonDB implements CommonDB {
     throw new Error('updateByQuery is not implemented')
   }
 
-  async runQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<RunQueryResult<ROW>> {
+  async runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<RunQueryResult<ROW>> {
     throw new Error('runQuery is not implemented')
   }
 
-  async runQueryCount<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): Promise<number> {
+  async runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>): Promise<number> {
     throw new Error('runQueryCount is not implemented')
   }
 
@@ -68,7 +65,7 @@ export class BaseCommonDB implements CommonDB {
     throw new Error('saveBatch is not implemented')
   }
 
-  streamQuery<ROW extends Partial<ObjectWithId>>(q: DBQuery<ROW>): ReadableTyped<ROW> {
+  streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>): ReadableTyped<ROW> {
     throw new Error('streamQuery is not implemented')
   }
 

package/src/common.db.ts

@@ -31,15 +31,13 @@ export interface CommonDB {
    *
    * This is important for the code to rely on it, and it's verified by dbTest
    */
-  getTableSchema<ROW extends Partial<ObjectWithId>>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>>
+  getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>
 
   /**
    * Will do like `create table ...` for mysql.
    * Caution! dropIfExists defaults to false. If set to true - will actually DROP the table!
    */
-  createTable<ROW extends Partial<ObjectWithId>>(
+  createTable<ROW extends ObjectWithId>(
     table: string,
     schema: JsonSchemaObject<ROW>,
     opt?: CommonDBCreateOptions,
@@ -50,7 +48,7 @@ export interface CommonDB {
    * Order of items returned is not guaranteed to match order of ids.
    * (Such limitation exists because Datastore doesn't support it).
    */
-  getByIds<ROW extends Partial<ObjectWithId>>(
+  getByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     opt?: CommonDBOptions,
@@ -60,17 +58,14 @@ export interface CommonDB {
   /**
    * Order by 'id' is not supported by all implementations (for example, Datastore doesn't support it).
    */
-  runQuery<ROW extends Partial<ObjectWithId>>(
+  runQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>>
 
-  runQueryCount<ROW extends Partial<ObjectWithId>>(
-    q: DBQuery<ROW>,
-    opt?: CommonDBOptions,
-  ): Promise<number>
+  runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>
 
-  streamQuery<ROW extends Partial<ObjectWithId>>(
+  streamQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     opt?: CommonDBStreamOptions,
   ): ReadableTyped<ROW>
@@ -90,10 +85,7 @@ export interface CommonDB {
    * Returns number of deleted items.
    * Not supported by all implementations (e.g Datastore will always return same number as number of ids).
    */
-  deleteByQuery<ROW extends Partial<ObjectWithId>>(
-    q: DBQuery<ROW>,
-    opt?: CommonDBOptions,
-  ): Promise<number>
+  deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>
 
   /**
    * Applies patch to the rows returned by the query.
@@ -113,7 +105,7 @@ export interface CommonDB {
    *
    * Returns number of rows affected.
    */
-  updateByQuery<ROW extends Partial<ObjectWithId>>(
+  updateByQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
     opt?: CommonDBOptions,

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

@@ -61,9 +61,9 @@ export enum CommonDaoLogLevel {
 }
 
 export interface CommonDaoCfg<
-  BM extends Partial<ObjectWithId<ID>>,
-  DBM extends Partial<ObjectWithId<ID>> = BM,
-  ID extends string | number = NonNullable<BM['id']>,
+  BM extends ObjectWithId<ID>,
+  DBM extends ObjectWithId<ID> = BM,
+  ID extends string | number = BM['id'],
 > {
   db: CommonDB
   table: string

package/src/commondao/common.dao.ts

@@ -64,9 +64,9 @@ const isCI = !!process.env['CI']
  * BM = Backend model (optimized for API access)
  */
 export class CommonDao<
-  BM extends Partial<ObjectWithId<ID>>,
-  DBM extends Partial<ObjectWithId<ID>> = BM,
-  ID extends string | number = NonNullable<BM['id']>,
+  BM extends ObjectWithId<ID>,
+  DBM extends ObjectWithId<ID> = BM,
+  ID extends string | number = BM['id'],
 > {
   constructor(public cfg: CommonDaoCfg<BM, DBM, ID>) {
     this.cfg = {
@@ -486,7 +486,7 @@ export class CommonDao<
   async queryIds(q: DBQuery<DBM>, opt: CommonDaoOptions = {}): Promise<ID[]> {
     q.table = opt.table || q.table
     const { rows } = await this.cfg.db.runQuery(q.select(['id']), opt)
-    return rows.map(r => r.id!)
+    return rows.map(r => r.id)
   }
 
   streamQueryIds(q: DBQuery<DBM>, opt: CommonDaoStreamOptions = {}): ReadableTyped<ID> {
@@ -497,7 +497,7 @@ export class CommonDao<
       .streamQuery<DBM>(q.select(['id']), opt)
       .on('error', err => stream.emit('error', err))
       .pipe(
-        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id!, {
+        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
           errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
         }),
       )
@@ -519,7 +519,7 @@ export class CommonDao<
 
     await _pipeline([
       this.cfg.db.streamQuery<DBM>(q.select(['id']), opt),
-      transformMapSimple<DBM, ID>(objectWithId => objectWithId.id!),
+      transformMapSimple<DBM, ID>(objectWithId => objectWithId.id),
       transformTap(() => count++),
       transformMap<ID, void>(mapper, {
         ...opt,
@@ -845,7 +845,7 @@ export class CommonDao<
 
       await _pipeline([
         this.cfg.db.streamQuery<DBM>(q.select(['id']), opt),
-        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id!, {
+        transformMapSimple<DBM, ID>(objectWithId => objectWithId.id, {
           errorMode: ErrorMode.SUPPRESS,
         }),
         transformBuffer<string>({ batchSize }),
@@ -909,7 +909,7 @@ export class CommonDao<
 
     // optimization: no need to run full joi DBM validation, cause BM validation will be run
     // const dbm = this.anyToDBM(_dbm, opt)
-    let dbm: DBM = { ..._dbm, ...this.cfg.hooks!.parseNaturalId!(_dbm.id!) }
+    let dbm: DBM = { ..._dbm, ...this.cfg.hooks!.parseNaturalId!(_dbm.id) }
 
     if (opt.anonymize) {
       dbm = this.cfg.hooks!.anonymize!(dbm)
@@ -965,7 +965,7 @@ export class CommonDao<
     // this shouldn't be happening on load! but should on save!
     // this.assignIdCreatedUpdated(dbm, opt)
 
-    dbm = { ...dbm, ...this.cfg.hooks!.parseNaturalId!(dbm.id!) }
+    dbm = { ...dbm, ...this.cfg.hooks!.parseNaturalId!(dbm.id) }
 
     if (opt.anonymize) {
       dbm = this.cfg.hooks!.anonymize!(dbm)
@@ -988,7 +988,7 @@ export class CommonDao<
   validateAndConvert<IN, OUT = IN>(
     obj: Partial<IN>,
     schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | undefined,
-    modelType: DBModelType,
+    modelType?: DBModelType | string,
     opt: CommonDaoOptions = {},
   ): OUT {
     // `raw` option completely bypasses any processing

package/src/query/dbQuery.ts

@@ -235,9 +235,9 @@ export class DBQuery<ROW extends Partial<ObjectWithId> = AnyObjectWithId> {
  * DBQuery that has additional method to support Fluent API style.
  */
 export class RunnableDBQuery<
-  BM extends Partial<ObjectWithId<ID>>,
-  DBM extends Partial<ObjectWithId<ID>> = BM,
-  ID extends string | number = NonNullable<BM['id']>,
+  BM extends ObjectWithId<ID>,
+  DBM extends ObjectWithId<ID> = BM,
+  ID extends string | number = BM['id'],
 > extends DBQuery<DBM> {
   /**
    * Pass `table` to override table.