@naturalcycles/datastore-lib 3.32.3 → 3.33.1

package/dist/DatastoreStreamReadable.js

@@ -80,7 +80,7 @@ class DatastoreStreamReadable extends node_stream_1.Readable {
                 delay: 5000,
                 delayMultiplier: 2,
                 logger: this.logger,
-                timeout: 120000, // 2 minutes
+                timeout: 120_000, // 2 minutes
             });
         }
         catch (err) {

package/dist/datastore.db.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatastoreDBTransaction = 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");
@@ -135,8 +134,9 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
     }
     async runQueryCount(dbQuery, _opt) {
         const q = (0, query_util_1.dbQueryToDatastoreQuery)(dbQuery.select([]), this.ds().createQuery(dbQuery.table));
-        const [entities] = await this.ds().runQuery(q);
-        return entities.length;
+        const aq = this.ds().createAggregationQuery(q).count('count');
+        const [entities] = await this.ds().runAggregationQuery(aq);
+        return entities[0]?.count;
     }
     async runDatastoreQuery(q) {
         const [entities, queryResult] = await this.ds().runQuery(q);
@@ -151,17 +151,9 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
             ...this.cfg.streamOptions,
             ..._opt,
         };
-        const stream = (opt.experimentalCursorStream
+        return (opt.experimentalCursorStream
             ? new DatastoreStreamReadable_1.DatastoreStreamReadable(q, opt, (0, js_lib_1.commonLoggerMinLevel)(this.cfg.logger, opt.debug ? 'log' : 'warn'))
-            : this.ds().runQueryStream(q))
-            .on('error', err => stream.emit('error', err))
-            .pipe(new node_stream_1.Transform({
-            objectMode: true,
-            transform: (chunk, _enc, cb) => {
-                cb(null, this.mapId(chunk));
-            },
-        }));
-        return stream;
+            : this.ds().runQueryStream(q)).map(chunk => this.mapId(chunk));
     }
     streamQuery(dbQuery, opt) {
         const q = (0, query_util_1.dbQueryToDatastoreQuery)(dbQuery, this.ds().createQuery(dbQuery.table));
@@ -369,7 +361,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         return {
             predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
             name,
-            timeout: 20000,
+            timeout: 20_000,
             maxAttempts: 5,
             delay: 5000,
             delayMultiplier: 1.5,

package/dist/datastoreKeyValueDB.d.ts

@@ -17,5 +17,5 @@ export declare class DatastoreKeyValueDB implements CommonKeyValueDB {
     streamIds(table: string, limit?: number): ReadableTyped<string>;
     streamValues(table: string, limit?: number): ReadableTyped<Buffer>;
     streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple>;
-    count(_table: string): Promise<number>;
+    count(table: string): Promise<number>;
 }

package/dist/datastoreKeyValueDB.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatastoreKeyValueDB = void 0;
 const db_lib_1 = require("@naturalcycles/db-lib");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const datastore_db_1 = require("./datastore.db");
 const excludeFromIndexes = ['v'];
 class DatastoreKeyValueDB {
@@ -30,38 +28,29 @@ class DatastoreKeyValueDB {
         const q = db_lib_1.DBQuery.create(table)
             .select(['id'])
             .limit(limit || 0);
-        const stream = this.db
+        return (this.db
             .streamQuery(q)
-            .on('error', err => stream.emit('error', err))
-            .pipe((0, nodejs_lib_1.transformMapSimple)(objectWithId => objectWithId.id, {
-            errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }));
-        return stream;
+            // .on('error', err => stream.emit('error', err))
+            .map(r => r.id));
     }
     streamValues(table, limit) {
         // `select v` doesn't work for some reason
         const q = db_lib_1.DBQuery.create(table).limit(limit || 0);
-        const stream = this.db
+        return (this.db
             .streamQuery(q)
-            .on('error', err => stream.emit('error', err))
-            .pipe((0, nodejs_lib_1.transformMapSimple)(obj => obj.v, {
-            errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }));
-        return stream;
+            // .on('error', err => stream.emit('error', err))
+            .map(r => r.v));
     }
     streamEntries(table, limit) {
         const q = db_lib_1.DBQuery.create(table).limit(limit || 0);
-        const stream = this.db
+        return (this.db
             .streamQuery(q)
-            .on('error', err => stream.emit('error', err))
-            .pipe((0, nodejs_lib_1.transformMapSimple)(obj => [obj.id, obj.v], {
-            errorMode: js_lib_1.ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }));
-        return stream;
+            // .on('error', err => stream.emit('error', err))
+            .map(r => [r.id, r.v]));
     }
-    async count(_table) {
-        this.db.cfg.logger.warn(`DatastoreKeyValueDB.count is not supported`);
-        return 0;
+    async count(table) {
+        const q = db_lib_1.DBQuery.create(table);
+        return await this.db.runQueryCount(q);
     }
 }
 exports.DatastoreKeyValueDB = DatastoreKeyValueDB;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.32.3",
+  "version": "3.33.1",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "dependencies": {
     "@google-cloud/datastore": "^8.0.0",

package/src/datastore.db.ts

@@ -1,4 +1,3 @@
-import { Transform } from 'node:stream'
 import { PropertyFilter, Transaction } from '@google-cloud/datastore'
 import type { Datastore, Key, Query } from '@google-cloud/datastore'
 import {
@@ -228,8 +227,9 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     _opt?: DatastoreDBOptions,
   ): Promise<number> {
     const q = dbQueryToDatastoreQuery(dbQuery.select([]), this.ds().createQuery(dbQuery.table))
-    const [entities] = await this.ds().runQuery(q)
-    return entities.length
+    const aq = this.ds().createAggregationQuery(q).count('count')
+    const [entities] = await this.ds().runAggregationQuery(aq)
+    return entities[0]?.count
   }
 
   async runDatastoreQuery<ROW extends ObjectWithId>(q: Query): Promise<RunQueryResult<ROW>> {
@@ -252,26 +252,15 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       ..._opt,
     }
 
-    const stream: ReadableTyped<ROW> = (
+    return (
       opt.experimentalCursorStream
-        ? new DatastoreStreamReadable(
+        ? new DatastoreStreamReadable<ROW>(
             q,
             opt,
             commonLoggerMinLevel(this.cfg.logger, opt.debug ? 'log' : 'warn'),
           )
-        : this.ds().runQueryStream(q)
-    )
-      .on('error', err => stream.emit('error', err))
-      .pipe(
-        new Transform({
-          objectMode: true,
-          transform: (chunk, _enc, cb) => {
-            cb(null, this.mapId(chunk))
-          },
-        }),
-      )
-
-    return stream
+        : (this.ds().runQueryStream(q) as ReadableTyped<ROW>)
+    ).map(chunk => this.mapId(chunk))
   }
 
   override streamQuery<ROW extends ObjectWithId>(

package/src/datastoreKeyValueDB.ts

@@ -1,6 +1,5 @@
 import { CommonKeyValueDB, DBQuery, KeyValueDBTuple } from '@naturalcycles/db-lib'
-import { ErrorMode, ObjectWithId } from '@naturalcycles/js-lib'
-import { ReadableTyped, transformMapSimple } from '@naturalcycles/nodejs-lib'
+import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { DatastoreDB } from './datastore.db'
 import { DatastoreDBCfg } from './datastore.model'
 
@@ -49,51 +48,39 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
       .select(['id'])
       .limit(limit || 0)
 
-    const stream: ReadableTyped<string> = this.db
-      .streamQuery<KVObject>(q)
-      .on('error', err => stream.emit('error', err))
-      .pipe(
-        transformMapSimple<ObjectWithId, string>(objectWithId => objectWithId.id, {
-          errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }),
-      )
-
-    return stream
+    return (
+      this.db
+        .streamQuery(q)
+        // .on('error', err => stream.emit('error', err))
+        .map(r => r.id)
+    )
   }
 
   streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
     // `select v` doesn't work for some reason
     const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
-    const stream: ReadableTyped<string> = this.db
-      .streamQuery<KVObject>(q)
-      .on('error', err => stream.emit('error', err))
-      .pipe(
-        transformMapSimple<{ v: Buffer }, Buffer>(obj => obj.v, {
-          errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }),
-      )
-
-    return stream
+    return (
+      this.db
+        .streamQuery(q)
+        // .on('error', err => stream.emit('error', err))
+        .map(r => r.v)
+    )
   }
 
   streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
     const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
-    const stream: ReadableTyped<string> = this.db
-      .streamQuery<KVObject>(q)
-      .on('error', err => stream.emit('error', err))
-      .pipe(
-        transformMapSimple<KVObject, KeyValueDBTuple>(obj => [obj.id, obj.v], {
-          errorMode: ErrorMode.SUPPRESS, // cause .pipe() cannot propagate errors
-        }),
-      )
-
-    return stream
+    return (
+      this.db
+        .streamQuery(q)
+        // .on('error', err => stream.emit('error', err))
+        .map(r => [r.id, r.v] as KeyValueDBTuple)
+    )
   }
 
-  async count(_table: string): Promise<number> {
-    this.db.cfg.logger.warn(`DatastoreKeyValueDB.count is not supported`)
-    return 0
+  async count(table: string): Promise<number> {
+    const q = DBQuery.create<KVObject>(table)
+    return await this.db.runQueryCount(q)
   }
 }