@omegup/msync 0.0.79 → 0.0.81

package/index.d.ts

@@ -484,7 +484,7 @@ declare const $unwindDelta: <K1 extends s$1, T extends doc, K2 extends s$1, U ex
 
 type s = string;
 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>>;
+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,13 +1059,7 @@ 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;
@@ -1075,12 +1069,14 @@ 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),
     };
@@ -1158,7 +1154,10 @@ const createIndex = async (collection, indexSpec, options) => {
     }
 };
 
-const patch = (x, k, v) => ({ ...x, [k]: v });
+const patch = ({ ...x }, k, v) => {
+    delete x[k];
+    return { ...x, [k]: v };
+};
 const restart = (sources) => {
     return map(sources, x => x.stop());
 };
@@ -1646,8 +1645,8 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
             await after?.();
             return nextData([])(async () => {
                 await new Promise(resolve => setTimeout(resolve, 1000));
-                return step3(same)();
-            }, 'clone into new collection');
+                return next(step3(same), 'clone into new collection');
+            }, 'wait for clone into new collection');
         };
         const step3 = (lastTS) => async () => {
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);

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,13 +1061,7 @@ 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;
@@ -1077,12 +1071,14 @@ 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),
     };
@@ -1160,7 +1156,10 @@ const createIndex = async (collection, indexSpec, options) => {
     }
 };
 
-const patch = (x, k, v) => ({ ...x, [k]: v });
+const patch = ({ ...x }, k, v) => {
+    delete x[k];
+    return { ...x, [k]: v };
+};
 const restart = (sources) => {
     return map(sources, x => x.stop());
 };
@@ -1648,8 +1647,8 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
             await after?.();
             return nextData([])(async () => {
                 await new Promise(resolve => setTimeout(resolve, 1000));
-                return step3(same)();
-            }, 'clone into new collection');
+                return next(step3(same), 'clone into new collection');
+            }, 'wait for clone into new collection');
         };
         const step3 = (lastTS) => async () => {
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);

package/package.json

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