fix: adapt to latest db-lib changes

.github/workflows/release.yml

@@ -10,11 +10,11 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     env: { NODE_OPTIONS: '--max-old-space-size=3200' }
     steps:
-      - { uses: actions/checkout@v2, with: { persist-credentials: true } }
-      - { uses: actions/setup-node@v2, with: { node-version: 16, cache: 'yarn' } }
+      - { uses: actions/checkout@v3, with: { persist-credentials: true } }
+      - { uses: actions/setup-node@v3, with: { node-version: 16, cache: 'yarn' } }
 
       # Cache for npm/npx in ~/.npm
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.npm
           key: npm-v1-${{ runner.os }}

src/datastore.db.ts

@@ -111,7 +111,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
 
   override async getByIds<ROW extends ObjectWithId>(
     table: string,
-    ids: string[],
+    ids: ROW['id'][],
     _opt?: DatastoreDBOptions,
   ): Promise<ROW[]> {
     if (!ids.length) return []
@@ -302,9 +302,9 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
    * Limitation: Datastore's delete returns void, so we always return all ids here as "deleted"
    * regardless if they were actually deleted or not.
    */
-  override async deleteByIds(
+  override async deleteByIds<ROW extends ObjectWithId>(
     table: string,
-    ids: string[],
+    ids: ROW['id'][],
     opt: DatastoreDBOptions = {},
   ): Promise<number> {
     const keys = ids.map(id => this.key(table, id))
@@ -386,7 +386,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
   // if key field exists on entity, it will be used as key (prevent to duplication of numeric keyed entities)
   toDatastoreEntity<T = any>(
     kind: string,
-    o: T & { id?: string },
+    o: T & { id?: string | number },
     excludeFromIndexes: string[] = [],
   ): DatastorePayload<T> {
     const key = this.getDsKey(o) || this.key(kind, o.id!)
@@ -401,7 +401,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  key(kind: string, id: string): Key {
+  key(kind: string, id: string | number): Key {
     _assert(id, `Cannot save "${kind}" entity without "id"`)
     return this.ds().key([kind, String(id)])
   }

src/datastoreKeyValueDB.ts

@@ -50,7 +50,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
       .limit(limit || 0)
 
     return this.db.streamQuery<KVObject>(q).pipe(
-      transformMapSimple<ObjectWithId, string>(objectWithId => objectWithId.id, {
+      transformMapSimple<ObjectWithId<string>, string>(objectWithId => objectWithId.id, {
         errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
       }),
     )

src/test/datastore.manual.test.ts

@@ -34,7 +34,7 @@ const features: CommonDBImplementationFeatures = {
 }
 const quirks: CommonDBImplementationQuirks = {
   // 2021-10-07: fails when set to 100, bumped up to 300
-  eventualConsistencyDelay: 300,
+  // eventualConsistencyDelay: 300,
 }
 
 describe('runCommonDBTest', () => runCommonDBTest(datastoreDB, features, quirks))