@nxtedition/lib 19.0.48 → 19.0.50

package/deepstream.js

@@ -1,4 +1,4 @@
-import assert from 'node:assert'
+// import assert from 'node:assert'
 import qs from 'qs'
 import cached from './util/cached.js'
 import * as rxjs from 'rxjs'
@@ -138,39 +138,48 @@ function getRecord(ds, name, ...args) {
   )
 }
 
-function query(ds, designId, options) {
+function query(
+  ds,
+  designId,
+  { startkey, endkey, key, sorted, descending, limit },
+  state = ds.record.PROVIDER,
+) {
   const next = (startkey, prevRows, limit) =>
     Number.isFinite(limit) && limit <= 0
       ? rxjs.of({ rows: prevRows })
-      : ds.nxt.record
+      : ds.record
           .observe(
             `${designId}:design?${qs.stringify(
               {
-                ...options,
                 startkey,
+                endkey,
+                key,
+                sorted,
+                descending,
                 limit: Number.isFinite(limit) ? limit : null,
               },
               { skipNulls: true },
             )}`,
-            ds.record.PROVIDER,
+            state,
           )
           .pipe(
+            rxjs.filter(({ rows }) => Array.isArray(rows)),
             rxjs.switchMap(({ rows, finished }) => {
-              assert(Array.isArray(rows))
-              assert(typeof finished === 'boolean')
+              // assert(Array.isArray(rows))
+              // assert(typeof finished === 'boolean')
 
               const nextRows = prevRows.length ? [...prevRows, ...rows] : rows
               if (finished) {
                 return rxjs.of({ rows: nextRows })
               } else {
                 const last = rows.pop()
-                assert(last.key)
-                assert(rows.length > 0)
+                // assert(last.key)
+                // assert(rows.length > 0)
                 return next(last.key, nextRows, limit - rows.length)
               }
             }),
           )
-  return next(options.startkey, [], options.limit ?? Infinity)
+  return next(startkey, [], limit ?? Infinity)
 }
 
 export function makeDeepstream(ds) {

package/errors.js

@@ -55,8 +55,7 @@ export function serializeError(error) {
   }
 
   if (Array.isArray(error)) {
-    const errors = error.map(serializeError).filter(Boolean)
-    return errors
+    return error.map(serializeError).filter(Boolean)
   }
 
   if (Object.prototype.hasOwnProperty.call(error, kSeen)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.48",
+  "version": "19.0.50",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",