@naturalcycles/datastore-lib 3.35.0 → 3.35.2

package/dist/DatastoreStreamReadable.js

@@ -132,7 +132,10 @@ class DatastoreStreamReadable extends node_stream_1.Readable {
             return;
         }
         if (!this.running) {
-            void this.runNextQuery();
+            void this.runNextQuery().catch(err => {
+                console.log('error in runNextQuery', err);
+                this.emit('error', err);
+            });
         }
         else {
             this.logger.log(`_read ${this.count}, wasRunning: true`);

package/dist/datastore.db.d.ts

@@ -1,7 +1,7 @@
-import { Transaction } from '@google-cloud/datastore';
 import type { Datastore, Key, Query } from '@google-cloud/datastore';
-import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBSupport, DBQuery, DBTransaction, DBTransactionFn, RunQueryResult, CommonDBTransactionOptions } from '@naturalcycles/db-lib';
-import { JsonSchemaObject, JsonSchemaRootObject, CommonLogger, ObjectWithId } from '@naturalcycles/js-lib';
+import { Transaction } from '@google-cloud/datastore';
+import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBSupport, CommonDBTransactionOptions, DBQuery, DBTransaction, DBTransactionFn, RunQueryResult } from '@naturalcycles/db-lib';
+import { CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DatastoreDBCfg, DatastoreDBOptions, DatastoreDBSaveOptions, DatastoreDBStreamOptions, DatastorePayload, DatastorePropertyStats, DatastoreStats } from './datastore.model';
 /**

package/dist/datastore.db.js

@@ -5,8 +5,8 @@ const datastore_1 = require("@google-cloud/datastore");
 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 DatastoreStreamReadable_1 = require("./DatastoreStreamReadable");
 const datastore_model_1 = require("./datastore.model");
+const DatastoreStreamReadable_1 = require("./DatastoreStreamReadable");
 const query_util_1 = require("./query.util");
 // Datastore (also Firestore and other Google APIs) supports max 500 of items when saving/deleting, etc.
 const MAX_ITEMS = 500;

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.35.0",
+  "version": "3.35.2",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
-    "prepare": "husky"
+    "prepare": "husky",
+    "build": "dev-lib build",
+    "test": "dev-lib test",
+    "lint": "dev-lib lint",
+    "bt": "dev-lib bt",
+    "lbt": "dev-lib lbt"
   },
   "dependencies": {
     "@google-cloud/datastore": "^9.0.0",
@@ -12,8 +17,8 @@
     "@naturalcycles/nodejs-lib": "^13.1.0"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^13.0.0",
-    "@types/node": "^20.4.1",
+    "@naturalcycles/dev-lib": "^15.2.0",
+    "@types/node": "^22.0.0",
     "jest": "^29.0.3"
   },
   "files": [
@@ -27,7 +32,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=18.12.0"
+    "node": ">=20.13.0"
   },
   "publishConfig": {
     "access": "public"

package/src/DatastoreStreamReadable.ts

@@ -192,7 +192,10 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
     }
 
     if (!this.running) {
-      void this.runNextQuery()
+      void this.runNextQuery().catch(err => {
+        console.log('error in runNextQuery', err)
+        this.emit('error', err)
+      })
     } else {
       this.logger.log(`_read ${this.count}, wasRunning: true`)
     }

package/src/datastore.db.ts

@@ -1,5 +1,5 @@
-import { PropertyFilter, Transaction } from '@google-cloud/datastore'
 import type { Datastore, Key, Query } from '@google-cloud/datastore'
+import { PropertyFilter, Transaction } from '@google-cloud/datastore'
 import {
   BaseCommonDB,
   CommonDB,
@@ -8,34 +8,33 @@ import {
   CommonDBSaveMethod,
   CommonDBSaveOptions,
   CommonDBSupport,
+  CommonDBTransactionOptions,
   DBQuery,
   DBTransaction,
   DBTransactionFn,
   RunQueryResult,
-  CommonDBTransactionOptions,
 } from '@naturalcycles/db-lib'
 import {
+  _assert,
+  _chunk,
+  _omit,
+  CommonLogger,
+  commonLoggerMinLevel,
   JsonSchemaAny,
   JsonSchemaBoolean,
   JsonSchemaNull,
   JsonSchemaNumber,
   JsonSchemaObject,
+  JsonSchemaRootObject,
   JsonSchemaString,
+  ObjectWithId,
   pMap,
-  _assert,
-  _chunk,
-  _omit,
-  JsonSchemaRootObject,
-  CommonLogger,
-  commonLoggerMinLevel,
-  pTimeout,
-  pRetryFn,
   pRetry,
+  pRetryFn,
   PRetryOptions,
-  ObjectWithId,
+  pTimeout,
 } from '@naturalcycles/js-lib'
-import { ReadableTyped, boldWhite } from '@naturalcycles/nodejs-lib'
-import { DatastoreStreamReadable } from './DatastoreStreamReadable'
+import { boldWhite, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import {
   DatastoreDBCfg,
   DatastoreDBOptions,
@@ -46,6 +45,7 @@ import {
   DatastoreStats,
   DatastoreType,
 } from './datastore.model'
+import { DatastoreStreamReadable } from './DatastoreStreamReadable'
 import { dbQueryToDatastoreQuery } from './query.util'
 
 // Datastore (also Firestore and other Google APIs) supports max 500 of items when saving/deleting, etc.