@omegup/msync 0.0.45 → 0.0.47

package/index.esm.js

@@ -1276,18 +1276,18 @@ const $outerLookup = (p, outer) => (l) => $lookup1({
     left: l(emptyDelta()),
 }, outer);
 
-const make = (alter) => {
-    return (op, args) => alter(op, args.filter(defined));
+const filterUndefined = (applyOperator) => {
+    return (op, args) => applyOperator(op, args.filter(defined));
 };
-const combine = (op, make) => (...args) => {
-    const q = make(op, args);
-    return q && { raw: field => q(x => x.raw(field)) };
+const combine = (op, applyOperatorToPreItems) => (...args) => {
+    const mapToItems = applyOperatorToPreItems(op, args);
+    return mapToItems && { raw: field => mapToItems(x => x.raw(field)) };
 };
-const all = (op, x) => (x.length === 0 ? undefined : f => ({ [op]: x.map(f) }));
+const all = (op, x) => x.length === 0 ? undefined : f => ({ [op]: x.map(f) });
 const first = (op, x) => (x.length === 1 ? f => f(x[0]) : all(op, x));
-const $and = combine('$and', make(first));
-const $nor = combine('$nor', make(all));
-const $or = combine('$or', make(first));
+const $and = combine('$and', filterUndefined(first));
+const $nor = combine('$nor', filterUndefined(all));
+const $or = combine('$or', filterUndefined(first));
 
 const $matchDelta = (query) => concatStages($replaceWithDelta(ite(query, root().expr(), nil)), $match_($or(root().of('after').has($ne(null)), root().of('before').has($ne(null)))));
 
@@ -1485,6 +1485,7 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error(`streamName ${streamName} already used`);
     const { collection, projection, hardMatch, match } = view;
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($ne(null)) : null));
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1493,7 +1494,7 @@ const executes$1 = (view, input, streamName) => {
     });
     createIndex(collection, { touchedAt: 1 }, hardMatch
         ? {
-            partialFilterExpression: hardMatch,
+            partialFilterExpression: hardMatch.raw(root()),
             name: 'touchedAt_hard_' + new UUID().toString('base64'),
         }
         : {}).catch(e => e.code == 86 || Promise.reject(e));
@@ -1568,7 +1569,7 @@ const executes$1 = (view, input, streamName) => {
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
                 ? root().of('touchedAt').has($gteTs(lastTS.ts))
-                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch, ...removeNotYetSynchronizedFields);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
@@ -1637,7 +1638,10 @@ const executes$1 = (view, input, streamName) => {
         const step8 = (l) => {
             return nextData(l.aggResult.cursor.firstBatch)(() => l.stream
                 .tryNext()
-                .catch(err => { log('restarting', err); return 1; })
+                .catch(err => {
+                log('restarting', err);
+                return 1;
+            })
                 .then(doc => (doc ? next(step2, 'restart') : step8(l))), 'wait for change');
         };
         return stop;

package/index.js

@@ -1278,18 +1278,18 @@ const $outerLookup = (p, outer) => (l) => $lookup1({
     left: l(emptyDelta()),
 }, outer);
 
-const make = (alter) => {
-    return (op, args) => alter(op, args.filter(defined));
+const filterUndefined = (applyOperator) => {
+    return (op, args) => applyOperator(op, args.filter(defined));
 };
-const combine = (op, make) => (...args) => {
-    const q = make(op, args);
-    return q && { raw: field => q(x => x.raw(field)) };
+const combine = (op, applyOperatorToPreItems) => (...args) => {
+    const mapToItems = applyOperatorToPreItems(op, args);
+    return mapToItems && { raw: field => mapToItems(x => x.raw(field)) };
 };
-const all = (op, x) => (x.length === 0 ? undefined : f => ({ [op]: x.map(f) }));
+const all = (op, x) => x.length === 0 ? undefined : f => ({ [op]: x.map(f) });
 const first = (op, x) => (x.length === 1 ? f => f(x[0]) : all(op, x));
-const $and = combine('$and', make(first));
-const $nor = combine('$nor', make(all));
-const $or = combine('$or', make(first));
+const $and = combine('$and', filterUndefined(first));
+const $nor = combine('$nor', filterUndefined(all));
+const $or = combine('$or', filterUndefined(first));
 
 const $matchDelta = (query) => concatStages($replaceWithDelta(ite(query, root().expr(), nil)), $match_($or(root().of('after').has($ne(null)), root().of('before').has($ne(null)))));
 
@@ -1487,6 +1487,7 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error(`streamName ${streamName} already used`);
     const { collection, projection, hardMatch, match } = view;
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($ne(null)) : null));
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1495,7 +1496,7 @@ const executes$1 = (view, input, streamName) => {
     });
     createIndex(collection, { touchedAt: 1 }, hardMatch
         ? {
-            partialFilterExpression: hardMatch,
+            partialFilterExpression: hardMatch.raw(root()),
             name: 'touchedAt_hard_' + new mongodb.UUID().toString('base64'),
         }
         : {}).catch(e => e.code == 86 || Promise.reject(e));
@@ -1570,7 +1571,7 @@ const executes$1 = (view, input, streamName) => {
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
                 ? root().of('touchedAt').has($gteTs(lastTS.ts))
-                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch, ...removeNotYetSynchronizedFields);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
@@ -1639,7 +1640,10 @@ const executes$1 = (view, input, streamName) => {
         const step8 = (l) => {
             return nextData(l.aggResult.cursor.firstBatch)(() => l.stream
                 .tryNext()
-                .catch(err => { log('restarting', err); return 1; })
+                .catch(err => {
+                log('restarting', err);
+                return 1;
+            })
                 .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.45",
+    "version": "0.0.47",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",