@omegup/msync 0.1.38 → 0.1.40

package/index.d.ts

@@ -120,7 +120,7 @@ type LinStages<out Q, in S extends Q, out R extends Q, in C = unknown> = {
 };
 type TStages<in out S, out Q, in out B extends Q, out R extends Q, M extends number = number> = {
     coll: ReadonlyCollection<S>;
-    input: RawStages<unknown, S, B, unknown, M>;
+    input: RawStages<unknown, S, S & B, unknown, M>;
     exec: RawStages<Q, B, R, unknown, M>;
 };
 type Stages<out Q, out R extends Q, out SDom> = <E>(consume: <S extends SDom, B extends Q>(value: TStages<S, Q, B, R>) => E) => E;
@@ -353,6 +353,7 @@ declare const $rand: Expr<string, unknown, unknown>;
 declare const $sum: <D extends O, C = unknown>(expr: Expr<number | N, D, C>) => DeltaAccumulator<D, number, C>;
 declare const $accumulator: <D, T, Ctx, A extends readonly unknown[]>(init: () => NoRaw<T>, accumulateArgs: AppMap<ExprHKT<Part<D>, Ctx>, A>, accumulate: (a: NoRaw<T>, ...args: NoRaw<A>) => NoRaw<T>, merge: (...args: NoRaw<[T | N, T]>) => NoRaw<T>) => DeltaAccumulator<D, T, Ctx>;
 declare const $countDict: <D extends O, C = unknown>(expr: Expr<string, D, C>) => DeltaAccumulator<D, Rec<string, number>, C>;
+declare const $countDictArray: <D extends O, C = unknown>(expr: Expr<Arr<string>, D, C>) => DeltaAccumulator<D, Rec<string, number>, C>;
 declare const $pushDict: <D extends O, V, C = unknown>(key: Expr<string, D, C>, value: Expr<V, D, C>) => DeltaAccumulator<D, Rec<string, Rec<"0" | "1", Arr<V>>>, C>;
 declare const $keys: <D extends O, C = unknown>(expr: Expr<Rec<string, number>, D, C>) => Expr<Arr<string>, D, C>;
 declare const $entries: <D extends O, V, C = unknown>(expr: Expr<Rec<string, Rec<"1" | "0", Arr<V>>>, D, C>) => Expr<Arr<Rec<"k", string> & Rec<"v", V>>, D, C>;
@@ -412,8 +413,8 @@ 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> = {
-    localField: Field<LQ, S>;
-    foreignField: Field<RQ, S>;
+    localField: Field<LQ, S | Arr<S>>;
+    foreignField: Field<RQ, S | Arr<S>>;
     from: SnapshotStreamExecutionResult<RQ, RE>;
     as: AsLiteral<As>;
 };
@@ -700,5 +701,5 @@ declare const enablePreAndPostImages: <T extends doc>(coll: Collection<T>) => Pr
 declare const prepare: (testName?: string) => Promise<MongoClient$1>;
 declare const makeCol: <T extends ID>(docs: readonly OptionalUnlessRequiredId<T>[], database: Db, name?: string) => Promise<Collection<T>>;
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $substr, $sum, $type, $unwind, $unwindDelta, Expr, Field, Machine, Type, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $countDictArray, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $substr, $sum, $type, $unwind, $unwindDelta, Expr, Field, Machine, Type, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
 export type { Accumulators, Arr, AsLiteral, Delta, DeltaAccumulator, DeltaAccumulators, ExactKeys, ExprHKT, Exprs, ExprsExact, ExprsExactHKT, ExprsPart, ID, Loose, Merge, MergeArgs, MergeInto, MergeMapOArgs, Model, MongoTypeNames, N, NoRaw, NullToOBJ, O, OPick, OPickD, Patch, RONoRaw, RORec, RawStages, Rec, Replace, SnapshotStreamExecutionResult, StrKey, Strict, TS, WriteonlyCollection, doc, jsonPrim, notArr };

package/index.esm.js

@@ -249,6 +249,23 @@ const $countDict = (expr) => $accumulator(function () {
         return y ? (a[k] = y) : delete a[k], a;
     }, a || {});
 });
