@omegup/msync 0.0.6 → 0.0.8

package/index.d.ts

@@ -466,9 +466,10 @@ declare const $unwindDelta: <K1 extends s$1, T extends doc, K2 extends s$1, U ex
 type s = string;
 declare const $unwind: <T extends doc, K extends s, U extends doc>(k: AsLiteral<K>, dict: RORec<K, "key">) => DeltaStages<O, T & Rec<K, Arr<U>>, T & Rec<K, U>>;
 
+type OutInputE<T, E, A = T | null> = ID & Rec<'after', A> & E;
 type Allowed$2<K extends string> = Exclude<K, keyof (TS & ID)>;
 type Patch<V, KK extends StrKey<V>> = ((OPick<V, Allowed$2<KK>> & ID) | (Rec<Allowed$2<KK>, N> & ID)) & TS;
-declare const $merge: <V extends Model & ID>() => <KK extends StrKey<V>, Out extends doc>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>) => RawStages<unknown, OutInput<OPick<V, Allowed$2<KK>> & ID>, "out">;
+declare const $merge: <V extends Model & ID>() => <KK extends StrKey<V>, Out extends doc, E = unknown>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>, id: Expr<string, OutInputE<OPick<V, Allowed$2<KK>> & ID, E, null>>) => RawStages<unknown, OutInputE<OPick<V, Allowed$2<KK>> & ID, E>, "out">;
 
 type ND = {
     readonly deletedAt?: null;

package/index.esm.js

@@ -1010,11 +1010,11 @@ const $replaceWith = (expr) => ({
     lin: $replaceWith_(expr),
 });
 
-const $merge = () => (out, keys) => {
+const $merge = () => (out, keys, id) => {
     const omRORec = omitRORec();
     const patch = mapExactToObject(keys, (_, k) => [k, root().of('after').of(k).expr()]);
     const replacer = ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', id],
         touchedAt: ['touchedAt', current],
     }))), field(omitPick().backward(spread(patch, {
         _id: ['_id', root().of('after').of('_id').expr()],
@@ -1088,7 +1088,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) => {
-    const projection = mapExactToObject(p, v => v);
+    const projection = { ...mapExactToObject(p, v => v), deletedAt: 1 };
     const pipeline = [];
     if (m) {
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));

package/index.js

@@ -1012,11 +1012,11 @@ const $replaceWith = (expr) => ({
     lin: $replaceWith_(expr),
 });
 
-const $merge = () => (out, keys) => {
+const $merge = () => (out, keys, id) => {
     const omRORec = omitRORec();
     const patch = mapExactToObject(keys, (_, k) => [k, root().of('after').of(k).expr()]);
     const replacer = ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', id],
         touchedAt: ['touchedAt', current],
     }))), field(omitPick().backward(spread(patch, {
         _id: ['_id', root().of('after').of('_id').expr()],
@@ -1090,7 +1090,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) => {
-    const projection = mapExactToObject(p, v => v);
+    const projection = { ...mapExactToObject(p, v => v), deletedAt: 1 };
     const pipeline = [];
     if (m) {
         const q = $or(...changeKeys.map((k) => subQ(m, root().of(k))));

package/package.json

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