@omegup/msync 0.0.77 → 0.0.79

package/index.d.ts

@@ -480,10 +480,11 @@ declare const $set: <V extends O>() => <R extends O, C = unknown>(fields: MapO<V
 declare const $replaceWith: <T extends O, V extends O>(expr: Expr<V, T>) => DeltaStages<O, T, V> & LinStages<O, T, V>;
 
 type s$1 = string;
-declare const $unwindDelta: <K1 extends s$1, T extends doc, K2 extends s$1, U extends doc, Null extends null = never>(k1: AsLiteral<K1>, k2: AsLiteral<K2>, k: K1 | K2 | false, includeNull?: Null) => RawStages<Delta<Rec<K1, T>>, Delta<Rec<K1, T> & Rec<K2, Arr<U>>>, Delta<Rec<K1, T> & Rec<K2, U | Null> & ID>>;
+declare const $unwindDelta: <K1 extends s$1, T extends doc, K2 extends s$1, U extends doc, Null extends null = never>(k1: AsLiteral<K1>, k2: AsLiteral<K2>, k: K1 | K2 | false, includeNull?: Null, middle?: string) => RawStages<Delta<Rec<K1, T>>, Delta<Rec<K1, T> & Rec<K2, Arr<U>>>, Delta<Rec<K1, T> & Rec<K2, U | Null> & ID>>;
 
 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 TOf<TT, K extends string> = doc & Omit<TT, K>;
+declare const $unwind: <TT extends O, K extends s, U extends doc>(k: AsLiteral<K>, dict: RORec<K, "key">, middle: string) => DeltaStages<O, TOf<TT, K> & Rec<K, Arr<U>>, TOf<TT, K> & Rec<K, U>>;
 
 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;

package/index.esm.js

@@ -932,7 +932,7 @@ const dualIn = operator();
 const $in = dualIn('$in');
 const $nin = dualIn('$nin');
 
-const $unwindDelta = (k1, k2, k, includeNull) => {
+const $unwindDelta = (k1, k2, k, includeNull, middle) => {
     const outer = includeNull === null;
     const newItems = {
         $filter: {
@@ -978,7 +978,7 @@ const $unwindDelta = (k1, k2, k, includeNull) => {
         },
     };
     const ifNull = (k, part, str = `$${k}.${part}._id`) => outer && k == k2 ? { $ifNull: [str, 'null'] } : str;
-    const interDot = ([a, b]) => [a, '.', b];
+    const interDot = ([a, b]) => [a, middle ?? '.', b];
     const partReplace = (part) => ({
         $cond: {
             if: { $or: [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }] },
@@ -1059,23 +1059,32 @@ const $unwindDelta = (k1, k2, k, includeNull) => {
                 after: partReplace('after'),
             },
         },
+        ...(!k && middle
+            ? [
+                {
+                    $set: { _id: { $ifNull: ['$before._id', '$after._id'] } },
+                },
+            ]
+            : []),
     ]))
         .with($match_($expr(ne(part('before'))(part('after'))))).stages;
     return stages;
 };
 
-const $unwind = (k, dict) => ({
-    delta: link()
-        .with($replaceWithDelta(field({
-        left: ['left', root().expr()],
-        right: ['right', root().of(k).expr()],
-    })))
-        .with($unwindDelta('left', 'right', false))
-        .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
-        key: root().of('right').expr(),
-    }, dict)))).stages,
-    raw: $unwind1(k),
-});
+const $unwind = (k, dict, middle) => {
+    return {
+        delta: link()
+            .with($replaceWithDelta(field({
+            left: ['left', root().expr()],
+            right: ['right', root().of(k).expr()],
+        })))
+            .with($unwindDelta('left', 'right', false, undefined, middle))
+            .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
+            key: root().of('right').expr(),
+        }, dict)))).stages,
+        raw: $unwind1(k),
+    };
+};
 
 const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull) => {
     return link()

package/index.js

@@ -934,7 +934,7 @@ const dualIn = operator();
 const $in = dualIn('$in');
 const $nin = dualIn('$nin');
 
-const $unwindDelta = (k1, k2, k, includeNull) => {
+const $unwindDelta = (k1, k2, k, includeNull, middle) => {
     const outer = includeNull === null;
     const newItems = {
         $filter: {
@@ -980,7 +980,7 @@ const $unwindDelta = (k1, k2, k, includeNull) => {
         },
     };
     const ifNull = (k, part, str = `$${k}.${part}._id`) => outer && k == k2 ? { $ifNull: [str, 'null'] } : str;
-    const interDot = ([a, b]) => [a, '.', b];
+    const interDot = ([a, b]) => [a, middle ?? '.', b];
     const partReplace = (part) => ({
         $cond: {
             if: { $or: [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }] },
@@ -1061,23 +1061,32 @@ const $unwindDelta = (k1, k2, k, includeNull) => {
                 after: partReplace('after'),
             },
         },
+        ...(!k && middle
+            ? [
+                {
+                    $set: { _id: { $ifNull: ['$before._id', '$after._id'] } },
+                },
+            ]
+            : []),
     ]))
         .with($match_($expr(ne(part('before'))(part('after'))))).stages;
     return stages;
 };
 
-const $unwind = (k, dict) => ({
-    delta: link()
-        .with($replaceWithDelta(field({
-        left: ['left', root().expr()],
-        right: ['right', root().of(k).expr()],
-    })))
-        .with($unwindDelta('left', 'right', false))
-        .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
-        key: root().of('right').expr(),
-    }, dict)))).stages,
-    raw: $unwind1(k),
-});
+const $unwind = (k, dict, middle) => {
+    return {
+        delta: link()
+            .with($replaceWithDelta(field({
+            left: ['left', root().expr()],
+            right: ['right', root().of(k).expr()],
+        })))
+            .with($unwindDelta('left', 'right', false, undefined, middle))
+            .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
+            key: root().of('right').expr(),
+        }, dict)))).stages,
+        raw: $unwind1(k),
+    };
+};
 
 const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull) => {
     return link()

package/package.json

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