@omegup/msync 0.0.25 → 0.0.27

package/index.esm.js

@@ -551,7 +551,9 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const doubleReplace = (x) => x;
-    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
+    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(first
+        ? ctx()('new').of(k).expr()
+        : v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
     const gidPath = root().of(gid).expr();
     const mapId = (k, v) => map1(k, v);
     const F1 = {
@@ -574,15 +576,13 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
         .with($merge_({
         ...out,
         on: root().of(gid),
-        ...(first
-            ? { whenMatched: 'merge' }
-            : {
-                vars: { new: ['new', root().expr()] },
-                stages: 'ctx',
-                whenMatched: link()
-                    .with(mergeAggregates)
-                    .with(doubleReplace($set_(updater))).stages,
-            }),
+        ...{
+            vars: { new: ['new', root().expr()] },
+            stages: 'ctx',
+            whenMatched: link()
+                .with(mergeAggregates)
+                .with(doubleReplace($set_(updater))).stages,
+        },
     })).stages);
 };
 
@@ -1185,7 +1185,7 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
 };
 
 const actions = {
-    updateMany: (c, args) => c.updateMany(...args),
+    updateMany: (c, args) => [c.updateMany(...args), [`db['${c.collectionName}'].updateMany(`, ...args, ')']],
 };
 const streamNames = {};
 const executes$1 = (view, input, streamName) => {
@@ -1264,7 +1264,10 @@ const executes$1 = (view, input, streamName) => {
                     method: m,
                     params: p,
                 };
-                await Promise.all([snapshotCollection.drop(), actions[method](collection, params)]);
+                const [action, out] = actions[method](collection, params);
+                log('teardown', `db.['${snapshotCollection.collectionName}'].drop()`, ...out);
+                await Promise.all([snapshotCollection.drop(), action]);
+                log('teardown done', `db.['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
             if (exists && !same)
                 await handleTeardown(exists);
@@ -1420,7 +1423,10 @@ const executes = (view, input, streamName) => {
                     method: m,
                     params: p,
                 };
-                await actions[method](collection, params);
+                const [action, out] = actions[method](collection, params);
+                log('teardown', ...out);
+                await action;
+                log('teardown done', ...out);
             };
             if (exists && !same)
                 await handleTeardown(exists);

package/index.js

@@ -553,7 +553,9 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const doubleReplace = (x) => x;
-    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
+    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(first
+        ? ctx()('new').of(k).expr()
+        : v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
     const gidPath = root().of(gid).expr();
     const mapId = (k, v) => map1(k, v);
     const F1 = {
@@ -576,15 +578,13 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
         .with($merge_({
         ...out,
         on: root().of(gid),
-        ...(first
-            ? { whenMatched: 'merge' }
-            : {
-                vars: { new: ['new', root().expr()] },
-                stages: 'ctx',
-                whenMatched: link()
-                    .with(mergeAggregates)
-                    .with(doubleReplace($set_(updater))).stages,
-            }),
+        ...{
+            vars: { new: ['new', root().expr()] },
+            stages: 'ctx',
+            whenMatched: link()
+                .with(mergeAggregates)
+                .with(doubleReplace($set_(updater))).stages,
+        },
     })).stages);
 };
 
@@ -1187,7 +1187,7 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
 };
 
 const actions = {
-    updateMany: (c, args) => c.updateMany(...args),
+    updateMany: (c, args) => [c.updateMany(...args), [`db['${c.collectionName}'].updateMany(`, ...args, ')']],
 };
 const streamNames = {};
 const executes$1 = (view, input, streamName) => {
@@ -1266,7 +1266,10 @@ const executes$1 = (view, input, streamName) => {
                     method: m,
                     params: p,
                 };
-                await Promise.all([snapshotCollection.drop(), actions[method](collection, params)]);
+                const [action, out] = actions[method](collection, params);
+                log('teardown', `db.['${snapshotCollection.collectionName}'].drop()`, ...out);
+                await Promise.all([snapshotCollection.drop(), action]);
+                log('teardown done', `db.['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
             if (exists && !same)
                 await handleTeardown(exists);
@@ -1422,7 +1425,10 @@ const executes = (view, input, streamName) => {
                     method: m,
                     params: p,
                 };
-                await actions[method](collection, params);
+                const [action, out] = actions[method](collection, params);
+                log('teardown', ...out);
+                await action;
+                log('teardown done', ...out);
             };
             if (exists && !same)
                 await handleTeardown(exists);

package/package.json

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