@omegup/msync 0.0.72 → 0.0.74

package/index.esm.js

@@ -1217,11 +1217,6 @@ 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) {
@@ -1244,19 +1239,20 @@ class Machine {
 }
 const wrap = (root) => root;
 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);
-        process.exit(1);
-        return runCont(stop, cb);
-    }
-    const { cont, info } = res.next;
-    if (cb?.(info)) {
-        await clear();
-        throw new Error('Machine stopped');
+    while (true) {
+        const { next, clear } = it();
+        const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
+        if (!res.ok) {
+            console.error(res.err);
+            process.exit(1);
+        }
+        const { cont, info } = res.next;
+        if (cb?.(info)) {
+            await clear();
+            throw new Error('Machine stopped');
+        }
+        it = cont;
     }
-    return runCont(cont, cb);
 };
 
 const merge = ({ lsource: L, rsource: R, }) => mergeIterators({ sources: { L, R } });
@@ -1408,6 +1404,11 @@ 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,

package/index.js

@@ -1219,11 +1219,6 @@ 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) {
@@ -1246,19 +1241,20 @@ class Machine {
 }
 const wrap = (root) => root;
 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);
-        process.exit(1);
-        return runCont(stop, cb);
-    }
-    const { cont, info } = res.next;
-    if (cb?.(info)) {
-        await clear();
-        throw new Error('Machine stopped');
+    while (true) {
+        const { next, clear } = it();
+        const res = await next.then(next => ({ ok: true, next }), err => ({ ok: false, err }));
+        if (!res.ok) {
+            console.error(res.err);
+            process.exit(1);
+        }
+        const { cont, info } = res.next;
+        if (cb?.(info)) {
+            await clear();
+            throw new Error('Machine stopped');
+        }
+        it = cont;
     }
-    return runCont(cont, cb);
 };
 
 const merge = ({ lsource: L, rsource: R, }) => mergeIterators({ sources: { L, R } });
@@ -1410,6 +1406,11 @@ 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,

package/package.json

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