@omegup/msync 0.0.32 → 0.0.34

package/index.esm.js

@@ -1168,7 +1168,7 @@ const addTeardown = (it, tr) => {
             next: n.then(({ cont, ...res }) => ({ cont: addTeardown(cont, tr), ...res })),
             stop: () => (tr(), stop()),
             clear: async () => {
-                tr();
+                await tr();
                 await clear();
             },
         };
@@ -1184,7 +1184,12 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));
         if (q)
             pipeline.push({
-                $match: { $or: [q.raw(root()), Object.fromEntries(changeKeys.map(k => [k, null]))] },
+                $match: {
+                    $or: [
+                        q.raw(root()),
+                        Object.fromEntries(changeKeys.map(k => [k, null])),
+                    ],
+                },
             });
     }
     pipeline.push({
@@ -1219,7 +1224,10 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
 };
 
 const actions = {
-    updateMany: (c, args) => [c.updateMany(...args), [`db['${c.collectionName}'].updateMany(...`, args, ')']],
+    updateMany: (c, args) => [
+        c.updateMany(...args),
+        [`db['${c.collectionName}'].updateMany(...`, args, ')'],
+    ],
 };
 const streamNames = {};
 const executes$1 = (view, input, streamName) => {
@@ -1263,11 +1271,12 @@ const executes$1 = (view, input, streamName) => {
         const withStop = (next, tr) => {
             return addTeardown(() => ({ stop, next: next(), clear }), tr);
         };
-        const next = (next, debug, tr) => ({
+        const nextData = (data) => (next, debug, tr) => ({
             cont: withStop(next, tr),
-            data: [],
+            data,
             info: { job, debug: `${streamName} on ${collection.collectionName}: ${debug}` },
         });
+        const next = nextData([]);
         const data = {
             input: input.delta,
             finalInputFirst: finalInput.raw(true),
@@ -1287,7 +1296,11 @@ const executes$1 = (view, input, streamName) => {
         const step2 = () => Promise.all([
             last.findOne({ _id: streamName, data }),
             last.findOne({ _id: streamName }),
-        ]).then(ts => next(step2_5(ts), ts[0] ? `no teardown to handle, starting at ${ts[0].ts}` : ts[1] ? 'handle teardown' : 'start fresh'));
+        ]).then(ts => next(step2_5(ts), ts[0]
+            ? `no teardown to handle, starting at ${ts[0].ts}`
+            : ts[1]
+                ? 'handle teardown'
+                : 'start fresh'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
                 if (!last.data)
@@ -1308,11 +1321,13 @@ const executes$1 = (view, input, streamName) => {
             return next(step3(same), 'clone into new collection');
         };
         const step3 = (lastTS) => async () => {
-            const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch);
+            const hardQuery = $and(lastTS
+                ? root().of('touchedAt').has($gteTs(lastTS.ts))
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
-                after: ['after', ite(query, root().expr(), nil)],
+                after: ['after', lastTS ? ite(query, root().expr(), nil) : root().expr()],
                 updated: ['updated', val(true)],
                 _id: ['_id', root().of('_id').expr()],
             }));
@@ -1375,11 +1390,7 @@ const executes$1 = (view, input, streamName) => {
             return step8(l);
         };
         const step8 = (l) => {
-            return {
-                data: l.aggResult.cursor.firstBatch,
-                info: { job: undefined, debug: 'wait for change' },
-                cont: withStop(() => l.stream.tryNext().then(doc => (doc ? next(step2, 'restart') : step8(l)))),
-            };
+            return nextData(l.aggResult.cursor.firstBatch)(() => l.stream.tryNext().then(doc => (doc ? next(step2, 'restart') : step8(l))), 'wait for change');
         };
         return stop;
     };

package/index.js

@@ -1170,7 +1170,7 @@ const addTeardown = (it, tr) => {
             next: n.then(({ cont, ...res }) => ({ cont: addTeardown(cont, tr), ...res })),
             stop: () => (tr(), stop()),
             clear: async () => {
-                tr();
+                await tr();
                 await clear();
             },
         };
@@ -1186,7 +1186,12 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));
         if (q)
             pipeline.push({
-                $match: { $or: [q.raw(root()), Object.fromEntries(changeKeys.map(k => [k, null]))] },
+                $match: {
+                    $or: [
+                        q.raw(root()),
+                        Object.fromEntries(changeKeys.map(k => [k, null])),
+                    ],
+                },
             });
     }
     pipeline.push({
@@ -1221,7 +1226,10 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
 };
 
 const actions = {
-    updateMany: (c, args) => [c.updateMany(...args), [`db['${c.collectionName}'].updateMany(...`, args, ')']],
+    updateMany: (c, args) => [
+        c.updateMany(...args),
+        [`db['${c.collectionName}'].updateMany(...`, args, ')'],
+    ],
 };
 const streamNames = {};
 const executes$1 = (view, input, streamName) => {
@@ -1265,11 +1273,12 @@ const executes$1 = (view, input, streamName) => {
         const withStop = (next, tr) => {
             return addTeardown(() => ({ stop, next: next(), clear }), tr);
         };
-        const next = (next, debug, tr) => ({
+        const nextData = (data) => (next, debug, tr) => ({
             cont: withStop(next, tr),
-            data: [],
+            data,
             info: { job, debug: `${streamName} on ${collection.collectionName}: ${debug}` },
         });
+        const next = nextData([]);
         const data = {
             input: input.delta,
             finalInputFirst: finalInput.raw(true),
@@ -1289,7 +1298,11 @@ const executes$1 = (view, input, streamName) => {
         const step2 = () => Promise.all([
             last.findOne({ _id: streamName, data }),
             last.findOne({ _id: streamName }),
-        ]).then(ts => next(step2_5(ts), ts[0] ? `no teardown to handle, starting at ${ts[0].ts}` : ts[1] ? 'handle teardown' : 'start fresh'));
+        ]).then(ts => next(step2_5(ts), ts[0]
+            ? `no teardown to handle, starting at ${ts[0].ts}`
+            : ts[1]
+                ? 'handle teardown'
+                : 'start fresh'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
                 if (!last.data)
@@ -1310,11 +1323,13 @@ const executes$1 = (view, input, streamName) => {
             return next(step3(same), 'clone into new collection');
         };
         const step3 = (lastTS) => async () => {
-            const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch);
+            const hardQuery = $and(lastTS
+                ? root().of('touchedAt').has($gteTs(lastTS.ts))
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
-                after: ['after', ite(query, root().expr(), nil)],
+                after: ['after', lastTS ? ite(query, root().expr(), nil) : root().expr()],
                 updated: ['updated', val(true)],
                 _id: ['_id', root().of('_id').expr()],
             }));
@@ -1377,11 +1392,7 @@ const executes$1 = (view, input, streamName) => {
             return step8(l);
         };
         const step8 = (l) => {
-            return {
-                data: l.aggResult.cursor.firstBatch,
-                info: { job: undefined, debug: 'wait for change' },
-                cont: withStop(() => l.stream.tryNext().then(doc => (doc ? next(step2, 'restart') : step8(l)))),
-            };
+            return nextData(l.aggResult.cursor.firstBatch)(() => l.stream.tryNext().then(doc => (doc ? next(step2, 'restart') : step8(l))), 'wait for change');
         };
         return stop;
     };

package/package.json

@@ -3,7 +3,7 @@
     "module": "index.esm.js",
     "typings": "index.d.ts",
     "name": "@omegup/msync",
-    "version": "0.0.32",
+    "version": "0.0.34",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",