@omegup/msync 0.1.46 → 0.1.47

package/index.d.ts

@@ -438,18 +438,21 @@ declare const $groupId: <T extends O, V extends O, EE = {}, Out extends Loose<st
 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<MergedInput<Out, V, Grp, "_grp", EE> | 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> = {
-    foreignField: Field<RQ, S | Arr<S>>;
     from: SnapshotStreamExecutionResult<RQ, RE>;
     as: AsLiteral<As>;
 } & ({
-    localField: Field<LQ, S>;
-    toMany?: never;
+    to: 'one';
+    localField: Field<LQ, string>;
+    foreignField?: never;
+    middle?: never;
 } | {
-    localField: Field<LQ, Arr<S>>;
-    toMany: true;
+    to: 'many';
+    middle: string;
+    localField: Field<LQ, S | Arr<S>>;
+    foreignField: Field<RQ, S | Arr<S>>;
 });
-declare const $lookup: <As extends string, LQ extends doc, RQ extends O, RE extends RQ & doc, S extends notArr>(p: Params<As, LQ, RQ, RE, S>) => <LE extends LQ>(l: SnapshotStream<LQ, LE>) => SnapshotStream<LQ, LE & RORec<As, RE>>;
-declare const $outerLookup: <As extends string, LQ extends doc, RQ extends O, RE extends RQ & doc, S extends notArr>(p: Params<As, LQ, RQ, RE, S>) => <LE extends LQ>(l: SnapshotStream<LQ, LE>) => SnapshotStream<LQ, LE & RORec<As, RE | null>>;
+declare const $lookup: <As extends string, LQ extends doc, RQ extends doc, RE extends RQ & doc, S extends notArr>(p: Params<As, LQ, RQ, RE, S>) => <LE extends LQ>(l: SnapshotStream<LQ, LE>) => SnapshotStream<LQ, LE & RORec<As, RE>>;
+declare const $outerLookup: <As extends string, LQ extends doc, RQ extends doc, RE extends RQ & doc, S extends notArr>(p: Params<As, LQ, RQ, RE, S>) => <LE extends LQ>(l: SnapshotStream<LQ, LE>) => SnapshotStream<LQ, LE & RORec<As, RE | null>>;
 
 declare const $matchDelta: <T extends doc>(query: Expr<boolean, T>) => RawStages<unknown, Delta<T>, Delta<T>, unknown, number>;
 declare const matchDelta: <D>() => RawStages<unknown, Delta<D | null>, Delta<D>>;

package/index.esm.js

@@ -1628,11 +1628,10 @@ const runCont = async (it, cb) => {
 };
 
 const merge = ({ lsource: L, rsource: R, }) => mergeIterators({ sources: { L, R } });
