@omegup/msync 0.0.80 → 0.0.82

package/index.d.ts

@@ -449,7 +449,7 @@ type Denied<GID = never> = keyof (TS & ID) | GID;
 type GI<GG> = Exclude<GG, keyof TS>;
 declare const $groupMerge: <T extends O, Grp extends notArr, V extends O, GG extends string, EE = {}, Out extends Loose<Grp, V, GG> = Loose<Grp, V, GG>>(id: Expr<Grp, T>, args: DeltaAccumulators<T, O & Omit<V, Denied<GI<GG>>>>, out: MergeInto<Strict<Grp, V, GG, EE>, Out, WriteonlyCollection<Replace<Out, Strict<Grp, V, GG, EE>>>>, gid: AsLiteral<GI<GG>>, extra: ExprsExact<Extra<EE, V, GG>, V_Grp<V, GG, Grp>>, idPrefix?: string) => StreamRunnerParam<Delta<T>, "out">;
 declare const $groupId: <T extends O, V extends O, EE = {}, Out extends Loose<string, V, "_id"> = Loose<string, V, "_id">>(id: Expr<string, T>, args: DeltaAccumulators<T, O & Omit<V, Denied>>, out: RWCollection<Replace<Out, Strict<string, V, "_id", EE>>, Out>, extra: ExprsExact<Omit<EE, IdAndTsKeys | keyof Omit<V, IdAndTsKeys>>, doc & Omit<V, IdAndTsKeys>>) => StreamRunnerParam<Delta<T>, "out">;
-declare const $group: <T extends O, Grp extends notArr, V extends O, EE = {}, Out extends Loose<Grp, V, "_grp"> = Loose<Grp, V, "_grp">>(id: Expr<Grp, T>, args: DeltaAccumulators<T, O & Omit<V, Denied<"_grp">>>, out: RWCollection<Strict<Grp, V, "_grp", EE>, Out>, extra: ExprsExact<Omit<EE, IdAndTsKeys | "_grp" | keyof Omit<V, IdAndTsKeys | "_grp">>, Rec<"_grp", Grp> & Omit<V, IdAndTsKeys | "_grp">>, idPrefix?: string) => StreamRunnerParam<Delta<T>, "out">;
+declare const $group: <T extends O, Grp extends notArr, V extends O, EE = {}, Out extends Loose<Grp, V, "_grp"> = Loose<Grp, V, "_grp">>(id: Expr<Grp, T>, args: DeltaAccumulators<T, O & Omit<V, Denied<"_grp">>>, out: RWCollection<Strict<Grp, V, "_grp", EE>, Out>, extra: ExprsExact<Omit<EE, IdAndTsKeys | "_grp" | Exclude<keyof V, IdAndTsKeys | "_grp">>, Rec<"_grp", Grp> & Omit<V, IdAndTsKeys | "_grp">>, idPrefix?: string) => StreamRunnerParam<Delta<T>, "out">;
 
 type Params<As extends string, LQ extends O, RQ extends O, RE extends RQ, S extends notArr> = {
     localField: Field<LQ, S>;
@@ -480,7 +480,7 @@ 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, middle?: string) => 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, N1 extends null = never, N2 extends null = never>(k1: AsLiteral<K1>, k2: AsLiteral<K2>, k: K1 | K2 | false, middle?: string, includeNull1?: N1, includeNull2?: N2) => RawStages<Delta<Rec<K1, T | N1>>, Delta<Rec<K1, T | N1> & Rec<K2, Arr<U>>>, Delta<Rec<K1, T | N1> & Rec<K2, U | N2> & ID>>;
 
 type s = string;
 type TOf<TT, K extends string> = doc & Omit<TT, K>;

package/index.esm.js

@@ -932,8 +932,9 @@ const dualIn = operator();
 const $in = dualIn('$in');
 const $nin = dualIn('$nin');
 
