@omegup/msync 0.0.78 → 0.0.80

package/index.d.ts

@@ -483,7 +483,8 @@ 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, 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">, middle?: string) => 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"> & RORec<"_id", "id">, 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

@@ -313,10 +313,10 @@ const toInt = (expr) => asExpr({
     raw: f => asExprRaw({ $toInt: expr.raw(f).get() }),
 });
 const fieldM = (expr, m) => asExpr({
-    raw: (f) => asExprRaw(Object.fromEntries(Object.entries(m).map(([dom, ref]) => [
-        dom,
-        expr[ref].raw(f).get(),
-    ]))),
+    raw: (f) => asExprRaw(Object.fromEntries(Object.entries(m).flatMap(([dom, ref]) => expr[ref] ? [[
+            dom,
+            expr[ref].raw(f).get(),
+        ]] : []))),
 });
 const mergeExact = (...[exprsExact1, exprsExact2]) => spread(exprsExact1, exprsExact2);
 const mergeExact0 = (...[exprsExact1, exprsExact2]) => spread0(exprsExact1, exprsExact2);
@@ -1059,30 +1059,28 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                 after: partReplace('after'),
             },
         },
-        ...(!k && middle
-            ? [
-                {
-                    $set: { _id: { $ifNull: ['$before._id', '$after._id'] } },
-                },
-            ]
-            : []),
+        ...(!k && middle ? [{ $set: { _id: { $ifNull: ['$before._id', '$after._id'] } } }] : []),
     ]))
         .with($match_($expr(ne(part('before'))(part('after'))))).stages;
     return stages;
 };
 
-const $unwind = (k, dict, middle) => ({
-    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 $unwind = (k, dict, middle) => {
+    return {
+        delta: link()
+            .with($replaceWithDelta(field({
+            _id: ['_id', root().of('_id').expr()],
+            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(),
+            id: root().of('_id').expr(),
+        }, dict)))).stages,
+        raw: $unwind1(k),
+    };
+};
 
 const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull) => {
     return link()

package/index.js

@@ -315,10 +315,10 @@ const toInt = (expr) => asExpr({
     raw: f => asExprRaw({ $toInt: expr.raw(f).get() }),
 });
 const fieldM = (expr, m) => asExpr({
-    raw: (f) => asExprRaw(Object.fromEntries(Object.entries(m).map(([dom, ref]) => [
-        dom,
-        expr[ref].raw(f).get(),
-    ]))),
+    raw: (f) => asExprRaw(Object.fromEntries(Object.entries(m).flatMap(([dom, ref]) => expr[ref] ? [[
+            dom,
+            expr[ref].raw(f).get(),
+        ]] : []))),
 });
 const mergeExact = (...[exprsExact1, exprsExact2]) => spread(exprsExact1, exprsExact2);
 const mergeExact0 = (...[exprsExact1, exprsExact2]) => spread0(exprsExact1, exprsExact2);
@@ -1061,30 +1061,28 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                 after: partReplace('after'),
             },
         },
-        ...(!k && middle
-            ? [
-                {
-                    $set: { _id: { $ifNull: ['$before._id', '$after._id'] } },
-                },
-            ]
-            : []),
+        ...(!k && middle ? [{ $set: { _id: { $ifNull: ['$before._id', '$after._id'] } } }] : []),
     ]))
         .with($match_($expr(ne(part('before'))(part('after'))))).stages;
     return stages;
 };
 
-const $unwind = (k, dict, middle) => ({
-    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 $unwind = (k, dict, middle) => {
+    return {
+        delta: link()
+            .with($replaceWithDelta(field({
+            _id: ['_id', root().of('_id').expr()],
+            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(),
+            id: root().of('_id').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.78",
+    "version": "0.0.80",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",