@omegup/msync 0.1.11 → 0.1.13

package/index.d.ts

@@ -507,7 +507,8 @@ type ND$1 = {
     readonly deletedAt?: null;
 };
 type SafeE$1<E> = Omit<E, `$${string}` | keyof ID>;
-declare const getWhenMatched: <Out extends Model, P extends Model, K extends keyof IsDeleted>(whenNotMatched: "discard" | "fail" | "insert") => RawStages<O, Out, Out | Replace<Out, P>, RORec<"new", Replace<P, RORec<K, Timestamp>>>>;
+declare const getWhenMatchedForMerge: <Out extends Model, P extends Model, K extends keyof IsDeleted>(whenNotMatched: "discard" | "fail" | "insert") => RawStages<O, Out, Out | Replace<Out, P>, RORec<"new", Replace<P, RORec<K, Timestamp>>>>;
+declare const getWhenMatched: <Out extends Model, P extends Model, K extends keyof IsDeleted>(whenNotMatched: "discard" | "fail" | "insert") => RawStages<O, Rec<"old" | "merged", Out | Replace<Out, P>>, Out | Replace<Out, P>>;
 type MergeCollection<V extends O, Out extends Model> = {
     coll: RWCollection<Out | Replace<Out, Patch<V>> | Replace<Patch<V>, IsDeleted>, Out>;
     whenNotMatched: 'discard';
@@ -733,4 +734,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, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, type ExactKeys, 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 Patch, 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, getWhenMatched, gt, gte, inArray, isArray, ite, type jsonPrim, 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, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, type ExactKeys, 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 Patch, 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, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, type jsonPrim, 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

@@ -811,16 +811,8 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
 ]);
 const $merge2 = (args) => $merge_(args);
 
-const getWhenMatched = (whenNotMatched) => {
-    const setDeleted = whenNotMatched === 'discard';
-    const orNull = (e) => (setDeleted ? $ifNull(e, nil) : e);
-    const preMergeOld = setDeleted
-        ? mergeObjects(root().of('old').expr(), field({
-            deletedAt: ['deletedAt', orNull(root().of('old').of('deletedAt').expr())],
-            touchedAt: ['touchedAt', root().of('merged').of('touchedAt').expr()],
-        }))
-        : root().of('old').expr();
-    const same = eq(preMergeOld)(root().of('merged').expr());
+const getWhenMatchedForMerge = (whenNotMatched) => {
+    const orNull = (e) => whenNotMatched === 'discard' ? $ifNull(e, nil) : e;
     const newOrOld = whenNotMatched ===
         'insert'
         ? ctx()('new')
@@ -833,7 +825,18 @@ const getWhenMatched = (whenNotMatched) => {
         old: ['old', root().expr()],
         merged: ['merged', merged],
     })))
-        .with($replaceWith_(ite(same, root().of('old').expr(), root().of('merged').expr()))).stages;
+        .with(getWhenMatched(whenNotMatched)).stages;
+};
+const getWhenMatched = (whenNotMatched) => {
+    const orNull = (e) => whenNotMatched === 'discard' ? $ifNull(e, nil) : e;
+    const preMergeOld = whenNotMatched !== 'fail'
+        ? mergeObjects(root().of('old').expr(), field({
+            deletedAt: ['deletedAt', orNull(root().of('old').of('deletedAt').expr())],
+            touchedAt: ['touchedAt', root().of('merged').of('touchedAt').expr()],
+        }))
+        : root().of('old').expr();
+    const same = eq(preMergeOld)(root().of('merged').expr());
+    return link().with($replaceWith_(ite(same, root().of('old').expr(), root().of('merged').expr()))).stages;
 };
 const $mergeX = (out, keys, f, map, ext) => {
     const patch = mapExact(keys, v => sub(v, f));
@@ -853,14 +856,14 @@ const $mergeX = (out, keys, f, map, ext) => {
             on: root().of('_id'),
             whenNotMatched: 'insert',
             stages: true,
-            whenMatched: getWhenMatched(out.whenNotMatched),
+            whenMatched: getWhenMatchedForMerge(out.whenNotMatched),
         })).stages
         : link().with($merge_({
             into: out.coll,
             on: root().of('_id'),
             whenNotMatched: 'fail',
             stages: true,
-            whenMatched: getWhenMatched(out.whenNotMatched),
+            whenMatched: getWhenMatchedForMerge(out.whenNotMatched),
         })).stages;
     const teardown = (coll) => ({
         collection: coll,
@@ -897,9 +900,12 @@ const assertNotNull$1 = (expr) => expr;
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const e = extra;
-    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(first
+    const mergeOldWithNew = mapExact0(args, (v, k) => to(first
         ? ctx()('new').of(k).expr()
-        : v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
+        : v.merge(root().of('old').of(k).expr(), ctx()('new').of(k).expr())));
+    const mergeAggregates = $set_(set()({
+        merged: ['merged', set()(mergeOldWithNew)],
+    }));
     const gidPath = root().of(gid).expr();
     const mapId = (k, v) => map1(k, v);
     const F1 = {
@@ -914,18 +920,24 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     };
     const addExtra = mapExact0(e, to);
     const updater = set()(addExtra);
+    const whenMatched = getWhenMatched(out.whenNotMatched);
     return link()
         .with($set_(set()(addExtraAndMerge)))
         .with($merge_({
         ...out,
-        whenNotMatched: 'fail',
         on: root().of(gid),
         vars: { new: ['new', root().expr()] },
         stages: 'ctx',
         whenMatched: link()
+            .with($replaceWith_(field({ old: ['old', root().expr()], merged: ['merged', root().expr()] })))
             .with(mergeAggregates)
-            .with($set_(updater))
-            .with(getWhenMatched(out.whenNotMatched)).stages,
+            .with($set_(set()({
+            merged: [
+                'merged',
+                subUpdater(updater, root().of('merged')),
+            ],
+        })))
+            .with(whenMatched).stages,
     })).stages;
 };
 
@@ -1470,7 +1482,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
                 into: out,
                 on: root().of('_id'),
                 stages: true,
-                whenMatched: getWhenMatched('insert'),
+                whenMatched: getWhenMatchedForMerge('insert'),
                 whenNotMatched: 'insert',
             })).stages;
         },
