@omegup/msync 0.0.96 → 0.0.98

package/index.d.ts

@@ -491,8 +491,8 @@ declare const $unwind: <TT extends O, K extends s, U extends doc>(k: AsLiteral<K
 type Allowed$2<K extends string> = Exclude<K, keyof (TS & ID)>;
 type Patch<V, KK extends StrKey<V> = StrKey<V>> = ((OPick<V, Allowed$2<KK>> & ID) | (Rec<Allowed$2<KK>, N> & ID)) & TS;
 type TakeDoc<V, E = ID, KK extends StrKey<V> = StrKey<V>> = OPick<V, Allowed$2<KK>> & E;
-declare const $simpleMerge: <V extends O>() => <Source extends doc, Out extends doc>(out: RWCollection<Out | Replace<Out, Patch<V>>, Out>, keys: ExprsExact<TakeDoc<V, unknown>, Source>) => StreamRunnerParam<Source, "out">;
-declare const $merge: <V extends O>() => <Out extends doc, SourcePart extends doc>(out: RWCollection<Out | Replace<Out, Patch<V>>, Out>, keys: ExprsExact<TakeDoc<V, unknown>, SourcePart>) => StreamRunnerParam<Delta<SourcePart>, "out">;
+declare const $simpleMerge: <V extends O>() => <Source extends doc, Out extends doc>(out: RWCollection<Out | Replace<Out, Patch<V>>, Out>, keys: ExprsExact<TakeDoc<V, unknown>, Source>, whenNotMatched?: "fail" | "discard") => StreamRunnerParam<Source, "out">;
+declare const $merge: <V extends O>() => <Out extends doc, SourcePart extends doc>(out: RWCollection<Out | Replace<Out, Patch<V>>, Out>, keys: ExprsExact<TakeDoc<V, unknown>, SourcePart>, whenNotMatched?: "fail" | "discard") => StreamRunnerParam<Delta<SourcePart>, "out">;
 
 type ND = {
     readonly deletedAt?: null;

package/index.esm.js

@@ -1364,7 +1364,7 @@ const $replaceWith = (expr) => ({
     lin: $replaceWith_(expr),
 });
 
-const $mergeX = (out, keys, f, map) => ({
+const $mergeX = (out, keys, f, map, whenNotMatched = 'fail') => ({
     raw: (first) => {
         const patch = mapExact(keys, v => sub(v, f));
         const or = field(omitPick().backward(spread(patch, {
@@ -1377,7 +1377,7 @@ const $mergeX = (out, keys, f, map) => ({
             .with($merge_({
             into: out,
             on: root().of('_id'),
-            whenNotMatched: 'fail',
+            whenNotMatched,
             stages: true,
             whenMatched: asStages([
                 { $replaceWith: { old: '$$ROOT', merged: { $mergeObjects: ['$$ROOT', '$$new'] } } },
@@ -1408,17 +1408,17 @@ const $mergeX = (out, keys, f, map) => ({
         ],
     }),
 });
-const $mergeId = () => (out, keys, id) => {
+const $mergeId = () => (out, keys, id, whenNotMatched = 'fail') => {
     const omRORec = omitRORec();
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
             touchedAt: ['touchedAt', current],
         }))), or);
-    });
+    }, whenNotMatched);
 };
-const $simpleMerge = () => (out, keys) => $mergeX(out, keys, root(), id$1);
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()));
+const $simpleMerge = () => (out, keys, whenNotMatched = 'fail') => $mergeX(out, keys, root(), id$1, whenNotMatched);
+const $merge = () => (out, keys, whenNotMatched = 'fail') => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()), whenNotMatched);
 const assertNotNull$1 = (expr) => expr;
 
 const $insertX = (out, expr, map, ext, extExpr) => {
@@ -1700,6 +1700,7 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
                 log('teardown done', `db['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
             if (!same) {
+                log('not same, new data', data);
                 await handleTeardown(exists ?? { data });
             }
             await after?.();

package/index.js

@@ -1366,7 +1366,7 @@ const $replaceWith = (expr) => ({
     lin: $replaceWith_(expr),
 });
 
-const $mergeX = (out, keys, f, map) => ({
+const $mergeX = (out, keys, f, map, whenNotMatched = 'fail') => ({
     raw: (first) => {
         const patch = mapExact(keys, v => sub(v, f));
         const or = field(omitPick().backward(spread(patch, {
@@ -1379,7 +1379,7 @@ const $mergeX = (out, keys, f, map) => ({
             .with($merge_({
             into: out,
             on: root().of('_id'),
-            whenNotMatched: 'fail',
+            whenNotMatched,
             stages: true,
             whenMatched: asStages([
                 { $replaceWith: { old: '$$ROOT', merged: { $mergeObjects: ['$$ROOT', '$$new'] } } },
@@ -1410,17 +1410,17 @@ const $mergeX = (out, keys, f, map) => ({
         ],
     }),
 });
-const $mergeId = () => (out, keys, id) => {
+const $mergeId = () => (out, keys, id, whenNotMatched = 'fail') => {
     const omRORec = omitRORec();
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
             touchedAt: ['touchedAt', current],
         }))), or);
-    });
+    }, whenNotMatched);
 };
-const $simpleMerge = () => (out, keys) => $mergeX(out, keys, root(), id$1);
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()));
+const $simpleMerge = () => (out, keys, whenNotMatched = 'fail') => $mergeX(out, keys, root(), id$1, whenNotMatched);
+const $merge = () => (out, keys, whenNotMatched = 'fail') => $mergeId()(out, keys, assertNotNull$1(root().of('before').of('_id').expr()), whenNotMatched);
 const assertNotNull$1 = (expr) => expr;
 
 const $insertX = (out, expr, map, ext, extExpr) => {
@@ -1702,6 +1702,7 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
                 log('teardown done', `db['${snapshotCollection.collectionName}'].drop()`, ...out);
             };
             if (!same) {
+                log('not same, new data', data);
                 await handleTeardown(exists ?? { data });
             }
             await after?.();

package/package.json

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