support and(live()) operations

Author: staltz

operators.js

@@ -251,12 +251,12 @@ function extractMeta(orig) {
 }
 
 function and(...args) {
-  const rhs = args
-    .map((arg) => (typeof arg === 'function' ? arg() : arg))
-    .filter((arg) => !!arg)
-  return (ops) => {
+  return (ops, isSpecialOps) => {
+    const rhs = args
+      .map((arg) => (typeof arg === 'function' ? arg(ops, true) : arg))
+      .filter((arg) => !!arg)
     const res =
-      ops && ops.type
+      ops && ops.type && !isSpecialOps
         ? {
             type: 'AND',
             data: [ops, ...rhs],
@@ -273,12 +273,12 @@ function and(...args) {
 }
 
 function or(...args) {
-  const rhs = args
-    .map((arg) => (typeof arg === 'function' ? arg() : arg))
-    .filter((arg) => !!arg)
-  return (ops) => {
+  return (ops, isSpecialOps) => {
+    const rhs = args
+      .map((arg) => (typeof arg === 'function' ? arg(ops, true) : arg))
+      .filter((arg) => !!arg)
     const res =
-      ops && ops.type
+      ops && ops.type && !isSpecialOps
         ? {
             type: 'OR',
             data: [ops, ...rhs],
@@ -294,6 +294,8 @@ function or(...args) {
   }
 }
 
+// The following are "special operators": they only update meta
+
 function live(opts) {
   if (opts && opts.old) return (ops) => updateMeta(ops, 'live', 'liveAndOld')
   else return (ops) => updateMeta(ops, 'live', 'liveOnly')

test/operators.js

@@ -1033,6 +1033,31 @@ prepareAndRunTest('support live operations', dir, (t, db, raf) => {
   })
 })
 
+prepareAndRunTest('support live inside and', dir, (t, db, raf) => {
+  const msg = { type: 'post', text: 'Testing!' }
+  let state = validate.initial()
+  state = validate.appendNew(state, null, alice, msg, Date.now())
+  state = validate.appendNew(state, null, bob, msg, Date.now() + 1)
+
+  addMsg(state.queue[0].value, raf, (e1, msg1) => {
+    let i = 0
+    query(
+      fromDB(db),
+      and(live({ old: true }), slowEqual('value.content.type', 'post')),
+      toPullStream(),
+      pull.drain((msg) => {
+        if (i++ == 0) {
+          t.equal(msg.value.author, alice.id)
+          addMsg(state.queue[1].value, raf, (e2, msg2) => {})
+        } else {
+          t.equal(msg.value.author, bob.id)
+          t.end()
+        }
+      })
+    )
+  })
+})
+
 prepareAndRunTest('support live with not', dir, (t, db, raf) => {
   const msg = { type: 'post', text: 'Testing!' }
   let state = validate.initial()