@omegup/msync 0.0.74 → 0.0.76

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>;
 };
@@ -581,6 +581,8 @@ declare const last: <T, D, C>(expr: Expr<Arr<T>, D, C>) => Expr<T | null, D, C>;
 type NullToOBJ<N extends null> = N extends null ? O : N;
 declare const mergeObjects: <T1, T2, D, C = unknown, N extends null = never>(exprs_0: Expr<T1 | N, D, C>, exprs_1: Expr<T2, D, C>) => Expr<(T1 | NullToOBJ<N>) & T2, D, C>;
 declare const anyElementTrue: <D, C = unknown>(expr: Expr<Arr<boolean>, D, C>) => Expr<boolean, D, C>;
+type Reduce<T, V> = RORec<'value', V> & RORec<'this', T>;
+declare const $reduce: <T, V, D, C>(input: Expr<Arr<T>, D, C>, initialValue: Expr<V, D, C>, inExpr: Expr<V, D, C & Reduce<T, V>>) => Expr<V, D, C>;
 declare const slice: <T, D, C>(array: Expr<Arr<T>, D, C>, start: Expr<number, D, C>, end: Expr<number, D, C>) => Expr<Arr<T>, D, C>;
 declare const except: <T, D, C>(a: Expr<Arr<T>, D, C>, b: Expr<Arr<T>, D, C>) => Expr<Arr<T>, D, C>;
 
@@ -690,4 +692,4 @@ declare const enablePreAndPostImages: <T extends doc>(coll: Collection<T>) => Pr
 declare const prepare: (testName?: string) => Promise<MongoClient$1>;
 declare const makeCol: <T extends ID>(docs: readonly OptionalUnlessRequiredId<T>[], database: Db, name?: string) => Promise<Collection<T>>;
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type MongoTypeNames, type N, type NoRaw, type NullToOBJ, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, type notArr, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type MongoTypeNames, type N, type NoRaw, type NullToOBJ, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, type notArr, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.esm.js

@@ -414,7 +414,7 @@ const mergeObjects = (...exprs) => asExpr({
 const anyElementTrue = (expr) => asExpr({
     raw: f => asExprRaw({ $anyElementTrue: expr.raw(f).get() }),
 });
-const reduce = (input, initialValue, inExpr) => asExpr({
+const $reduce = (input, initialValue, inExpr) => asExpr({
     raw: f => asExprRaw({
         $reduce: {
             input: input.raw(f).get(),
@@ -442,7 +442,7 @@ const except = (a, b) => {
     return $let({
         res: [
             'res',
-            reduce(a, field({ out: ['out', array()], except: ['except', b] }), $let({
+            $reduce(a, field({ out: ['out', array()], except: ['except', b] }), $let({
                 indexInExcept: ['indexInExcept', indexOfArray(except, curr)],
             }, ite(gte(indexInExcept, val(0)), field({
                 out: ['out', out],
@@ -1240,7 +1240,7 @@ class Machine {
 const wrap = (root) => root;
 const runCont = async (it, cb) => {
     while (true) {
-        const { next, clear } = it();
+        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);
@@ -1447,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))));
@@ -1514,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 };
 };
@@ -1732,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({
@@ -1745,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 () => { };
@@ -1900,4 +1899,4 @@ const makeCol = async (docs, database, name) => {
     }
 };
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.js

@@ -416,7 +416,7 @@ const mergeObjects = (...exprs) => asExpr({
 const anyElementTrue = (expr) => asExpr({
     raw: f => asExprRaw({ $anyElementTrue: expr.raw(f).get() }),
 });
-const reduce = (input, initialValue, inExpr) => asExpr({
+const $reduce = (input, initialValue, inExpr) => asExpr({
     raw: f => asExprRaw({
         $reduce: {
             input: input.raw(f).get(),
@@ -444,7 +444,7 @@ const except = (a, b) => {
     return $let({
         res: [
             'res',
-            reduce(a, field({ out: ['out', array()], except: ['except', b] }), $let({
+            $reduce(a, field({ out: ['out', array()], except: ['except', b] }), $let({
                 indexInExcept: ['indexInExcept', indexOfArray(except, curr)],
             }, ite(gte(indexInExcept, val(0)), field({
                 out: ['out', out],
@@ -1242,7 +1242,7 @@ class Machine {
 const wrap = (root) => root;
 const runCont = async (it, cb) => {
     while (true) {
-        const { next, clear } = it();
+        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);
@@ -1449,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))));
@@ -1516,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 };
 };
@@ -1734,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({
@@ -1747,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 () => { };
@@ -1941,6 +1940,7 @@ exports.$or = $or;
 exports.$outerLookup = $outerLookup;
 exports.$pushDict = $pushDict;
 exports.$rand = $rand;
+exports.$reduce = $reduce;
 exports.$replaceWith = $replaceWith;
 exports.$set = $set;
 exports.$simpleInsert = $simpleInsert;

package/package.json

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