@naturalcycles/db-lib 8.49.1 → 8.50.0

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

@@ -1,5 +1,6 @@
 import { Readable } from 'node:stream'
 import {
+  _isTruthy,
   JsonSchemaObject,
   JsonSchemaRootObject,
   ObjectWithId,
@@ -52,13 +53,13 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return await this.cfg.downstreamDB.getTables()
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
+  override async getTableSchema<ROW extends Partial<ObjectWithId>>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
     return await this.cfg.downstreamDB.getTableSchema<ROW>(table)
   }
 
-  override async createTable<ROW extends ObjectWithId>(
+  override async createTable<ROW extends Partial<ObjectWithId>>(
     table: string,
     schema: JsonSchemaObject<ROW>,
     opt: CacheDBCreateOptions = {},
@@ -72,7 +73,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async getByIds<ROW extends ObjectWithId>(
+  override async getByIds<ROW extends Partial<ObjectWithId>>(
     table: string,
     ids: ROW['id'][],
     opt: CacheDBSaveOptions<ROW> = {},
@@ -83,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(
@@ -98,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(
@@ -115,7 +116,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
 
     // return in right order
-    return ids.map(id => resultMap[id]!).filter(Boolean)
+    return ids.map(id => resultMap[id!]).filter(_isTruthy)
   }
 
   override async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -147,7 +148,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async runQuery<ROW extends ObjectWithId>(
+  override async runQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt: CacheDBSaveOptions<ROW> = {},
   ): Promise<RunQueryResult<ROW>> {
@@ -177,7 +178,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return { rows, ...queryResult }
   }
 
-  override async runQueryCount<ROW extends ObjectWithId>(
+  override async runQueryCount<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt: CacheDBOptions = {},
   ): Promise<number> {
@@ -194,7 +195,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return count
   }
 
-  override streamQuery<ROW extends ObjectWithId>(
+  override streamQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt: CacheDBStreamOptions = {},
   ): Readable {
@@ -233,7 +234,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return stream
   }
 
-  override async deleteByQuery<ROW extends ObjectWithId>(
+  override async deleteByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt: CacheDBOptions = {},
   ): Promise<number> {
@@ -265,7 +266,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return deletedIds
   }
 
-  override async updateByQuery<ROW extends ObjectWithId>(
+  override async updateByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
     opt: CacheDBOptions = {},

package/src/adapter/file/file.db.model.ts

@@ -5,7 +5,7 @@ import type { DBQueryOrder } from '../../query/dbQuery'
 export interface FileDBPersistencePlugin {
   ping(): Promise<void>
   getTables(): Promise<string[]>
-  loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]>
+  loadFile<ROW extends Partial<ObjectWithId>>(table: string): Promise<ROW[]>
   saveFiles(ops: DBSaveBatchOperation<any>[]): Promise<void>
 }
 

package/src/adapter/file/file.db.ts

@@ -65,13 +65,13 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     return tables
   }
 
-  override async getByIds<ROW extends ObjectWithId>(
+  override async getByIds<ROW extends Partial<ObjectWithId>>(
     table: string,
     ids: ROW['id'][],
     _opt?: CommonDBOptions,
   ): Promise<ROW[]> {
     const byId = _by(await this.loadFile<ROW>(table), r => r.id)
-    return ids.map(id => byId[id]!).filter(Boolean)
+    return ids.map(id => byId[id!]!).filter(Boolean)
   }
 
   override async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -115,7 +115,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     await pMap(
       tables,
       async table => {
-        const rows = await this.loadFile(table)
+        const rows: ObjectWithId[] = await this.loadFile(table)
         data[table] = _by(rows, r => r.id)
       },
       { concurrency: 16 },
@@ -168,7 +168,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async runQuery<ROW extends ObjectWithId>(
+  override async runQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>> {
@@ -177,14 +177,14 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  override async runQueryCount<ROW extends ObjectWithId>(
+  override async runQueryCount<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<number> {
     return (await this.loadFile(q.table)).length
   }
 
-  override streamQuery<ROW extends ObjectWithId>(
+  override streamQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt?: CommonDBStreamOptions,
   ): ReadableTyped<ROW> {
@@ -198,7 +198,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     return readable
   }
 
-  override async deleteByQuery<ROW extends ObjectWithId>(
+  override async deleteByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<number> {
@@ -206,7 +206,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
 
     let deleted = 0
     queryInMemory(q, _stringMapValues(byId)).forEach(r => {
-      delete byId[r.id]
+      delete byId[r.id!]
       deleted++
     })
 
@@ -217,7 +217,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     return deleted
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
+  override async getTableSchema<ROW extends Partial<ObjectWithId>>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
     const rows = await this.loadFile(table)
@@ -228,7 +228,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
   }
 
   // wrapper, to handle logging
-  async loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]> {
+  async loadFile<ROW extends Partial<ObjectWithId>>(table: string): Promise<ROW[]> {
     const started = this.logStarted(`loadFile(${table})`)
     const rows = await this.cfg.plugin.loadFile<ROW>(table)
     this.logFinished(started, `loadFile(${table}) ${rows.length} row(s)`)
@@ -236,7 +236,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
   }
 
   // wrapper, to handle logging, sorting rows before saving
-  async saveFile<ROW extends ObjectWithId>(table: string, _rows: ROW[]): Promise<void> {
+  async saveFile<ROW extends Partial<ObjectWithId>>(table: string, _rows: ROW[]): Promise<void> {
     // if (!_rows.length) return // NO, it should be able to save file with 0 rows!
 
     // Sort the rows, if needed
@@ -257,7 +257,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     this.logFinished(started, op)
   }
 
-  private sortRows<ROW extends ObjectWithId>(rows: ROW[]): ROW[] {
+  private sortRows<ROW extends Partial<ObjectWithId>>(rows: ROW[]): ROW[] {
     rows = rows.map(r => _filterUndefinedValues(r))
 
     if (this.cfg.sortOnSave) {

package/src/adapter/file/inMemory.persistence.plugin.ts

@@ -14,7 +14,7 @@ export class InMemoryPersistencePlugin implements FileDBPersistencePlugin {
     return Object.keys(this.data)
   }
 
-  async loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]> {
+  async loadFile<ROW extends Partial<ObjectWithId>>(table: string): Promise<ROW[]> {
     return Object.values(this.data[table] || ({} as any))
   }
 

package/src/adapter/file/localFile.persistence.plugin.ts

@@ -46,7 +46,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
       .map(f => f.split('.ndjson')[0]!)
   }
 
-  async loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]> {
+  async loadFile<ROW extends Partial<ObjectWithId>>(table: string): Promise<ROW[]> {
     await fs.ensureDir(this.cfg.storagePath)
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`

package/src/adapter/file/noop.persistence.plugin.ts

@@ -9,7 +9,7 @@ export class NoopPersistencePlugin implements FileDBPersistencePlugin {
     return []
   }
 
-  async loadFile<ROW extends ObjectWithId>(_table: string): Promise<ROW[]> {
+  async loadFile<ROW extends Partial<ObjectWithId>>(_table: string): Promise<ROW[]> {
     return []
   }
 

package/src/adapter/inmemory/inMemory.db.ts

@@ -120,7 +120,7 @@ export class InMemoryDB implements CommonDB {
     return Object.keys(this.data).filter(t => t.startsWith(this.cfg.tablesPrefix))
   }
 
-  async getTableSchema<ROW extends ObjectWithId>(
+  async getTableSchema<ROW extends Partial<ObjectWithId>>(
     _table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
     const table = this.cfg.tablesPrefix + _table
@@ -130,7 +130,7 @@ export class InMemoryDB implements CommonDB {
     }
   }
 
-  async createTable<ROW extends ObjectWithId>(
+  async createTable<ROW extends Partial<ObjectWithId>>(
     _table: string,
     _schema: JsonSchemaObject<ROW>,
     opt: CommonDBCreateOptions = {},
@@ -143,14 +143,14 @@ export class InMemoryDB implements CommonDB {
     }
   }
 
-  async getByIds<ROW extends ObjectWithId>(
+  async getByIds<ROW extends Partial<ObjectWithId>>(
     _table: string,
     ids: ROW['id'][],
     _opt?: CommonDBOptions,
   ): Promise<ROW[]> {
     const table = this.cfg.tablesPrefix + _table
     this.data[table] ||= {}
-    return ids.map(id => this.data[table]![id] as ROW).filter(Boolean)
+    return ids.map(id => this.data[table]![id!] as ROW).filter(Boolean)
   }
 
   async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -184,7 +184,7 @@ export class InMemoryDB implements CommonDB {
     })
   }
 
-  async deleteByQuery<ROW extends ObjectWithId>(
+  async deleteByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<number> {
@@ -192,14 +192,14 @@ export class InMemoryDB implements CommonDB {
     this.data[table] ||= {}
     let count = 0
     queryInMemory(q, Object.values(this.data[table] || {}) as ROW[]).forEach(r => {
-      if (!this.data[table]![r.id]) return
-      delete this.data[table]![r.id]
+      if (!this.data[table]![r.id!]) return
+      delete this.data[table]![r.id!]
       count++
     })
     return count
   }
 
-  async updateByQuery<ROW extends ObjectWithId>(
+  async updateByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
   ): Promise<number> {
@@ -221,7 +221,7 @@ export class InMemoryDB implements CommonDB {
     return rows.length
   }
 
-  async runQuery<ROW extends ObjectWithId>(
+  async runQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>> {
@@ -229,7 +229,7 @@ export class InMemoryDB implements CommonDB {
     return { rows: queryInMemory(q, Object.values(this.data[table] || {}) as ROW[]) }
   }
 
-  async runQueryCount<ROW extends ObjectWithId>(
+  async runQueryCount<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): Promise<number> {
@@ -237,7 +237,7 @@ export class InMemoryDB implements CommonDB {
     return queryInMemory<any>(q, Object.values(this.data[table] || {})).length
   }
 
-  streamQuery<ROW extends ObjectWithId>(
+  streamQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     _opt?: CommonDBOptions,
   ): ReadableTyped<ROW> {

package/src/adapter/inmemory/queryInMemory.ts

@@ -18,7 +18,10 @@ const FILTER_FNS: Record<DBQueryFilterOperator, FilterFn> = {
 
 // Important: q.table is not used in this function, so tablesPrefix is not needed.
 // But should be careful here..
-export function queryInMemory<ROW extends ObjectWithId>(q: DBQuery<ROW>, rows: ROW[] = []): ROW[] {
+export function queryInMemory<ROW extends Partial<ObjectWithId>>(
+  q: DBQuery<ROW>,
+  rows: ROW[] = [],
+): ROW[] {
   // .filter
   // eslint-disable-next-line unicorn/no-array-reduce
   rows = q._filters.reduce((rows, filter) => {

package/src/base.common.db.ts

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

package/src/common.db.ts

@@ -31,13 +31,15 @@ export interface CommonDB {
    *
    * This is important for the code to rely on it, and it's verified by dbTest
    */
-  getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>
+  getTableSchema<ROW extends Partial<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 ObjectWithId>(
+  createTable<ROW extends Partial<ObjectWithId>>(
     table: string,
     schema: JsonSchemaObject<ROW>,
     opt?: CommonDBCreateOptions,
@@ -48,7 +50,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 ObjectWithId>(
+  getByIds<ROW extends Partial<ObjectWithId>>(
     table: string,
     ids: ROW['id'][],
     opt?: CommonDBOptions,
@@ -58,14 +60,17 @@ export interface CommonDB {
   /**
    * Order by 'id' is not supported by all implementations (for example, Datastore doesn't support it).
    */
-  runQuery<ROW extends ObjectWithId>(
+  runQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>>
 
-  runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>
+  runQueryCount<ROW extends Partial<ObjectWithId>>(
+    q: DBQuery<ROW>,
+    opt?: CommonDBOptions,
+  ): Promise<number>
 
-  streamQuery<ROW extends ObjectWithId>(
+  streamQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     opt?: CommonDBStreamOptions,
   ): ReadableTyped<ROW>
@@ -85,7 +90,10 @@ 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 ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBOptions): Promise<number>
+  deleteByQuery<ROW extends Partial<ObjectWithId>>(
+    q: DBQuery<ROW>,
+    opt?: CommonDBOptions,
+  ): Promise<number>
 
   /**
    * Applies patch to the rows returned by the query.
@@ -105,7 +113,7 @@ export interface CommonDB {
    *
    * Returns number of rows affected.
    */
-  updateByQuery<ROW extends ObjectWithId>(
+  updateByQuery<ROW extends Partial<ObjectWithId>>(
     q: DBQuery<ROW>,
     patch: DBPatch<ROW>,
     opt?: CommonDBOptions,

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

@@ -1,4 +1,4 @@
-import { CommonLogger, ErrorMode, ObjectWithId, Saved } from '@naturalcycles/js-lib'
+import { CommonLogger, ErrorMode, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   AjvSchema,
   AjvValidationError,
@@ -12,9 +12,8 @@ import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../
 
 export interface CommonDaoHooks<
   BM extends Partial<ObjectWithId<ID>>,
-  DBM extends ObjectWithId<ID>,
-  TM,
-  ID extends string | number,
+  DBM extends Partial<ObjectWithId<ID>> = BM,
+  ID extends string | number = NonNullable<BM['id']>,
 > {
   createRandomId(): ID
   /**
@@ -27,8 +26,10 @@ export interface CommonDaoHooks<
   beforeDBMValidate(dbm: Partial<DBM>): Partial<DBM>
   beforeDBMToBM(dbm: DBM): Partial<BM> | Promise<Partial<BM>>
   beforeBMToDBM(bm: BM): Partial<DBM> | Promise<Partial<DBM>>
-  beforeTMToBM(tm: TM): Partial<BM>
-  beforeBMToTM(bm: BM): Partial<TM>
+
+  /**
+   * Applicable to **read** operations, never to **save** operations.
+   */
   anonymize(dbm: DBM): DBM
 
   /**
@@ -61,9 +62,8 @@ export enum CommonDaoLogLevel {
 
 export interface CommonDaoCfg<
   BM extends Partial<ObjectWithId<ID>>,
-  DBM extends ObjectWithId<ID> = Saved<BM>,
-  TM = BM,
-  ID extends string | number = string,
+  DBM extends Partial<ObjectWithId<ID>> = BM,
+  ID extends string | number = NonNullable<BM['id']>,
 > {
   db: CommonDB
   table: string
@@ -73,7 +73,6 @@ export interface CommonDaoCfg<
    */
   dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM>
   bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM>
-  tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM>
 
   excludeFromIndexes?: (keyof DBM)[]
 
@@ -85,6 +84,8 @@ export interface CommonDaoCfg<
    * `delete*` and `patch` will throw.
    *
    * You can still override saveMethod, or set opt.allowMutability to allow deletion.
+   *
+   * todo: consider merging it with readOnly, as it's almost the same
    */
   immutable?: boolean
 
@@ -110,7 +111,7 @@ export interface CommonDaoCfg<
   logStarted?: boolean
 
   // Hooks are designed with inspiration from got/ky interface
-  hooks?: Partial<CommonDaoHooks<BM, DBM, TM, ID>>
+  hooks?: Partial<CommonDaoHooks<BM, DBM, ID>>
 
   /**
    * Defaults to 'string'
@@ -127,6 +128,7 @@ export interface CommonDaoCfg<
   /**
    * See the same option in CommonDB.
    * Defaults to false normally.
+   * "Generated" means "generated by the underlying DB" (e.g MySQL autoincrement).
    */
   assignGeneratedIds?: boolean
 
@@ -209,14 +211,6 @@ export interface CommonDaoOptions extends CommonDBOptions {
    */
   table?: string
 
-  /**
-   * If set - wraps the method in `pTimeout` with a timeout of given number of milliseconds.
-   * Currently, it is only used to debug an ongoing GCP infra issue.
-   *
-   * @experimental
-   */
-  timeout?: number
-
   /**
    * If passed - operation will not be performed immediately, but instead "added" to the transaction.
    * In the end - transaction needs to be committed (by calling `commit`).
@@ -232,7 +226,7 @@ export interface CommonDaoOptions extends CommonDBOptions {
 /**
  * All properties default to undefined.
  */
-export interface CommonDaoSaveOptions<DBM extends ObjectWithId>
+export interface CommonDaoSaveOptions<DBM extends Partial<ObjectWithId>>
   extends CommonDaoOptions,
     CommonDBSaveOptions<DBM> {
   /**