@naturalcycles/datastore-lib 3.35.1 → 3.36.0

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/query.util.js

@@ -13,16 +13,25 @@ const OP_MAP = {
 function dbQueryToDatastoreQuery(dbQuery, emptyQuery) {
     let q = emptyQuery;
     // filter
-    // eslint-disable-next-line unicorn/no-array-reduce
-    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);
+    for (const f of dbQuery._filters) {
+        // keeping "previous syntax" commented out
+        // (q, f) => q.filter(f.name as string, OP_MAP[f.op] || (f.op as any), f.val),
+        // Datastore doesn't allow `undefined` as filter value.
+        // We don't want to throw on it, so instead we'll replace it with valid value of `null`.
+        // `a > null` will return anything that's indexed
+        // `a < null` should return nothing
+        // `a == null` will return just that - rows with null values
+        let { op, val } = f;
+        if (val === undefined)
+            val = null;
+        q = q.filter(new datastore_1.PropertyFilter(f.name, OP_MAP[op] || op, val));
+    }
     // limit
     q = q.limit(dbQuery._limitValue || 0);
     // order
-    // eslint-disable-next-line unicorn/no-array-reduce
-    q = dbQuery._orders.reduce((q, ord) => q.order(ord.name, { descending: ord.descending }), q);
+    for (const ord of dbQuery._orders) {
+        q = q.order(ord.name, { descending: ord.descending });
+    }
     // select
     if (dbQuery._selectedFieldNames) {
         const fields = dbQuery._selectedFieldNames.map(f => FNAME_MAP[f] || f);

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.35.1",
+  "version": "3.36.0",
   "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/query.util.ts

@@ -19,23 +19,27 @@ export function dbQueryToDatastoreQuery<ROW extends ObjectWithId>(
   let q = emptyQuery
 
   // filter
-  // eslint-disable-next-line unicorn/no-array-reduce
-  q = dbQuery._filters.reduce(
+  for (const f of dbQuery._filters) {
     // 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,
-  )
+
+    // Datastore doesn't allow `undefined` as filter value.
+    // We don't want to throw on it, so instead we'll replace it with valid value of `null`.
+    // `a > null` will return anything that's indexed
+    // `a < null` should return nothing
+    // `a == null` will return just that - rows with null values
+    let { op, val } = f
+    if (val === undefined) val = null
+    q = q.filter(new PropertyFilter(f.name as string, OP_MAP[op] || (op as any), val))
+  }
 
   // limit
   q = q.limit(dbQuery._limitValue || 0)
 
   // order
-  // eslint-disable-next-line unicorn/no-array-reduce
-  q = dbQuery._orders.reduce(
-    (q, ord) => q.order(ord.name as string, { descending: ord.descending }),
-    q,
-  )
+  for (const ord of dbQuery._orders) {
+    q = q.order(ord.name as string, { descending: ord.descending })
+  }
 
   // select
   if (dbQuery._selectedFieldNames) {