+const $countDictArray = (expr) => $accumulator(function () {
+    return {};
+}, [sub(expr, root().of('v')), root().of('old').expr()], function (a, keys, old) {
+    keys.forEach(k => {
+        const y = (a[k] || 0) + (old ? -1 : 1);
+        if (y)
+            a[k] = y;
+        else
+            delete a[k];
+    });
+    return a;
+}, function (a, b) {
+    return Object.keys(b).reduce((a, k) => {
+        let y = (a[k] || 0) + b[k];
+        return y ? (a[k] = y) : delete a[k], a;
+    }, a || {});
+});
 const $pushDict = (key, value) => $accumulator(function () {
     return {};
 }, [
@@ -514,6 +531,7 @@ const $group1 = (id, args) => (f) => asStages([
 const rawVars = (vars, f) => mapExactToObject(vars, v => v.raw(f).get());
 const $simpleLookup1 = (args) => f => {
     const { coll, k, vars, fields, ...etc } = args;
+    const letVars = rawVars(vars, f());
     return asStages([
         {
             $lookup: {
@@ -523,7 +541,7 @@ const $simpleLookup1 = (args) => f => {
                     foreignField: root().with(fields.foreign).str(),
                 }),
                 as: f().of(k).str(),
-                let: rawVars(vars, f()),
+                ...(Object.keys(letVars).length > 0 && { let: letVars }),
                 ...etc,
             },
         },
@@ -1271,10 +1289,10 @@ const $lookupRaw = ({ field1, field2 }, { coll, exec, input }, k2, k, includeNul
         .with($simpleLookup1({
         coll,
         k: k2,
-        vars: map1('local', root().with(field1).expr()),
+        fields: { local: field1, foreign: root().of('before').with(field2) },
+        vars: {},
         pipeline: link()
             .with(input)
-            .with($match_($expr(eq(ctx()('local').expr())(root().of('before').with(field2).expr()))))
             .with(exec)
             .with($replaceWith_(root().of('before').expr())).stages,
     })(f))
@@ -2279,4 +2297,4 @@ const executes = (view, input, needs) => {
 };
 const single = (view, needs = {}) => pipe(input => executes(view, input, needs), emptyDelta(), concatDelta, emptyDelta);
 
-export { $accumulator, $and, $countDict, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $substr, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $countDictArray, $entries, $eq, $exists, $expr, $getField, $group, $groupId, $groupMerge, $group_, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertPart, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map0, $map1, $match, $matchDelta, $merge, $merge2, $mergeId, $mergePart, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $substr, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, pair, prepare, rand, range, regex, root, set, setField, single, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.js

@@ -251,6 +251,23 @@ const $countDict = (expr) => $accumulator(function () {
         return y ? (a[k] = y) : delete a[k], a;
     }, a || {});
 });
+const $countDictArray = (expr) => $accumulator(function () {
+    return {};
+}, [sub(expr, root().of('v')), root().of('old').expr()], function (a, keys, old) {
+    keys.forEach(k => {
+        const y = (a[k] || 0) + (old ? -1 : 1);
+        if (y)
+            a[k] = y;
+        else
+            delete a[k];
+    });
+    return a;
+}, function (a, b) {
+    return Object.keys(b).reduce((a, k) => {
+        let y = (a[k] || 0) + b[k];
+        return y ? (a[k] = y) : delete a[k], a;
+    }, a || {});
+});
 const $pushDict = (key, value) => $accumulator(function () {
     return {};
 }, [
@@ -516,6 +533,7 @@ const $group1 = (id, args) => (f) => asStages([
 const rawVars = (vars, f) => mapExactToObject(vars, v => v.raw(f).get());
 const $simpleLookup1 = (args) => f => {
     const { coll, k, vars, fields, ...etc } = args;
+    const letVars = rawVars(vars, f());
     return asStages([
         {
             $lookup: {
@@ -525,7 +543,7 @@ const $simpleLookup1 = (args) => f => {
                     foreignField: root().with(fields.foreign).str(),
                 }),
                 as: f().of(k).str(),
-                let: rawVars(vars, f()),
+                ...(Object.keys(letVars).length > 0 && { let: letVars }),
                 ...etc,
             },
         },
@@ -1273,10 +1291,10 @@ const $lookupRaw = ({ field1, field2 }, { coll, exec, input }, k2, k, includeNul
         .with($simpleLookup1({
         coll,
         k: k2,
-        vars: map1('local', root().with(field1).expr()),
+        fields: { local: field1, foreign: root().of('before').with(field2) },
+        vars: {},
         pipeline: link()
             .with(input)
-            .with($match_($expr(eq(ctx()('local').expr())(root().of('before').with(field2).expr()))))
             .with(exec)
             .with($replaceWith_(root().of('before').expr())).stages,
     })(f))
@@ -2284,6 +2302,7 @@ const single = (view, needs = {}) => pipe(input => executes(view, input, needs),
 exports.$accumulator = $accumulator;
 exports.$and = $and;
 exports.$countDict = $countDict;
+exports.$countDictArray = $countDictArray;
 exports.$entries = $entries;
 exports.$eq = $eq;
 exports.$exists = $exists;

package/package.json

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