@naturalcycles/datastore-lib 4.9.0 → 4.11.0

package/dist/datastore.db.js

@@ -128,7 +128,7 @@ export class DatastoreDB extends BaseCommonDB {
                 catch (err) {
                     if (err instanceof TimeoutError) {
                         _errorDataAppend(err, {
-                            fingerprint: [DATASTORE_TIMEOUT],
+                            fingerprint: DATASTORE_TIMEOUT,
                         });
                     }
                     throw err;
@@ -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);
@@ -232,7 +232,7 @@ export class DatastoreDB extends BaseCommonDB {
         catch (err) {
             if (err instanceof TimeoutError) {
                 _errorDataAppend(err, {
-                    fingerprint: [DATASTORE_TIMEOUT],
+                    fingerprint: DATASTORE_TIMEOUT,
                 });
             }
             // console.log(`datastore.save ${kind}`, { obj, entity })
@@ -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)
@@ -450,7 +449,7 @@ export class DatastoreDB extends BaseCommonDB {
             logger: this.cfg.logger,
             // not appending fingerprint here, otherwise it would just group all kinds of errors, not just Timeout errors
             // errorData: {
-            //   fingerprint: [DATASTORE_TIMEOUT],
+            //   fingerprint: DATASTORE_TIMEOUT,
             // },
         };
     }

package/package.json

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

package/src/datastore.db.ts

@@ -199,7 +199,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
         } catch (err) {
           if (err instanceof TimeoutError) {
             _errorDataAppend(err, {
-              fingerprint: [DATASTORE_TIMEOUT],
+              fingerprint: DATASTORE_TIMEOUT,
             })
           }
           throw err
@@ -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(),
     )
@@ -364,7 +364,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     } catch (err) {
       if (err instanceof TimeoutError) {
         _errorDataAppend(err, {
-          fingerprint: [DATASTORE_TIMEOUT],
+          fingerprint: DATASTORE_TIMEOUT,
         })
       }
 
@@ -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
   }
 
@@ -638,7 +638,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       logger: this.cfg.logger,
       // not appending fingerprint here, otherwise it would just group all kinds of errors, not just Timeout errors
       // errorData: {
-      //   fingerprint: [DATASTORE_TIMEOUT],
+      //   fingerprint: DATASTORE_TIMEOUT,
       // },
     }
   }