@@ -1994,4 +2006,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, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $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, getWhenMatched, 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, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $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, getWhenMatched, getWhenMatchedForMerge, 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

@@ -813,16 +813,8 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
 ]);
 const $merge2 = (args) => $merge_(args);
 
-const getWhenMatched = (whenNotMatched) => {
-    const setDeleted = whenNotMatched === 'discard';
-    const orNull = (e) => (setDeleted ? $ifNull(e, nil) : e);
-    const preMergeOld = setDeleted
-        ? mergeObjects(root().of('old').expr(), field({
-            deletedAt: ['deletedAt', orNull(root().of('old').of('deletedAt').expr())],
-            touchedAt: ['touchedAt', root().of('merged').of('touchedAt').expr()],
-        }))
-        : root().of('old').expr();
-    const same = eq(preMergeOld)(root().of('merged').expr());
+const getWhenMatchedForMerge = (whenNotMatched) => {
+    const orNull = (e) => whenNotMatched === 'discard' ? $ifNull(e, nil) : e;
     const newOrOld = whenNotMatched ===
         'insert'
         ? ctx()('new')
@@ -835,7 +827,18 @@ const getWhenMatched = (whenNotMatched) => {
         old: ['old', root().expr()],
         merged: ['merged', merged],
     })))
-        .with($replaceWith_(ite(same, root().of('old').expr(), root().of('merged').expr()))).stages;
+        .with(getWhenMatched(whenNotMatched)).stages;
+};
+const getWhenMatched = (whenNotMatched) => {
+    const orNull = (e) => whenNotMatched === 'discard' ? $ifNull(e, nil) : e;
+    const preMergeOld = whenNotMatched !== 'fail'
+        ? mergeObjects(root().of('old').expr(), field({
+            deletedAt: ['deletedAt', orNull(root().of('old').of('deletedAt').expr())],
+            touchedAt: ['touchedAt', root().of('merged').of('touchedAt').expr()],
+        }))
+        : root().of('old').expr();
+    const same = eq(preMergeOld)(root().of('merged').expr());
+    return link().with($replaceWith_(ite(same, root().of('old').expr(), root().of('merged').expr()))).stages;
 };
 const $mergeX = (out, keys, f, map, ext) => {
     const patch = mapExact(keys, v => sub(v, f));
@@ -855,14 +858,14 @@ const $mergeX = (out, keys, f, map, ext) => {
             on: root().of('_id'),
             whenNotMatched: 'insert',
             stages: true,
-            whenMatched: getWhenMatched(out.whenNotMatched),
+            whenMatched: getWhenMatchedForMerge(out.whenNotMatched),
         })).stages
         : link().with($merge_({
             into: out.coll,
             on: root().of('_id'),
             whenNotMatched: 'fail',
             stages: true,
-            whenMatched: getWhenMatched(out.whenNotMatched),
+            whenMatched: getWhenMatchedForMerge(out.whenNotMatched),
         })).stages;
     const teardown = (coll) => ({
         collection: coll,
@@ -899,9 +902,12 @@ const assertNotNull$1 = (expr) => expr;
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const e = extra;
-    const mergeAggregates = $set_(set()(mapExact0(args, (v, k) => to(first
+    const mergeOldWithNew = mapExact0(args, (v, k) => to(first
         ? ctx()('new').of(k).expr()
-        : v.merge(root().of(k).expr(), ctx()('new').of(k).expr())))));
+        : v.merge(root().of('old').of(k).expr(), ctx()('new').of(k).expr())));
+    const mergeAggregates = $set_(set()({
+        merged: ['merged', set()(mergeOldWithNew)],
+    }));
     const gidPath = root().of(gid).expr();
     const mapId = (k, v) => map1(k, v);
     const F1 = {
@@ -916,18 +922,24 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     };
     const addExtra = mapExact0(e, to);
     const updater = set()(addExtra);
+    const whenMatched = getWhenMatched(out.whenNotMatched);
     return link()
         .with($set_(set()(addExtraAndMerge)))
         .with($merge_({
         ...out,
-        whenNotMatched: 'fail',
         on: root().of(gid),
         vars: { new: ['new', root().expr()] },
         stages: 'ctx',
         whenMatched: link()
+            .with($replaceWith_(field({ old: ['old', root().expr()], merged: ['merged', root().expr()] })))
             .with(mergeAggregates)
-            .with($set_(updater))
-            .with(getWhenMatched(out.whenNotMatched)).stages,
+            .with($set_(set()({
+            merged: [
+                'merged',
+                subUpdater(updater, root().of('merged')),
+            ],
+        })))
+            .with(whenMatched).stages,
     })).stages;
 };
 
@@ -1472,7 +1484,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
                 into: out,
                 on: root().of('_id'),
                 stages: true,
-                whenMatched: getWhenMatched('insert'),
+                whenMatched: getWhenMatchedForMerge('insert'),
                 whenNotMatched: 'insert',
             })).stages;
         },
@@ -2084,6 +2096,7 @@ exports.floor = floor;
 exports.from = from;
 exports.func = func;
 exports.getWhenMatched = getWhenMatched;
+exports.getWhenMatchedForMerge = getWhenMatchedForMerge;
 exports.gt = gt;
 exports.gte = gte;
 exports.inArray = inArray;

package/package.json

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