-const $unwindDelta = (k1, k2, k, includeNull, middle) => {
-    const outer = includeNull === null;
+const $unwindDelta = (k1, k2, k, middle, includeNull1, includeNull2) => {
+    const outer1 = includeNull1 === null;
+    const outer2 = includeNull2 === null;
     const newItems = {
         $filter: {
             input: { $ifNull: [`$after.${k2}`, []] },
@@ -977,31 +978,37 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
             },
         },
     };
-    const ifNull = (k, part, str = `$${k}.${part}._id`) => outer && k == k2 ? { $ifNull: [str, 'null'] } : str;
+    const ifNull = (k, part, str = `$${k}.${part}._id`) => outer2 && k == k2 ? { $ifNull: [str, 'null'] } : str;
     const interDot = ([a, b]) => [a, middle ?? '.', b];
-    const partReplace = (part) => ({
-        $cond: {
-            if: { $or: [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }] },
-            then: null,
-            else: {
-                _id: k
-                    ? ifNull(k, part)
-                    : {
-                        $concat: interDot([k1, k2].sort().map(k => ifNull(k, part))),
+    const partReplace = (part) => {
+        const def = {
+            _id: k
+                ? ifNull(k, part)
+                : {
+                    $concat: interDot([k1, k2].sort().map(k => ifNull(k, part))),
+                },
+            [k1]: `$${k1}.${part}`,
+            [k2]: outer2
+                ? {
+                    $cond: {
+                        if: `$${k2}.${part}._id`,
+                        then: `$${k2}.${part}`,
+                        else: null,
                     },
-                [k1]: `$${k1}.${part}`,
-                [k2]: outer
-                    ? {
-                        $cond: {
-                            if: `$${k2}.${part}._id`,
-                            then: `$${k2}.${part}`,
-                            else: null,
-                        },
-                    }
-                    : `$${k2}.${part}`,
+                }
+                : `$${k2}.${part}`,
+        };
+        const skipNulls = [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }].filter((_, i) => ![outer1, outer2][i]);
+        if (skipNulls.length === 0)
+            return def;
+        return {
+            $cond: {
+                if: skipNulls.length === 1 ? skipNulls[0] : { $or: skipNulls },
+                then: null,
+                else: def,
             },
-        },
-    });
+        };
+    };
     const part = (k) => root().of(k).expr();
     const stages = link()
         .with(asStages([
@@ -1013,7 +1020,7 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                 },
                 [k2]: {
                     $concatArrays: [
-                        outer
+                        outer2
                             ? {
                                 $cond: {
                                     if: { $eq: [`$before.${k2}`, []] },
@@ -1030,7 +1037,7 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                             : oldItems,
                         {
                             $map: {
-                                input: outer
+                                input: outer2
                                     ? {
                                         $cond: {
                                             if: {
@@ -1073,7 +1080,7 @@ const $unwind = (k, dict, middle) => {
             left: ['left', root().expr()],
             right: ['right', root().of(k).expr()],
         })))
-            .with($unwindDelta('left', 'right', false, undefined, middle))
+            .with($unwindDelta('left', 'right', false, middle))
             .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
             key: root().of('right').expr(),
             id: root().of('_id').expr(),
@@ -1082,7 +1089,8 @@ const $unwind = (k, dict, middle) => {
     };
 };
 
-const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull) => {
+const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull1, includeNull2) => {
+    const omit = omitRORec();
     return link()
         .with($replaceWithDelta(field(map1(k1, root().expr()))))
         .with($simpleLookup_({
@@ -1107,11 +1115,19 @@ const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, incl
     }))
         .with($replaceWithEach((f) => {
         const f1 = f === 'after' ? 'a' : 'b';
-        const omit = omitRORec();
         const a = root().of(f1).of('before').expr();
         const part = root().of(f);
         return ite(eq(root().of(f).expr())(nil), nil, field(omit.backward(mergeExpr(omit.forward(map1(k2, a)), map1(k1, part.of(k1).expr())))));
-    })).with($unwindDelta(k1, k2, k, includeNull)).stages;
+    }))
+        .with(includeNull1 === null
+        ? $replaceWithEach((f) => {
+            return $ifNull(root().of(f).expr(), field(omit.backward(mergeExpr(omit.forward(map1(k2, root()
+                .of(f === 'after' ? 'before' : 'after')
+                .of(k2)
+                .expr())), map1(k1, nil)))));
+        })
+        : link().stages)
+        .with($unwindDelta(k1, k2, k, undefined, includeNull1, includeNull2)).stages;
 };
 
 const $lookupRaw = ({ field1, field2 }, { coll, exec, input }, k2, k, includeNull) => (f) => {
@@ -1154,7 +1170,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());
 };
@@ -1276,8 +1295,8 @@ const join = ({ lField, rField, left, right, as }, leftSnapshot, rightSnapshot,
         stages: consume => consume(concatTStages(resultingSnapshot, asBefore(stagesUntilNextLookup.raw))),
         out: (finalInput) => {
             const leftJoinField = { field1: rField, field2: lField };
-            const joinL_Delta = $lookupDelta(leftJoinField, leftSnapshot, 'right', 'left', joinId);
-            const joinR_Delta = $lookupDelta(rightJoinField, rightSnapshot, 'left', 'right', joinId, outerLeft);
+            const joinL_Delta = $lookupDelta(leftJoinField, leftSnapshot, 'right', 'left', joinId, outerLeft);
+            const joinR_Delta = $lookupDelta(rightJoinField, rightSnapshot, 'left', 'right', joinId, undefined, outerLeft);
             const mergeForeignIntoDoc = concatStages($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({ a: root().of('right').expr(), b: root().of('_id').expr() }, dictId))), stagesUntilNextLookup.delta);
             const lRunnerInput = concatStages(joinR_Delta, mergeForeignIntoDoc);
             const rRunnerInput = concatStages(joinL_Delta, mergeForeignIntoDoc);
@@ -1642,8 +1661,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

@@ -934,8 +934,9 @@ const dualIn = operator();
 const $in = dualIn('$in');
 const $nin = dualIn('$nin');
 
-const $unwindDelta = (k1, k2, k, includeNull, middle) => {
-    const outer = includeNull === null;
+const $unwindDelta = (k1, k2, k, middle, includeNull1, includeNull2) => {
+    const outer1 = includeNull1 === null;
+    const outer2 = includeNull2 === null;
     const newItems = {
         $filter: {
             input: { $ifNull: [`$after.${k2}`, []] },
@@ -979,31 +980,37 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
             },
         },
     };
-    const ifNull = (k, part, str = `$${k}.${part}._id`) => outer && k == k2 ? { $ifNull: [str, 'null'] } : str;
+    const ifNull = (k, part, str = `$${k}.${part}._id`) => outer2 && k == k2 ? { $ifNull: [str, 'null'] } : str;
     const interDot = ([a, b]) => [a, middle ?? '.', b];
-    const partReplace = (part) => ({
-        $cond: {
-            if: { $or: [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }] },
-            then: null,
-            else: {
-                _id: k
-                    ? ifNull(k, part)
-                    : {
-                        $concat: interDot([k1, k2].sort().map(k => ifNull(k, part))),
+    const partReplace = (part) => {
+        const def = {
+            _id: k
+                ? ifNull(k, part)
+                : {
+                    $concat: interDot([k1, k2].sort().map(k => ifNull(k, part))),
+                },
+            [k1]: `$${k1}.${part}`,
+            [k2]: outer2
+                ? {
+                    $cond: {
+                        if: `$${k2}.${part}._id`,
+                        then: `$${k2}.${part}`,
+                        else: null,
                     },
-                [k1]: `$${k1}.${part}`,
-                [k2]: outer
-                    ? {
-                        $cond: {
-                            if: `$${k2}.${part}._id`,
-                            then: `$${k2}.${part}`,
-                            else: null,
-                        },
-                    }
-                    : `$${k2}.${part}`,
+                }
+                : `$${k2}.${part}`,
+        };
+        const skipNulls = [{ $eq: [`$${k1}.${part}`, null] }, { $eq: [`$${k2}.${part}`, null] }].filter((_, i) => ![outer1, outer2][i]);
+        if (skipNulls.length === 0)
+            return def;
+        return {
+            $cond: {
+                if: skipNulls.length === 1 ? skipNulls[0] : { $or: skipNulls },
+                then: null,
+                else: def,
             },
-        },
-    });
+        };
+    };
     const part = (k) => root().of(k).expr();
     const stages = link()
         .with(asStages([
@@ -1015,7 +1022,7 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                 },
                 [k2]: {
                     $concatArrays: [
-                        outer
+                        outer2
                             ? {
                                 $cond: {
                                     if: { $eq: [`$before.${k2}`, []] },
@@ -1032,7 +1039,7 @@ const $unwindDelta = (k1, k2, k, includeNull, middle) => {
                             : oldItems,
                         {
                             $map: {
-                                input: outer
+                                input: outer2
                                     ? {
                                         $cond: {
                                             if: {
@@ -1075,7 +1082,7 @@ const $unwind = (k, dict, middle) => {
             left: ['left', root().expr()],
             right: ['right', root().of(k).expr()],
         })))
-            .with($unwindDelta('left', 'right', false, undefined, middle))
+            .with($unwindDelta('left', 'right', false, middle))
             .with($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({
             key: root().of('right').expr(),
             id: root().of('_id').expr(),
@@ -1084,7 +1091,8 @@ const $unwind = (k, dict, middle) => {
     };
 };
 
-const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull) => {
+const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, includeNull1, includeNull2) => {
+    const omit = omitRORec();
     return link()
         .with($replaceWithDelta(field(map1(k1, root().expr()))))
         .with($simpleLookup_({
@@ -1109,11 +1117,19 @@ const $lookupDelta = ({ field1, field2 }, { coll, exec, input }, k1, k2, k, incl
     }))
         .with($replaceWithEach((f) => {
         const f1 = f === 'after' ? 'a' : 'b';
-        const omit = omitRORec();
         const a = root().of(f1).of('before').expr();
         const part = root().of(f);
         return ite(eq(root().of(f).expr())(nil), nil, field(omit.backward(mergeExpr(omit.forward(map1(k2, a)), map1(k1, part.of(k1).expr())))));
-    })).with($unwindDelta(k1, k2, k, includeNull)).stages;
+    }))
+        .with(includeNull1 === null
+        ? $replaceWithEach((f) => {
+            return $ifNull(root().of(f).expr(), field(omit.backward(mergeExpr(omit.forward(map1(k2, root()
+                .of(f === 'after' ? 'before' : 'after')
+                .of(k2)
+                .expr())), map1(k1, nil)))));
+        })
+        : link().stages)
+        .with($unwindDelta(k1, k2, k, undefined, includeNull1, includeNull2)).stages;
 };
 
 const $lookupRaw = ({ field1, field2 }, { coll, exec, input }, k2, k, includeNull) => (f) => {
@@ -1156,7 +1172,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());
 };
@@ -1278,8 +1297,8 @@ const join = ({ lField, rField, left, right, as }, leftSnapshot, rightSnapshot,
         stages: consume => consume(concatTStages(resultingSnapshot, asBefore(stagesUntilNextLookup.raw))),
         out: (finalInput) => {
             const leftJoinField = { field1: rField, field2: lField };
-            const joinL_Delta = $lookupDelta(leftJoinField, leftSnapshot, 'right', 'left', joinId);
-            const joinR_Delta = $lookupDelta(rightJoinField, rightSnapshot, 'left', 'right', joinId, outerLeft);
+            const joinL_Delta = $lookupDelta(leftJoinField, leftSnapshot, 'right', 'left', joinId, outerLeft);
+            const joinR_Delta = $lookupDelta(rightJoinField, rightSnapshot, 'left', 'right', joinId, undefined, outerLeft);
             const mergeForeignIntoDoc = concatStages($replaceWithDelta(mergeObjects(root().of('left').expr(), fieldM({ a: root().of('right').expr(), b: root().of('_id').expr() }, dictId))), stagesUntilNextLookup.delta);
             const lRunnerInput = concatStages(joinR_Delta, mergeForeignIntoDoc);
             const rRunnerInput = concatStages(joinL_Delta, mergeForeignIntoDoc);
@@ -1644,8 +1663,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.80",
+    "version": "0.0.82",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",