@naturalcycles/datastore-lib 3.16.1 → 3.16.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.16.2](https://github.com/NaturalCycles/datastore-lib/compare/v3.16.1...v3.16.2) (2021-10-17)
+
+
+### Bug Fixes
+
+* adapt to latest db-lib with typed queries ([21d31ea](https://github.com/NaturalCycles/datastore-lib/commit/21d31ea7343ca0b2590950c067f6ce472dc82501))
+
 ## [3.16.1](https://github.com/NaturalCycles/datastore-lib/compare/v3.16.0...v3.16.1) (2021-10-07)
 
 

package/dist/datastore.db.d.ts

@@ -28,7 +28,7 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     /**
      * Returns saved entities with generated id/updated/created (non-mutating!)
      */
-    saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], opt?: DatastoreDBSaveOptions): Promise<void>;
+    saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], opt?: DatastoreDBSaveOptions<ROW>): Promise<void>;
     deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: DatastoreDBOptions): Promise<number>;
     /**
      * Limitation: Datastore's delete returns void, so we always return all ids here as "deleted"

package/dist/datastore.model.d.ts

@@ -1,5 +1,6 @@
 import type { DatastoreOptions, Key, Transaction } from '@google-cloud/datastore';
 import { CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib';
+import { AnyObjectWithId, ObjectWithId } from '@naturalcycles/db-lib/src/db.model';
 export interface DatastorePayload<T = any> {
     key: Key;
     data: T;
@@ -76,7 +77,7 @@ export interface DatastoreDBStreamOptions extends DatastoreDBOptions {
 export interface DatastoreDBOptions extends CommonDBOptions {
     tx?: Transaction;
 }
-export interface DatastoreDBSaveOptions extends CommonDBSaveOptions {
+export interface DatastoreDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId> extends CommonDBSaveOptions<ROW> {
     tx?: Transaction;
 }
 export interface DatastoreStats {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"

package/src/datastore.db.ts

@@ -195,9 +195,11 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
   override async saveBatch<ROW extends ObjectWithId>(
     table: string,
     rows: ROW[],
-    opt: DatastoreDBSaveOptions = {},
+    opt: DatastoreDBSaveOptions<ROW> = {},
   ): Promise<void> {
-    const entities = rows.map(obj => this.toDatastoreEntity(table, obj, opt.excludeFromIndexes))
+    const entities = rows.map(obj =>
+      this.toDatastoreEntity(table, obj, opt.excludeFromIndexes as string[]),
+    )
 
     const save = pRetry(
       async (batch: DatastorePayload<ROW>[]) => {

package/src/datastore.model.ts

@@ -1,5 +1,6 @@
 import type { DatastoreOptions, Key, Transaction } from '@google-cloud/datastore'
 import { CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib'
+import { AnyObjectWithId, ObjectWithId } from '@naturalcycles/db-lib/src/db.model'
 
 export interface DatastorePayload<T = any> {
   key: Key
@@ -88,7 +89,8 @@ export interface DatastoreDBStreamOptions extends DatastoreDBOptions {
 export interface DatastoreDBOptions extends CommonDBOptions {
   tx?: Transaction
 }
-export interface DatastoreDBSaveOptions extends CommonDBSaveOptions {
+export interface DatastoreDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId>
+  extends CommonDBSaveOptions<ROW> {
   tx?: Transaction
 }
 

package/src/datastoreKeyValueDB.ts

@@ -9,7 +9,7 @@ interface KVObject {
   v: Buffer
 }
 
-const excludeFromIndexes = ['v']
+const excludeFromIndexes: (keyof KVObject)[] = ['v']
 
 export interface DatastoreKeyValueDBCfg extends DatastoreDBCfg {}
 

package/src/query.util.ts

@@ -19,18 +19,24 @@ export function dbQueryToDatastoreQuery<ROW extends ObjectWithId>(
 
   // filter
   // eslint-disable-next-line unicorn/no-array-reduce
-  q = dbQuery._filters.reduce((q, f) => q.filter(f.name, OP_MAP[f.op] || (f.op as any), f.val), q)
+  q = dbQuery._filters.reduce(
+    (q, f) => q.filter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val),
+    q,
+  )
 
   // limit
   q = q.limit(dbQuery._limitValue || 0)
 
   // order
   // eslint-disable-next-line unicorn/no-array-reduce
-  q = dbQuery._orders.reduce((q, ord) => q.order(ord.name, { descending: ord.descending }), q)
+  q = dbQuery._orders.reduce(
+    (q, ord) => q.order(ord.name as string, { descending: ord.descending }),
+    q,
+  )
 
   // select
   if (dbQuery._selectedFieldNames) {
-    const fields = dbQuery._selectedFieldNames.map(f => FNAME_MAP[f] || f)
+    const fields = (dbQuery._selectedFieldNames as string[]).map(f => FNAME_MAP[f] || f)
 
     // Datastore requires you to specify at least one column, so if empty array is passed - it'll include __key__ at least
     if (!fields.length) {