@naturalcycles/datastore-lib 3.27.1 → 3.27.3

package/dist/DatastoreStreamReadable.js

@@ -56,7 +56,7 @@ class DatastoreStreamReadable extends node_stream_1.Readable {
             });
         }
         catch (err) {
-            console.error(`DatastoreStreamReadable error!\n`, {
+            console.log(`DatastoreStreamReadable error!\n`, {
                 table: this.table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);

package/dist/datastore.db.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatastoreDB = void 0;
 const node_stream_1 = require("node:stream");
+const datastore_1 = require("@google-cloud/datastore");
 const db_lib_1 = require("@naturalcycles/db-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
@@ -20,6 +21,7 @@ const RETRY_ON = [
 ].map(s => s.toLowerCase());
 // Examples of errors:
 // UNKNOWN: Stream removed
+const DATASTORE_TIMEOUT = 'DATASTORE_TIMEOUT';
 const methodMap = {
     insert: 'insert',
     update: 'update',
@@ -90,7 +92,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
                     timeout: this.cfg.timeout,
                     errorData: {
                         // This error will be grouped ACROSS all endpoints and usages
-                        fingerprint: ['DATASTORE_TIMEOUT'],
+                        fingerprint: [DATASTORE_TIMEOUT],
                     },
                 });
                 rows = r[0];
@@ -246,7 +248,11 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
      * Returns undefined e.g when Table is non-existing
      */
     async getStats(table) {
-        const q = this.ds().createQuery('__Stat_Kind__').filter('kind_name', table).limit(1);
+        const q = this.ds()
+            .createQuery('__Stat_Kind__')
+            // .filter('kind_name', table)
+            .filter(new datastore_1.PropertyFilter('kind_name', '=', table))
+            .limit(1);
         const [statsArray] = await this.ds().runQuery(q);
         const [stats] = statsArray;
         return stats;
@@ -258,7 +264,8 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
     async getTableProperties(table) {
         const q = this.ds()
             .createQuery('__Stat_PropertyType_PropertyName_Kind__')
-            .filter('kind_name', table);
+            // .filter('kind_name', table)
+            .filter(new datastore_1.PropertyFilter('kind_name', '=', table));
         const [stats] = await this.ds().runQuery(q);
         return stats;
     }
@@ -379,6 +386,9 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
             logFailures: true,
             // logAll: true,
             logger: this.cfg.logger,
+            errorData: {
+                fingerprint: [DATASTORE_TIMEOUT],
+            },
         };
     }
 }

package/dist/datastore.model.js

@@ -12,4 +12,4 @@ var DatastoreType;
     DatastoreType["DATE_TIME"] = "Date/Time";
     DatastoreType["Boolean"] = "Boolean";
     DatastoreType["NULL"] = "NULL";
-})(DatastoreType = exports.DatastoreType || (exports.DatastoreType = {}));
+})(DatastoreType || (exports.DatastoreType = DatastoreType = {}));

package/dist/query.util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbQueryToDatastoreQuery = void 0;
+const datastore_1 = require("@google-cloud/datastore");
 const FNAME_MAP = {
     id: '__key__',
 };
