@omegup/msync 0.0.73 → 0.0.75

package/index.d.ts

@@ -370,7 +370,7 @@ type OPick<V, K extends StrKey<V>, E extends StrKey<V> = never> = O & Pick<V, K
 type OPickD<V extends Model, K extends StrKey<V>> = OPick<V, K, 'deletedAt' | '_id'>;
 type View<V extends Model, K extends StrKey<V>> = {
     collection: ReadonlyCollection<V | Del>;
-    projection: ExactKeys<K>;
+    projection: ExactKeys<K> | null;
     match?: Expr<boolean, OPickD<V, K>>;
     hardMatch?: Query<V>;
 };

package/index.esm.js

@@ -1239,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) {
-        console.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, stop: _, 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 } });
@@ -1446,7 +1447,7 @@ const addTeardown = (it, tr) => {
 const changeKeys = ['fullDocument', 'fullDocumentBeforeChange'];
 const subQ = (a, f) => ({ raw: g => a.raw(g.with(f)) });
 const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startAt, streamName) => {
-    const projection = { ...mapExactToObject(p, v => v), deletedAt: 1 };
+    const projection = p ? { ...mapExactToObject(p, v => v), deletedAt: 1 } : 1;
     const pipeline = [];
     if (m) {
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));
@@ -1513,19 +1514,19 @@ const actions = {
 
 const getFirstStages = (view) => {
     const { projection, hardMatch: pre, match } = view;
-    const projectInput = $project_(spread(projection, {
+    const projectInput = projection && $project_(spread(projection, {
         deletedAt: ['deletedAt', 1],
         _id: ['_id', 1],
     }));
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
-    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const firstStages = (lastTS, keepNulls = false) => {
         const hardQuery = $and(lastTS
             ? root().of('touchedAt').has($gtTs(lastTS.ts))
             : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), keepNulls ? pre : hardMatch);
-        return link()
-            .with($match_(hardQuery))
-            .with(projectInput);
+        const ln = link()
+            .with($match_(hardQuery));
+        return (projectInput ? ln.with(projectInput) : ln);
     };
     return { firstStages, hardMatch };
 };
@@ -1731,8 +1732,8 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
-    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1744,17 +1745,16 @@ const executes$1 = (view, input, streamName) => {
         name: 'touchedAt_' + new UUID().toString('base64'),
     });
     const last = db.collection('__last');
-    const projectInput = $project_(spread(projection, {
+    const projectInput = projection && $project_(spread(projection, {
         deletedAt: ['deletedAt', 1],
         _id: ['_id', 1],
     }));
     const notDeleted = root().of('deletedAt').has($eq(null));
     const stages = (lastTS) => {
         const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch, notDeleted, match && $expr(match));
-        return link()
-            .with($match_(hardQuery))
-            .with(projectInput)
-            .with(input);
+        const ln = link()
+            .with($match_(hardQuery));
+        return (projectInput ? ln.with(projectInput) : ln).with(input);
     };
     const run = (finalInput) => {
         const clear = async () => { };

package/index.js

@@ -1241,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) {
-        console.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, stop: _, 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 } });
@@ -1448,7 +1449,7 @@ const addTeardown = (it, tr) => {
 const changeKeys = ['fullDocument', 'fullDocumentBeforeChange'];
 const subQ = (a, f) => ({ raw: g => a.raw(g.with(f)) });
 const makeWatchStream = (db, { collection, projection: p, hardMatch: m }, startAt, streamName) => {
-    const projection = { ...mapExactToObject(p, v => v), deletedAt: 1 };
+    const projection = p ? { ...mapExactToObject(p, v => v), deletedAt: 1 } : 1;
     const pipeline = [];
     if (m) {
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));
@@ -1515,19 +1516,19 @@ const actions = {
 
 const getFirstStages = (view) => {
     const { projection, hardMatch: pre, match } = view;
-    const projectInput = $project_(spread(projection, {
+    const projectInput = projection && $project_(spread(projection, {
         deletedAt: ['deletedAt', 1],
         _id: ['_id', 1],
     }));
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
-    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const firstStages = (lastTS, keepNulls = false) => {
         const hardQuery = $and(lastTS
             ? root().of('touchedAt').has($gtTs(lastTS.ts))
             : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), keepNulls ? pre : hardMatch);
-        return link()
-            .with($match_(hardQuery))
-            .with(projectInput);
+        const ln = link()
+            .with($match_(hardQuery));
+        return (projectInput ? ln.with(projectInput) : ln);
     };
     return { firstStages, hardMatch };
 };
@@ -1733,8 +1734,8 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
-    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1746,17 +1747,16 @@ const executes$1 = (view, input, streamName) => {
         name: 'touchedAt_' + new mongodb.UUID().toString('base64'),
     });
     const last = db.collection('__last');
-    const projectInput = $project_(spread(projection, {
+    const projectInput = projection && $project_(spread(projection, {
         deletedAt: ['deletedAt', 1],
         _id: ['_id', 1],
     }));
     const notDeleted = root().of('deletedAt').has($eq(null));
     const stages = (lastTS) => {
         const hardQuery = $and(lastTS && root().of('touchedAt').has($gteTs(lastTS.ts)), hardMatch, notDeleted, match && $expr(match));
-        return link()
-            .with($match_(hardQuery))
-            .with(projectInput)
-            .with(input);
+        const ln = link()
+            .with($match_(hardQuery));
+        return (projectInput ? ln.with(projectInput) : ln).with(input);
     };
     const run = (finalInput) => {
         const clear = async () => { };

package/package.json

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