@naturalcycles/datastore-lib 3.35.2 → 3.36.0

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,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.35.2",
+  "version": "3.36.0",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky",

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