@naturalcycles/datastore-lib 4.8.1 → 4.10.0

package/dist/DatastoreStreamReadable.js

@@ -107,7 +107,9 @@ export class DatastoreStreamReadable extends Readable {
         this.endCursor = info.endCursor;
         this.running = false; // ready to take more _reads
         this.lastQueryDone = Date.now();
-        rows.forEach(row => this.push(row));
+        for (const row of rows) {
+            this.push(row);
+        }
         if (!info.endCursor ||
             info.moreResults === 'NO_MORE_RESULTS' ||
             (this.originalLimit && this.rowsRetrieved >= this.originalLimit)) {

package/dist/datastore.db.js

@@ -170,7 +170,7 @@ export class DatastoreDB extends BaseCommonDB {
     }
     async runQueryCount(dbQuery, opt = {}) {
         const ds = await this.ds();
-        const q = dbQueryToDatastoreQuery(dbQuery.select([]), ds.createQuery(dbQuery.table), await this.getPropertyFilter());
+        const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table), await this.getPropertyFilter());
         const aq = ds.createAggregationQuery(q).count('count');
         const dsOpt = this.getRunQueryOptions(opt);
         const [entities] = await ds.runAggregationQuery(aq, dsOpt);
@@ -331,15 +331,14 @@ export class DatastoreDB extends BaseCommonDB {
         const [stats] = await ds.runQuery(q);
         return stats;
     }
-    mapId(o, preserveKey = false) {
+    mapId(o) {
         if (!o)
             return o;
         const r = {
             ...o,
             id: this.getKey(this.getDsKey(o)),
         };
-        if (!preserveKey)
-            delete r[this.KEY];
+        delete r[this.KEY];
         return r;
     }
     // if key field exists on entity, it will be used as key (prevent to duplication of numeric keyed entities)

package/dist/datastoreKeyValueDB.d.ts

@@ -8,10 +8,7 @@ export declare class DatastoreKeyValueDB implements CommonKeyValueDB {
     cfg: DatastoreKeyValueDBCfg;
     constructor(cfg: DatastoreKeyValueDBCfg);
     db: DatastoreDB;
-    support: {
-        increment: boolean;
-        count?: boolean;
-    };
+    support: any;
     ping(): Promise<void>;
     createTable(): Promise<void>;
     getByIds(table: string, ids: string[]): Promise<KeyValueDBTuple[]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.8.1",
+  "version": "4.10.0",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",

package/src/DatastoreStreamReadable.ts

@@ -154,7 +154,9 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
     this.running = false // ready to take more _reads
     this.lastQueryDone = Date.now()
 
-    rows.forEach(row => this.push(row))
+    for (const row of rows) {
+      this.push(row)
+    }
 
     if (
       !info.endCursor ||

package/src/datastore.db.ts

@@ -264,7 +264,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
   ): Promise<number> {
     const ds = await this.ds()
     const q = dbQueryToDatastoreQuery(
-      dbQuery.select([]),
+      dbQuery,
       ds.createQuery(dbQuery.table),
       await this.getPropertyFilter(),
     )
@@ -395,7 +395,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       await this.getPropertyFilter(),
     )
     const dsOpt = this.getRunQueryOptions(opt)
-    const { rows } = await this.runDatastoreQuery<ROW>(datastoreQuery, dsOpt)
+    const { rows } = await this.runDatastoreQuery<ObjectWithId>(datastoreQuery, dsOpt)
     return await this.deleteByIds(
       q.table,
       rows.map(obj => obj.id),
@@ -504,13 +504,13 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     return stats
   }
 
-  private mapId<T extends ObjectWithId>(o: any, preserveKey = false): T {
+  private mapId<T extends ObjectWithId>(o: any): T {
     if (!o) return o
     const r = {
       ...o,
       id: this.getKey(this.getDsKey(o)!),
     }
-    if (!preserveKey) delete r[this.KEY]
+    delete r[this.KEY]
     return r
   }