@naturalcycles/datastore-lib 4.18.0 → 4.18.2

package/dist/datastore.db.js

@@ -200,18 +200,17 @@ export class DatastoreDB extends BaseCommonDB {
         };
     }
     streamQuery(dbQuery, _opt) {
-        return Pipeline.fromAsyncReadable(async () => {
-            const ds = this.ds();
-            const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table));
-            const opt = {
-                logger: this.cfg.logger,
-                ...this.cfg.streamOptions,
-                ..._opt,
-            };
-            return opt.experimentalCursorStream
-                ? new DatastoreStreamReadable(q, opt)
-                : ds.runQueryStream(q, this.getRunQueryOptions(opt));
-        }).mapSync(r => this.mapId(r));
+        const ds = this.ds();
+        const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table));
+        const opt = {
+            logger: this.cfg.logger,
+            ...this.cfg.streamOptions,
+            ..._opt,
+        };
+        const readable = opt.experimentalCursorStream
+            ? new DatastoreStreamReadable(q, opt)
+            : ds.runQueryStream(q, this.getRunQueryOptions(opt));
+        return Pipeline.from(readable).mapSync(r => this.mapId(r));
     }
     // https://github.com/GoogleCloudPlatform/nodejs-getting-started/blob/master/2-structured-data/books/model-datastore.js
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.18.0",
+  "version": "4.18.2",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@types/node": "^24",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "20.12.10"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -27,7 +27,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/datastore.db.ts

@@ -302,21 +302,20 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     dbQuery: DBQuery<ROW>,
     _opt?: DatastoreDBStreamOptions,
   ): Pipeline<ROW> {
-    return Pipeline.fromAsyncReadable<ROW>(async () => {
-      const ds = this.ds()
+    const ds = this.ds()
+    const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table))
 
-      const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table))
+    const opt = {
+      logger: this.cfg.logger,
+      ...this.cfg.streamOptions,
+      ..._opt,
+    }
 
-      const opt = {
-        logger: this.cfg.logger,
-        ...this.cfg.streamOptions,
-        ..._opt,
-      }
+    const readable = opt.experimentalCursorStream
+      ? new DatastoreStreamReadable<ROW>(q, opt)
+      : ds.runQueryStream(q, this.getRunQueryOptions(opt))
 
-      return opt.experimentalCursorStream
-        ? new DatastoreStreamReadable<ROW>(q, opt)
-        : ds.runQueryStream(q, this.getRunQueryOptions(opt))
-    }).mapSync(r => this.mapId<ROW>(r))
+    return Pipeline.from<ROW>(readable).mapSync(r => this.mapId<ROW>(r))
   }
 
   // https://github.com/GoogleCloudPlatform/nodejs-getting-started/blob/master/2-structured-data/books/model-datastore.js

package/src/datastore.model.ts

@@ -113,8 +113,9 @@ export interface DatastoreDBOptions extends CommonDBOptions {}
 
 export interface DatastoreDBReadOptions extends CommonDBReadOptions {}
 
-export interface DatastoreDBSaveOptions<ROW extends ObjectWithId>
-  extends CommonDBSaveOptions<ROW> {}
+export interface DatastoreDBSaveOptions<
+  ROW extends ObjectWithId,
+> extends CommonDBSaveOptions<ROW> {}
 
 export interface DatastoreStats {
   composite_index_count: number