@naturalcycles/datastore-lib 3.25.2 → 3.25.4

package/dist/datastore.db.js

@@ -106,9 +106,11 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         return q.kinds[0];
     }
     async runQuery(dbQuery, _opt) {
-        if (dbQuery._ids?.length) {
+        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, dbQuery._ids),
+                rows: await this.getByIds(dbQuery.table, ids),
             };
         }
         const q = (0, query_util_1.dbQueryToDatastoreQuery)(dbQuery, this.ds().createQuery(dbQuery.table));
@@ -180,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);

package/package.json

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

package/src/datastore.db.ts

@@ -176,9 +176,12 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     dbQuery: DBQuery<ROW>,
     _opt?: DatastoreDBOptions,
   ): Promise<RunQueryResult<ROW>> {
-    if (dbQuery._ids?.length) {
+    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, dbQuery._ids),
+        rows: await this.getByIds(dbQuery.table, ids),
       }
     }
 
@@ -295,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(
@@ -308,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 = {},