@naturalcycles/datastore-lib 3.25.1 → 3.25.3

package/dist/datastore.db.d.ts

@@ -1,6 +1,6 @@
 import type { Datastore, Key, Query } from '@google-cloud/datastore';
 import { BaseCommonDB, CommonDB, DBQuery, DBTransaction, RunQueryResult } from '@naturalcycles/db-lib';
-import { ObjectWithId, JsonSchemaRootObject, CommonLogger } from '@naturalcycles/js-lib';
+import { ObjectWithId, JsonSchemaObject, JsonSchemaRootObject, CommonLogger } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DatastoreDBCfg, DatastoreDBOptions, DatastoreDBSaveOptions, DatastoreDBStreamOptions, DatastorePayload, DatastorePropertyStats, DatastoreStats } from './datastore.model';
 /**
@@ -55,6 +55,7 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     key(kind: string, id: string | number): Key;
     getDsKey(o: any): Key | undefined;
     getKey(key: Key): string | undefined;
+    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchemaObject<ROW>): Promise<void>;
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
     private getPRetryOptions;

package/dist/datastore.db.js

@@ -106,6 +106,13 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         return q.kinds[0];
     }
     async runQuery(dbQuery, _opt) {
+        const idFilter = dbQuery._filters.find(f => f.name === 'id');
+        if (idFilter) {
+            const ids = idFilter.op === '==' ? [idFilter.val] : idFilter.val;
+            return {
+                rows: await this.getByIds(dbQuery.table, ids),
+            };
+        }
         const q = (0, query_util_1.dbQueryToDatastoreQuery)(dbQuery, this.ds().createQuery(dbQuery.table));
         const qr = await this.runDatastoreQuery(q);
         // Special case when projection query didn't specify 'id'
@@ -175,6 +182,11 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         }
     }
     async deleteByQuery(q, opt) {
+        const idFilter = q._filters.find(f => f.name === 'id');
+        if (idFilter) {
+            const ids = idFilter.op === '==' ? [idFilter.val] : idFilter.val;
+            return await this.deleteByIds(q.table, ids, opt);
+        }
         const datastoreQuery = (0, query_util_1.dbQueryToDatastoreQuery)(q.select([]), this.ds().createQuery(q.table));
         const { rows } = await this.runDatastoreQuery(datastoreQuery);
         return await this.deleteByIds(q.table, rows.map(obj => obj.id), opt);
@@ -277,6 +289,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         const id = key.id || key.name;
         return id?.toString();
     }
+    async createTable(_table, _schema) { }
     async getTables() {
         const statsArray = await this.getAllStats();
         // Filter out tables starting with `_` by default (internal Datastore tables)

package/package.json

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

package/src/datastore.db.ts

@@ -118,7 +118,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     await this.getAllStats()
   }
 
-  override async getByIds<ROW extends ObjectWithId>(
+  async getByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     _opt?: DatastoreDBOptions,
@@ -176,6 +176,15 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     dbQuery: DBQuery<ROW>,
     _opt?: DatastoreDBOptions,
   ): Promise<RunQueryResult<ROW>> {
+    const idFilter = dbQuery._filters.find(f => f.name === 'id')
+    if (idFilter) {
+      const ids: string[] = idFilter.op === '==' ? [idFilter.val] : idFilter.val
+
+      return {
+        rows: await this.getByIds(dbQuery.table, ids),
+      }
+    }
+
     const q = dbQueryToDatastoreQuery(dbQuery, this.ds().createQuery(dbQuery.table))
     const qr = await this.runDatastoreQuery<ROW>(q)
 
@@ -289,6 +298,12 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     q: DBQuery<ROW>,
     opt?: DatastoreDBOptions,
   ): Promise<number> {
+    const idFilter = q._filters.find(f => f.name === 'id')
+    if (idFilter) {
+      const ids: string[] = idFilter.op === '==' ? [idFilter.val] : idFilter.val
+      return await this.deleteByIds(q.table, ids, opt)
+    }
+
     const datastoreQuery = dbQueryToDatastoreQuery(q.select([]), this.ds().createQuery(q.table))
     const { rows } = await this.runDatastoreQuery<ROW>(datastoreQuery)
     return await this.deleteByIds(
@@ -302,7 +317,7 @@ 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<ROW extends ObjectWithId>(
+  async deleteByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     opt: DatastoreDBOptions = {},
@@ -418,6 +433,11 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     return id?.toString()
   }
 
+  override async createTable<ROW extends ObjectWithId>(
+    _table: string,
+    _schema: JsonSchemaObject<ROW>,
+  ): Promise<void> {}
+
   override async getTables(): Promise<string[]> {
     const statsArray = await this.getAllStats()
     // Filter out tables starting with `_` by default (internal Datastore tables)

package/src/datastoreKeyValueDB.ts

@@ -45,7 +45,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
   }
 
   streamIds(table: string, limit?: number): ReadableTyped<string> {
-    const q = DBQuery.create(table)
+    const q = DBQuery.create<KVObject>(table)
       .select(['id'])
       .limit(limit || 0)
 
@@ -63,7 +63,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
 
   streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
     // `select v` doesn't work for some reason
-    const q = DBQuery.create(table).limit(limit || 0)
+    const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
     const stream: ReadableTyped<string> = this.db
       .streamQuery<KVObject>(q)
@@ -78,7 +78,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
   }
 
   streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
-    const q = DBQuery.create(table).limit(limit || 0)
+    const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
     const stream: ReadableTyped<string> = this.db
       .streamQuery<KVObject>(q)