@@ -13,7 +14,10 @@ function dbQueryToDatastoreQuery(dbQuery, emptyQuery) {
     let q = emptyQuery;
     // filter
     // eslint-disable-next-line unicorn/no-array-reduce
-    q = dbQuery._filters.reduce((q, f) => q.filter(f.name, OP_MAP[f.op] || f.op, f.val), q);
+    q = dbQuery._filters.reduce(
+    // keeping "previous syntax" commented out
+    // (q, f) => q.filter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val),
+    (q, f) => q.filter(new datastore_1.PropertyFilter(f.name, OP_MAP[f.op] || f.op, f.val)), q);
     // limit
     q = q.limit(dbQuery._limitValue || 0);
     // order

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.27.1",
+  "version": "3.27.3",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@naturalcycles/dev-lib": "^13.0.0",
-    "@types/node": "^18.7.2",
+    "@types/node": "^20.4.1",
     "jest": "^29.0.3"
   },
   "files": [

package/src/DatastoreStreamReadable.ts

@@ -17,7 +17,11 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
 
   private opt: DatastoreDBStreamOptions & { batchSize: number }
 
-  constructor(private q: Query, opt: DatastoreDBStreamOptions, private logger: CommonLogger) {
+  constructor(
+    private q: Query,
+    opt: DatastoreDBStreamOptions,
+    private logger: CommonLogger,
+  ) {
     super({ objectMode: true })
 
     this.opt = {
@@ -74,7 +78,7 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         },
       )
     } catch (err) {
-      console.error(
+      console.log(
         `DatastoreStreamReadable error!\n`,
         {
           table: this.table,

package/src/datastore.db.ts

@@ -1,4 +1,5 @@
 import { Transform } from 'node:stream'
+import { PropertyFilter } from '@google-cloud/datastore'
 import type { Datastore, Key, Query } from '@google-cloud/datastore'
 import {
   BaseCommonDB,
@@ -58,6 +59,8 @@ const RETRY_ON = [
 // Examples of errors:
 // UNKNOWN: Stream removed
 
+const DATASTORE_TIMEOUT = 'DATASTORE_TIMEOUT'
+
 const methodMap: Record<CommonDBSaveMethod, string> = {
   insert: 'insert',
   update: 'update',
@@ -78,7 +81,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  public cfg: DatastoreDBCfg & { logger: CommonLogger }
+  cfg: DatastoreDBCfg & { logger: CommonLogger }
 
   private cachedDatastore?: Datastore
 
@@ -153,15 +156,18 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
           timeout: this.cfg.timeout,
           errorData: {
             // This error will be grouped ACROSS all endpoints and usages
-            fingerprint: ['DATASTORE_TIMEOUT'],
+            fingerprint: [DATASTORE_TIMEOUT],
           },
         })
         rows = r[0]
       }
     } else {
-      rows = await pRetry(async () => {
-        return (await this.ds().get(keys))[0]
-      }, this.getPRetryOptions(`datastore.getByIds(${table})`))
+      rows = await pRetry(
+        async () => {
+          return (await this.ds().get(keys))[0]
+        },
+        this.getPRetryOptions(`datastore.getByIds(${table})`),
+      )
     }
 
     return (
@@ -277,9 +283,12 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
 
     const method = methodMap[opt.saveMethod || 'upsert'] || 'save'
 
-    const save = pRetryFn(async (batch: DatastorePayload<ROW>[]) => {
-      await (opt.tx || this.ds())[method](batch)
-    }, this.getPRetryOptions(`DatastoreLib.saveBatch(${table})`))
+    const save = pRetryFn(
+      async (batch: DatastorePayload<ROW>[]) => {
+        await (opt.tx || this.ds())[method](batch)
+      },
+      this.getPRetryOptions(`DatastoreLib.saveBatch(${table})`),
+    )
 
     try {
       const chunks = _chunk(entities, MAX_ITEMS)
@@ -378,7 +387,11 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
    * Returns undefined e.g when Table is non-existing
    */
   async getStats(table: string): Promise<DatastoreStats | undefined> {
-    const q = this.ds().createQuery('__Stat_Kind__').filter('kind_name', table).limit(1)
+    const q = this.ds()
+      .createQuery('__Stat_Kind__')
+      // .filter('kind_name', table)
+      .filter(new PropertyFilter('kind_name', '=', table))
+      .limit(1)
     const [statsArray] = await this.ds().runQuery(q)
     const [stats] = statsArray
     return stats
@@ -392,7 +405,8 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
   async getTableProperties(table: string): Promise<DatastorePropertyStats[]> {
     const q = this.ds()
       .createQuery('__Stat_PropertyType_PropertyName_Kind__')
-      .filter('kind_name', table)
+      // .filter('kind_name', table)
+      .filter(new PropertyFilter('kind_name', '=', table))
     const [stats] = await this.ds().runQuery(q)
     return stats
   }
@@ -528,6 +542,9 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       logFailures: true,
       // logAll: true,
       logger: this.cfg.logger,
+      errorData: {
+        fingerprint: [DATASTORE_TIMEOUT],
+      },
     }
   }
 }

package/src/query.util.ts

@@ -1,4 +1,4 @@
-import { Query } from '@google-cloud/datastore'
+import { PropertyFilter, Query } from '@google-cloud/datastore'
 import { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { ObjectWithId, StringMap } from '@naturalcycles/js-lib'
 
@@ -21,7 +21,9 @@ export function dbQueryToDatastoreQuery<ROW extends ObjectWithId>(
   // filter
   // eslint-disable-next-line unicorn/no-array-reduce
   q = dbQuery._filters.reduce(
-    (q, f) => q.filter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val),
+    // keeping "previous syntax" commented out
+    // (q, f) => q.filter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val),
+    (q, f) => q.filter(new PropertyFilter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val)),
     q,
   )