-const join = ({ lField, rField, left, right, as, toMany }, leftSnapshot, rightSnapshot, stagesUntilNextLookup, outerLeft, middle = '.') => {
+const join = (params, leftSnapshot, rightSnapshot, stagesUntilNextLookup, outerLeft) => {
+    const { lField, rField, left, right, as } = params;
     const rightJoinField = { field1: lField, field2: rField };
-    const joinId = rField.str() === '_id' && toMany !== true
-        ? 'left'
-        : ['left', middle, 'right'];
+    const joinId = params.to === 'one' ? 'left' : ['left', params.middle, 'right'];
     const joinR_Snapshot = asBefore($lookupRaw(rightJoinField, rightSnapshot, as, joinId, outerLeft));
     const resultingSnapshot = concatTStages(leftSnapshot, joinR_Snapshot);
     const dict = { [as]: 'a' };
@@ -1670,22 +1669,42 @@ const join = ({ lField, rField, left, right, as, toMany }, leftSnapshot, rightSn
     };
 };
 const $lookup1 = (p, outerLeft) => (input) => p.left.stages((lStages) => p.right.stages((rStages) => join(p, lStages, rStages, input, outerLeft)));
-const $lookup = (p) => (l) => $lookup1({
-    right: p.from,
-    as: p.as,
-    lField: p.localField,
-    rField: p.foreignField,
-    left: l(emptyDelta()),
-    toMany: p.toMany,
-});
-const $outerLookup = (p) => (l) => $lookup1({
-    right: p.from,
-    as: p.as,
-    lField: p.localField,
-    rField: p.foreignField,
-    left: l(emptyDelta()),
-    toMany: p.toMany,
-}, null);
+const $lookup = (p) => (l) => p.to === 'one'
+    ? $lookup1({
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: root().of('_id'),
+        left: l(emptyDelta()),
+        to: 'one',
+    })
+    : $lookup1({
+        to: 'many',
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: p.foreignField,
+        left: l(emptyDelta()),
+        middle: p.middle,
+    });
+const $outerLookup = (p) => (l) => p.to === 'one'
+    ? $lookup1({
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: root().of('_id'),
+        left: l(emptyDelta()),
+        to: 'one',
+    }, null)
+    : $lookup1({
+        to: 'many',
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: p.foreignField,
+        left: l(emptyDelta()),
+        middle: p.middle,
+    }, null);
 
 const $setCore = (updater) => ({
     delta: $setDelta(updater),

package/index.js

@@ -1630,11 +1630,10 @@ const runCont = async (it, cb) => {
 };
 
 const merge = ({ lsource: L, rsource: R, }) => mergeIterators({ sources: { L, R } });
-const join = ({ lField, rField, left, right, as, toMany }, leftSnapshot, rightSnapshot, stagesUntilNextLookup, outerLeft, middle = '.') => {
+const join = (params, leftSnapshot, rightSnapshot, stagesUntilNextLookup, outerLeft) => {
+    const { lField, rField, left, right, as } = params;
     const rightJoinField = { field1: lField, field2: rField };
-    const joinId = rField.str() === '_id' && toMany !== true
-        ? 'left'
-        : ['left', middle, 'right'];
+    const joinId = params.to === 'one' ? 'left' : ['left', params.middle, 'right'];
     const joinR_Snapshot = asBefore($lookupRaw(rightJoinField, rightSnapshot, as, joinId, outerLeft));
     const resultingSnapshot = concatTStages(leftSnapshot, joinR_Snapshot);
     const dict = { [as]: 'a' };
@@ -1672,22 +1671,42 @@ const join = ({ lField, rField, left, right, as, toMany }, leftSnapshot, rightSn
     };
 };
 const $lookup1 = (p, outerLeft) => (input) => p.left.stages((lStages) => p.right.stages((rStages) => join(p, lStages, rStages, input, outerLeft)));
-const $lookup = (p) => (l) => $lookup1({
-    right: p.from,
-    as: p.as,
-    lField: p.localField,
-    rField: p.foreignField,
-    left: l(emptyDelta()),
-    toMany: p.toMany,
-});
-const $outerLookup = (p) => (l) => $lookup1({
-    right: p.from,
-    as: p.as,
-    lField: p.localField,
-    rField: p.foreignField,
-    left: l(emptyDelta()),
-    toMany: p.toMany,
-}, null);
+const $lookup = (p) => (l) => p.to === 'one'
+    ? $lookup1({
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: root().of('_id'),
+        left: l(emptyDelta()),
+        to: 'one',
+    })
+    : $lookup1({
+        to: 'many',
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: p.foreignField,
+        left: l(emptyDelta()),
+        middle: p.middle,
+    });
+const $outerLookup = (p) => (l) => p.to === 'one'
+    ? $lookup1({
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: root().of('_id'),
+        left: l(emptyDelta()),
+        to: 'one',
+    }, null)
+    : $lookup1({
+        to: 'many',
+        right: p.from,
+        as: p.as,
+        lField: p.localField,
+        rField: p.foreignField,
+        left: l(emptyDelta()),
+        middle: p.middle,
+    }, null);
 
 const $setCore = (updater) => ({
     delta: $setDelta(updater),

package/package.json

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