@naturalcycles/datastore-lib 3.27.1 → 3.27.2

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");
@@ -246,7 +247,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 +263,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;
     }

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.2",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"

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,
@@ -378,7 +379,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 +397,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
   }

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,
   )