@omegup/msync 0.0.51 → 0.0.53

package/index.esm.js

@@ -1193,6 +1193,11 @@ const firstWorksMerge = (iters) => {
     return iterator;
 };
 
+const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
+const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
+const json = (a) => replace(JSON.stringify(a));
+const log = (...args) => console.log(new Date(), ...args.map(a => (typeof a === 'function' ? a(replace) : a && typeof a === 'object' ? json(a) : a)));
+
 class Machine {
     sources;
     constructor(root) {
@@ -1218,6 +1223,7 @@ const runCont = async (it, cb) => {
     const { next, stop, clear } = it();
     const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
     if (!res.ok) {
+        log('error', res.err);
         return runCont(stop, cb);
     }
     const { cont, info } = res.next;
@@ -1377,11 +1383,6 @@ const $insert = (out) => $insertX(out, assertNotNull(root().of('after').expr()),
 }), x));
 const assertNotNull = (expr) => expr;
 
-const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
-const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
-const json = (a) => replace(JSON.stringify(a));
-const log = (...args) => console.log(new Date(), ...args.map(a => (typeof a === 'function' ? a(replace) : a && typeof a === 'object' ? json(a) : a)));
-
 const aggregate = (streamName, input, snapshot = true, start = Date.now()) => input(({ coll, input }) => {
     const req = {
         aggregate: coll.collectionName,
@@ -1444,7 +1445,7 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
     });
     pipeline.push({
         $replaceWith: {
-            _id: 1,
+            _id: "$_id",
             ts: {
                 $cond: {
                     if: {

package/index.js

@@ -1195,6 +1195,11 @@ const firstWorksMerge = (iters) => {
     return iterator;
 };
 
+const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
+const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
+const json = (a) => replace(JSON.stringify(a));
+const log = (...args) => console.log(new Date(), ...args.map(a => (typeof a === 'function' ? a(replace) : a && typeof a === 'object' ? json(a) : a)));
+
 class Machine {
     sources;
     constructor(root) {
@@ -1220,6 +1225,7 @@ const runCont = async (it, cb) => {
     const { next, stop, clear } = it();
     const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
     if (!res.ok) {
+        log('error', res.err);
         return runCont(stop, cb);
     }
     const { cont, info } = res.next;
@@ -1379,11 +1385,6 @@ const $insert = (out) => $insertX(out, assertNotNull(root().of('after').expr()),
 }), x));
 const assertNotNull = (expr) => expr;
 
-const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
-const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
-const json = (a) => replace(JSON.stringify(a));
-const log = (...args) => console.log(new Date(), ...args.map(a => (typeof a === 'function' ? a(replace) : a && typeof a === 'object' ? json(a) : a)));
-
 const aggregate = (streamName, input, snapshot = true, start = Date.now()) => input(({ coll, input }) => {
     const req = {
         aggregate: coll.collectionName,
@@ -1446,7 +1447,7 @@ const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startA
     });
     pipeline.push({
         $replaceWith: {
-            _id: 1,
+            _id: "$_id",
             ts: {
                 $cond: {
                     if: {

package/package.json

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