@naturalcycles/db-lib 8.16.1 → 8.19.0

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

@@ -49,10 +49,10 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return await this.cfg.downstreamDB.getTableSchema<ROW>(table)
   }
 
-  override async createTable(
+  override async createTable<ROW extends ObjectWithId>(
     table: string,
-    schema: JsonSchemaObject,
-    opt: CacheDBCreateOptions = {},
+    schema: JsonSchemaObject<ROW>,
+    opt: CacheDBCreateOptions<ROW> = {},
   ): Promise<void> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       await this.cfg.downstreamDB.createTable(table, schema, opt)
@@ -66,7 +66,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
   override async getByIds<ROW extends ObjectWithId>(
     table: string,
     ids: string[],
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<ROW[]> {
     const resultMap: Record<string, ROW> = {}
     const missingIds: string[] = []
@@ -109,10 +109,10 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return ids.map(id => resultMap[id]!).filter(Boolean)
   }
 
-  override async deleteByIds(
+  override async deleteByIds<ROW extends ObjectWithId>(
     table: string,
     ids: string[],
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<number> {
     let deletedIds = 0
 
@@ -139,7 +139,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
   override async saveBatch<ROW extends ObjectWithId>(
     table: string,
     rows: ROW[],
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<void> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       await this.cfg.downstreamDB.saveBatch(table, rows, opt)
@@ -167,7 +167,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
   override async runQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<RunQueryResult<ROW>> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       const { rows, ...queryResult } = await this.cfg.downstreamDB.runQuery(q, opt)
@@ -197,7 +197,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
   override async runQueryCount<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<number> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       return await this.cfg.downstreamDB.runQueryCount(q, opt)
@@ -214,7 +214,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
   override streamQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
-    opt: CacheDBStreamOptions = {},
+    opt: CacheDBStreamOptions<ROW> = {},
   ): Readable {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       const stream = this.cfg.downstreamDB.streamQuery<ROW>(q, opt)
@@ -253,7 +253,7 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
   override async deleteByQuery<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
-    opt: CacheDBOptions = {},
+    opt: CacheDBOptions<ROW> = {},
   ): Promise<number> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {
       const deletedIds = await this.cfg.downstreamDB.deleteByQuery(q, opt)

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

@@ -13,7 +13,13 @@ import {
 } from '@naturalcycles/js-lib'
 import { Debug, readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
-import { BaseCommonDB, DBSaveBatchOperation, ObjectWithId, queryInMemory } from '../..'
+import {
+  AnyObjectWithId,
+  BaseCommonDB,
+  DBSaveBatchOperation,
+  ObjectWithId,
+  queryInMemory,
+} from '../..'
 import { CommonDB } from '../../common.db'
 import {
   CommonDBOptions,
@@ -72,7 +78,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
   override async saveBatch<ROW extends ObjectWithId>(
     table: string,
     rows: ROW[],
-    _opt?: CommonDBSaveOptions,
+    _opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void> {
     if (!rows.length) return // save some api calls
 
@@ -98,7 +104,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
   /**
    * Implementation is optimized for loading/saving _whole files_.
    */
-  override async commitTransaction(tx: DBTransaction, _opt?: CommonDBSaveOptions): Promise<void> {
+  override async commitTransaction(tx: DBTransaction, _opt?: CommonDBOptions): Promise<void> {
     // data[table][id] => row
     const data: StringMap<StringMap<ObjectWithId>> = {}
 
@@ -131,7 +137,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
       return {
         type: 'saveBatch',
         table,
-        rows: this.sortRows(Object.values(data[table]!)),
+        rows: this.sortRows(Object.values(data[table]!) as AnyObjectWithId[]),
       }
     })
 
@@ -242,7 +248,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     this.logFinished(started, op)
   }
 
-  async saveFiles(ops: DBSaveBatchOperation[]): Promise<void> {
+  async saveFiles<ROW extends ObjectWithId>(ops: DBSaveBatchOperation<ROW>[]): Promise<void> {
     if (!ops.length) return
     const op =
       `saveFiles ${ops.length} op(s):\n` + ops.map(o => `${o.table} (${o.rows.length})`).join('\n')

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

@@ -122,9 +122,9 @@ export class InMemoryDB implements CommonDB {
     }
   }
 
-  async createTable(
+  async createTable<ROW extends ObjectWithId>(
     _table: string,
-    _schema: JsonSchemaObject,
+    _schema: JsonSchemaObject<ROW>,
     opt: CommonDBCreateOptions = {},
   ): Promise<void> {
     const table = this.cfg.tablesPrefix + _table
@@ -148,7 +148,7 @@ export class InMemoryDB implements CommonDB {
   async saveBatch<ROW extends ObjectWithId>(
     _table: string,
     rows: ROW[],
-    _opt?: CommonDBSaveOptions,
+    _opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void> {
     const table = this.cfg.tablesPrefix + _table
     this.data[table] = this.data[table] || {}
@@ -220,7 +220,7 @@ export class InMemoryDB implements CommonDB {
     return Readable.from(queryInMemory(q, Object.values(this.data[table] || {}) as ROW[]))
   }
 
-  async commitTransaction(tx: DBTransaction, opt?: CommonDBSaveOptions): Promise<void> {
+  async commitTransaction(tx: DBTransaction, opt?: CommonDBOptions): Promise<void> {
     for await (const op of tx.ops) {
       if (op.type === 'saveBatch') {
         await this.saveBatch(op.table, op.rows, opt)

package/src/base.common.db.ts

@@ -2,7 +2,7 @@ import { Readable } from 'stream'
 import { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from './common.db'
-import { CommonDBSaveOptions, ObjectWithId, RunQueryResult } from './db.model'
+import { CommonDBOptions, ObjectWithId, RunQueryResult } from './db.model'
 import { DBQuery } from './query/dbQuery'
 import { DBTransaction } from './transaction/dbTransaction'
 import { commitDBTransactionSimple } from './transaction/dbTransaction.util'
@@ -30,7 +30,10 @@ export class BaseCommonDB implements CommonDB {
     }
   }
 
-  async createTable(_table: string, _schema: JsonSchemaObject): Promise<void> {}
+  async createTable<ROW extends ObjectWithId>(
+    _table: string,
+    _schema: JsonSchemaObject<ROW>,
+  ): Promise<void> {}
 
   async deleteByIds(_table: string, _ids: string[]): Promise<number> {
     return 0
@@ -62,7 +65,7 @@ export class BaseCommonDB implements CommonDB {
    * Naive implementation.
    * To be extended.
    */
-  async commitTransaction(tx: DBTransaction, opt?: CommonDBSaveOptions): Promise<void> {
+  async commitTransaction(tx: DBTransaction, opt?: CommonDBOptions): Promise<void> {
     await commitDBTransactionSimple(this, tx, opt)
   }
 }

package/src/common.db.ts

@@ -37,7 +37,11 @@ export interface CommonDB {
    * Will do like `create table ...` for mysql.
    * Caution! dropIfExists defaults to false. If set to true - will actually DROP the table!
    */
-  createTable(table: string, schema: JsonSchemaObject, opt?: CommonDBCreateOptions): Promise<void>
+  createTable<ROW extends ObjectWithId>(
+    table: string,
+    schema: JsonSchemaObject<ROW>,
+    opt?: CommonDBCreateOptions,
+  ): Promise<void>
 
   // GET
   /**
@@ -70,7 +74,7 @@ export interface CommonDB {
   saveBatch<ROW extends ObjectWithId>(
     table: string,
     rows: ROW[],
-    opt?: CommonDBSaveOptions,
+    opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void>
 
   // DELETE
@@ -87,5 +91,5 @@ export interface CommonDB {
    * Should be implemented as a Transaction (best effort), which means that
    * either ALL or NONE of the operations should be applied.
    */
-  commitTransaction(tx: DBTransaction, opt?: CommonDBSaveOptions): Promise<void>
+  commitTransaction(tx: DBTransaction, opt?: CommonDBOptions): Promise<void>
 }

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

@@ -67,7 +67,7 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId>, DBM extends Obje
   bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM>
   tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM>
 
-  excludeFromIndexes?: string[]
+  excludeFromIndexes?: (keyof DBM)[]
 
   /**
    * @default to false
@@ -149,7 +149,9 @@ export interface CommonDaoOptions extends CommonDBOptions {
 /**
  * All properties default to undefined.
  */
-export interface CommonDaoSaveOptions extends CommonDaoOptions, CommonDBSaveOptions {
+export interface CommonDaoSaveOptions<DBM extends ObjectWithId>
+  extends CommonDaoOptions,
+    CommonDBSaveOptions<DBM> {
   /**
    * @default false
    *

package/src/commondao/common.dao.ts

@@ -9,6 +9,7 @@ import {
   _truncate,
   pMap,
   JsonSchemaRootObject,
+  Saved,
 } from '@naturalcycles/js-lib'
 import {
   AjvSchema,
@@ -28,7 +29,7 @@ import {
   _pipeline,
 } from '@naturalcycles/nodejs-lib'
 import { DBLibError } from '../cnst'
-import { DBModelType, ObjectWithId, RunQueryResult, Saved } from '../db.model'
+import { DBModelType, ObjectWithId, RunQueryResult } from '../db.model'
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery'
 import {
   CommonDaoCfg,
@@ -215,12 +216,12 @@ export class CommonDao<
     }
   }
 
-  async getBy(by: string, value: any, limit = 0, opt?: CommonDaoOptions): Promise<Saved<BM>[]> {
-    return await this.query().filter(by, '==', value).limit(limit).runQuery(opt)
+  async getBy(by: keyof DBM, value: any, limit = 0, opt?: CommonDaoOptions): Promise<Saved<BM>[]> {
+    return await this.query().filterEq(by, value).limit(limit).runQuery(opt)
   }
 
-  async getOneBy(by: string, value: any, opt?: CommonDaoOptions): Promise<Saved<BM> | null> {
-    const [bm] = await this.query().filter(by, '==', value).limit(1).runQuery(opt)
+  async getOneBy(by: keyof DBM, value: any, opt?: CommonDaoOptions): Promise<Saved<BM> | null> {
+    const [bm] = await this.query().filterEq(by, value).limit(1).runQuery(opt)
     return bm || null
   }
 
@@ -530,7 +531,7 @@ export class CommonDao<
   /**
    * Mutates with id, created, updated
    */
-  async save(bm: BM, opt: CommonDaoSaveOptions = {}): Promise<Saved<BM>> {
+  async save(bm: BM, opt: CommonDaoSaveOptions<DBM> = {}): Promise<Saved<BM>> {
     this.requireWriteAccess()
     const idWasGenerated = !bm.id
     this.assignIdCreatedUpdated(bm, opt) // mutates
@@ -571,7 +572,11 @@ export class CommonDao<
    *
    * Convenience method to replace 3 operations (loading+patching+saving) with one.
    */
-  async patch(id: string, patch: Partial<BM>, opt: CommonDaoSaveOptions = {}): Promise<Saved<BM>> {
+  async patch(
+    id: string,
+    patch: Partial<BM>,
+    opt: CommonDaoSaveOptions<DBM> = {},
+  ): Promise<Saved<BM>> {
     return await this.save(
       {
         ...(await this.getByIdOrCreate(id, patch, opt)),
@@ -581,7 +586,11 @@ export class CommonDao<
     )
   }
 
-  async patchAsDBM(id: string, patch: Partial<DBM>, opt: CommonDaoSaveOptions = {}): Promise<DBM> {
+  async patchAsDBM(
+    id: string,
+    patch: Partial<DBM>,
+    opt: CommonDaoSaveOptions<DBM> = {},
+  ): Promise<DBM> {
     const dbm =
       (await this.getByIdAsDBM(id, opt)) ||
       (this.create({ ...patch, id } as Partial<BM>, opt) as any as DBM)
@@ -595,7 +604,7 @@ export class CommonDao<
     )
   }
 
-  async saveAsDBM(dbm: DBM, opt: CommonDaoSaveOptions = {}): Promise<DBM> {
+  async saveAsDBM(dbm: DBM, opt: CommonDaoSaveOptions<DBM> = {}): Promise<DBM> {
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
 
@@ -617,7 +626,7 @@ export class CommonDao<
     return dbm
   }
 
-  async saveBatch(bms: BM[], opt: CommonDaoSaveOptions = {}): Promise<Saved<BM>[]> {
+  async saveBatch(bms: BM[], opt: CommonDaoSaveOptions<DBM> = {}): Promise<Saved<BM>[]> {
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
     bms.forEach(bm => this.assignIdCreatedUpdated(bm, opt))
@@ -642,7 +651,7 @@ export class CommonDao<
     return bms as any[]
   }
 
-  async saveBatchAsDBM(dbms: DBM[], opt: CommonDaoSaveOptions = {}): Promise<DBM[]> {
+  async saveBatchAsDBM(dbms: DBM[], opt: CommonDaoSaveOptions<DBM> = {}): Promise<DBM[]> {
     this.requireWriteAccess()
     const table = opt.table || this.cfg.table
     if (!opt.raw) {
@@ -724,7 +733,8 @@ export class CommonDao<
     const bm = await this.cfg.hooks!.beforeDBMToBM!(dbm)
 
     // Validate/convert BM
-    return await this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
+    // eslint-disable-next-line @typescript-eslint/return-await
+    return this.validateAndConvert(bm, this.cfg.bmSchema, DBModelType.BM, opt)
   }
 
   async dbmsToBM(dbms: DBM[], opt: CommonDaoOptions = {}): Promise<Saved<BM>[]> {
@@ -752,7 +762,8 @@ export class CommonDao<
     const dbm = { ...(await this.cfg.hooks!.beforeBMToDBM!(bm)) }
 
     // Validate/convert DBM
-    return await this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
+    // eslint-disable-next-line @typescript-eslint/return-await
+    return this.validateAndConvert(dbm, this.cfg.dbmSchema, DBModelType.DBM, opt)
   }
 
   async bmsToDBM(bms: BM[], opt: CommonDaoOptions = {}): Promise<DBM[]> {

package/src/db.model.ts

@@ -1,5 +1,4 @@
-import type { Merge } from '@naturalcycles/js-lib'
-import { objectSchema, stringSchema, unixTimestampSchema } from '@naturalcycles/nodejs-lib'
+import { AnyObject } from '@naturalcycles/js-lib'
 import { CommonDB } from './common.db'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -8,8 +7,9 @@ export interface CommonDBOptions {}
 /**
  * All properties default to undefined.
  */
-export interface CommonDBSaveOptions extends CommonDBOptions {
-  excludeFromIndexes?: string[]
+export interface CommonDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId>
+  extends CommonDBOptions {
+  excludeFromIndexes?: (keyof ROW)[]
 }
 
 export type CommonDBStreamOptions = CommonDBOptions
@@ -29,7 +29,7 @@ export interface RunQueryResult<T> {
 
 export type DBOperation = DBSaveBatchOperation | DBDeleteByIdsOperation
 
-export interface DBSaveBatchOperation<ROW extends ObjectWithId = any> {
+export interface DBSaveBatchOperation<ROW extends ObjectWithId = AnyObjectWithId> {
   type: 'saveBatch'
   table: string
   rows: ROW[]
@@ -61,46 +61,11 @@ export interface CreatedUpdatedId extends CreatedUpdated {
   id: string
 }
 
-export interface CreatedUpdatedVer {
-  created: number
-  updated: number
-  _ver?: number
-}
-
 export interface ObjectWithId {
   id: string
 }
 
-export interface BaseDBEntity {
-  id?: string
-  created?: number
-  updated?: number
-  // _ver?: number
-}
-
-export interface SavedDBEntity {
-  id: string
-  created: number
-  updated: number
-  // _ver?: number
-}
-
-export type Saved<E> = Merge<E, SavedDBEntity>
-export type Unsaved<E> = Merge<E, BaseDBEntity>
-
-export const baseDBEntitySchema = objectSchema<BaseDBEntity>({
-  id: stringSchema.optional(),
-  created: unixTimestampSchema.optional(),
-  updated: unixTimestampSchema.optional(),
-  // _ver: verSchema.optional(),
-})
-
-export const savedDBEntitySchema = objectSchema<SavedDBEntity>({
-  id: stringSchema,
-  created: unixTimestampSchema,
-  updated: unixTimestampSchema,
-  // _ver: verSchema.optional(),
-})
+export interface AnyObjectWithId extends AnyObject, ObjectWithId {}
 
 /**
  * Interface for a module (lib) that implements CommonDB.

package/src/index.ts

@@ -24,8 +24,7 @@ import {
   CommonDaoStreamOptions,
 } from './commondao/common.dao.model'
 import {
-  BaseDBEntity,
-  baseDBEntitySchema,
+  AnyObjectWithId,
   CommonDBAdapter,
   CommonDBCreateOptions,
   CommonDBOptions,
@@ -33,7 +32,6 @@ import {
   CommonDBStreamOptions,
   CreatedUpdated,
   CreatedUpdatedId,
-  CreatedUpdatedVer,
   DBDeleteByIdsOperation,
   DBModelType,
   DBOperation,
@@ -41,10 +39,6 @@ import {
   DBSaveBatchOperation,
   ObjectWithId,
   RunQueryResult,
-  Saved,
-  SavedDBEntity,
-  savedDBEntitySchema,
-  Unsaved,
 } from './db.model'
 import { getDB } from './getDB'
 import { CommonKeyValueDao, CommonKeyValueDaoCfg } from './kv/commonKeyValueDao'
@@ -87,12 +81,8 @@ export type {
   RunQueryResult,
   CreatedUpdated,
   CreatedUpdatedId,
-  CreatedUpdatedVer,
+  AnyObjectWithId,
   ObjectWithId,
-  BaseDBEntity,
-  SavedDBEntity,
-  Saved,
-  Unsaved,
   CommonDaoCfg,
   CommonDaoCreateIdHook,
   CommonDaoParseNaturalIdHook,
@@ -124,8 +114,6 @@ export {
   CommonDaoLogLevel,
   DBRelation,
   DBModelType,
-  baseDBEntitySchema,
-  savedDBEntitySchema,
   CommonDao,
   createdUpdatedFields,
   createdUpdatedIdFields,

package/src/pipeline/dbPipelineRestore.ts

@@ -6,6 +6,7 @@ import {
   _hb,
   _mapValues,
   _passthroughMapper,
+  SavedDBEntity,
 } from '@naturalcycles/js-lib'
 import {
   NDJsonStats,
@@ -26,7 +27,7 @@ import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/dis
 import { dayjs } from '@naturalcycles/time-lib'
 import * as fs from 'fs-extra'
 import { CommonDB } from '../common.db'
-import { CommonDBSaveOptions, SavedDBEntity } from '../index'
+import { CommonDBSaveOptions } from '../index'
 
 export interface DBPipelineRestoreOptions extends TransformLogProgressOptions {
   /**

package/src/query/dbQuery.ts

@@ -1,8 +1,8 @@
-import { AsyncMapper, _truncate } from '@naturalcycles/js-lib'
+import { AsyncMapper, _truncate, Saved } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { CommonDaoOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from '..'
 import { CommonDao } from '../commondao/common.dao'
-import { ObjectWithId, RunQueryResult, Saved } from '../db.model'
+import { AnyObjectWithId, ObjectWithId, RunQueryResult } from '../db.model'
 
 /**
  * Modeled after Firestore operators (WhereFilterOp type)
@@ -46,29 +46,17 @@ export const dbQueryFilterOperatorValues = [
   'array-contains-any',
 ]
 
-export interface DBQueryFilter {
-  name: string
+export interface DBQueryFilter<ROW extends ObjectWithId = AnyObjectWithId> {
+  name: keyof ROW
   op: DBQueryFilterOperator
   val: any
 }
 
-export interface DBQueryOrder {
-  name: string
+export interface DBQueryOrder<ROW extends ObjectWithId = AnyObjectWithId> {
+  name: keyof ROW
   descending?: boolean
 }
 
-// export interface DBQueryData {
-//   _filters: DBQueryFilter[]
-//   _limitValue: number
-//   _orders: DBQueryOrder[]
-//
-//   /**
-//    * If defined - only those fields will be selected.
-//    * In undefined - all fields (*) will be returned.
-//    */
-//   _selectedFieldNames?: string[]
-// }
-
 /**
  * Lowest Common Denominator Query object.
  * To be executed by CommonDao / CommonDB.
@@ -79,26 +67,26 @@ export interface DBQueryOrder {
  *
  * <DBM> is the type of **queried** object (so e.g `key of DBM` can be used), not **returned** object.
  */
-export class DBQuery<ROW extends ObjectWithId> {
+export class DBQuery<ROW extends ObjectWithId = AnyObjectWithId> {
   constructor(public table: string) {}
 
   /**
    * Convenience method.
    */
-  static create<ROW extends ObjectWithId = any>(table: string): DBQuery<ROW> {
+  static create<ROW extends ObjectWithId = AnyObjectWithId>(table: string): DBQuery<ROW> {
     return new DBQuery(table)
   }
 
-  static fromPlainObject<ROW extends ObjectWithId = any>(
+  static fromPlainObject<ROW extends ObjectWithId = AnyObjectWithId>(
     obj: Partial<DBQuery<ROW>> & { table: string },
   ): DBQuery<ROW> {
     return Object.assign(new DBQuery<ROW>(obj.table), obj)
   }
 
-  _filters: DBQueryFilter[] = []
+  _filters: DBQueryFilter<ROW>[] = []
   _limitValue = 0 // 0 means "no limit"
   _offsetValue = 0 // 0 means "no offset"
-  _orders: DBQueryOrder[] = []
+  _orders: DBQueryOrder<ROW>[] = []
 
   _startCursor?: string
   _endCursor?: string
@@ -107,14 +95,14 @@ export class DBQuery<ROW extends ObjectWithId> {
    * If defined - only those fields will be selected.
    * In undefined - all fields (*) will be returned.
    */
-  _selectedFieldNames?: string[]
+  _selectedFieldNames?: (keyof ROW)[]
 
-  filter(name: string, op: DBQueryFilterOperator, val: any): this {
+  filter(name: keyof ROW, op: DBQueryFilterOperator, val: any): this {
     this._filters.push({ name, op, val })
     return this
   }
 
-  filterEq(name: string, val: any): this {
+  filterEq(name: keyof ROW, val: any): this {
     this._filters.push({ name, op: '==', val })
     return this
   }
@@ -129,7 +117,7 @@ export class DBQuery<ROW extends ObjectWithId> {
     return this
   }
 
-  order(name: string, descending?: boolean): this {
+  order(name: keyof ROW, descending?: boolean): this {
     this._orders.push({
       name,
       descending,
@@ -137,7 +125,7 @@ export class DBQuery<ROW extends ObjectWithId> {
     return this
   }
 
-  select(fieldNames: string[]): this {
+  select(fieldNames: (keyof ROW)[]): this {
     this._selectedFieldNames = fieldNames
     return this
   }

package/src/testing/test.model.ts

@@ -1,12 +1,13 @@
-import { jsonSchema, JsonSchemaObject, _range } from '@naturalcycles/js-lib'
+import { jsonSchema, JsonSchemaObject, _range, BaseDBEntity, Saved } from '@naturalcycles/js-lib'
 import {
+  baseDBEntitySchema,
   binarySchema,
   booleanSchema,
   numberSchema,
   objectSchema,
+  savedDBEntitySchema,
   stringSchema,
 } from '@naturalcycles/nodejs-lib'
-import { BaseDBEntity, baseDBEntitySchema, Saved, savedDBEntitySchema } from '../db.model'
 
 const MOCK_TS_2018_06_21 = 1529539200
 

package/src/timeseries/commonTimeSeriesDao.ts

@@ -5,6 +5,7 @@ import {
   CommonTimeSeriesDaoCfg,
   TimeSeriesDataPoint,
   TimeSeriesQuery,
+  TimeSeriesRow,
   TimeSeriesSaveBatchOp,
 } from './timeSeries.model'
 
@@ -84,7 +85,7 @@ export class CommonTimeSeriesDao {
     if (q.fromIncl) dbq.filter('ts', '>=', q.fromIncl)
     if (q.toExcl) dbq.filter('ts', '<', q.toExcl)
 
-    const { rows } = await this.cfg.db.runQuery(dbq)
+    const rows = (await this.cfg.db.runQuery(dbq)).rows as any as TimeSeriesRow[]
 
     // todo: query from aggregated tables when step is above 'hour'
 

package/src/transaction/dbTransaction.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '../common.db'
-import type { CommonDBSaveOptions, DBOperation, ObjectWithId } from '../db.model'
+import type { AnyObjectWithId, CommonDBSaveOptions, DBOperation, ObjectWithId } from '../db.model'
 
 /**
  * Convenience class that stores the list of DBOperations and provides a fluent API to add them.
@@ -7,7 +7,7 @@ import type { CommonDBSaveOptions, DBOperation, ObjectWithId } from '../db.model
 export class DBTransaction {
   public ops: DBOperation[] = []
 
-  saveBatch<ROW extends ObjectWithId = any>(table: string, rows: ROW[]): this {
+  saveBatch<ROW extends ObjectWithId = AnyObjectWithId>(table: string, rows: ROW[]): this {
     this.ops.push({
       type: 'saveBatch',
       table,
@@ -35,7 +35,7 @@ export class RunnableDBTransaction extends DBTransaction {
     super()
   }
 
-  async commit(opt?: CommonDBSaveOptions): Promise<void> {
+  async commit<ROW extends ObjectWithId>(opt?: CommonDBSaveOptions<ROW>): Promise<void> {
     await this.db.commitTransaction(this, opt)
   }
 }