@omegup/msync 0.1.34 → 0.1.36

package/index.d.ts

@@ -236,6 +236,7 @@ declare const concat: {
     <D, C>(...expr: Expr<string, D, C>[]): Expr<string, D, C>;
     <D, C>(...expr: Expr<string | N, D, C>[]): Expr<string | N, D, C>;
 };
+declare const padLeft: <D, C>(expr: Expr<string, D, C>, pad: string) => Expr<string, D, C>;
 declare const regex: <D, C>(expr: Expr<string, D, C>, regex: Expr<string, D, C>, options?: Expr<string, D, C>) => Expr<boolean, D, C>;
 declare const str: <D, C>(expr: Expr<unknown, D, C>) => Expr<string, D, C>;
 declare const toInt: <D, C>(expr: Expr<unknown, D, C>) => Expr<number, D, C>;
@@ -685,5 +686,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, $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, 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, $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, $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

@@ -299,6 +299,18 @@ const $entries = (expr) => func(function (obj) {
 const concat$1 = (...expr) => asExpr({
     raw: f => asExprRaw({ $concat: expr.map(e => e.raw(f).get()) }),
 });
+const padLeft = (expr, pad) => asExpr({
+    raw: f => asExprRaw({
+        $let: {
+            vars: {
+                x: {
+                    $concat: [{ $literal: pad }, expr.raw(f).get()],
+                },
+            },
+            in: { $substrCP: ['$$x', { $subtract: [{ $strLenCP: '$$x' }, pad.length] }, pad.length] },
+        },
+    }),
+});
 const regex = (expr, regex, options) => asExpr({
     raw: f => asExprRaw({
         $regexMatch: {
@@ -315,10 +327,7 @@ 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).flatMap(([dom, ref]) => expr[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);
@@ -1763,9 +1772,8 @@ const loop = async (db) => {
             const m = watchers.get(doc.ns);
             if (!m)
                 continue;
-            for (const { cb, keys, rem } of [...m.values()]) {
-                if (!keys ||
-                    (doc.op === 'i' ? keys.p.every(k => fields.has(k)) : keys.k.some(k => fields.has(k)))) {
+            for (const { cb, keys, rem, match } of [...m.values()]) {
+                if (!keys || (doc.op === 'i' ? (match ? true : true) : keys.some(k => fields.has(k)))) {
                     cb(doc);
                     rem();
                 }
@@ -1773,7 +1781,7 @@ const loop = async (db) => {
         }
     }
 };
-const register = (coll, keys, cb) => {
+const register = (coll, keys, match, cb) => {
     const ns = coll.namespace;
     let m = watchers.get(ns);
     if (!m)
@@ -1784,7 +1792,7 @@ const register = (coll, keys, cb) => {
         if (m.size === 0)
             watchers.delete(ns);
     };
-    m.set(id, { cb, keys: keys ? { k: keys, p: keys.filter(k => k !== 'deletedAt') } : null, rem });
+    m.set(id, { cb, keys, match, rem });
     if (!running) {
         running = true;
         loop(coll.s.db);
@@ -1799,7 +1807,7 @@ const makeWatchStream = async ({ collection, projection: p, hardMatch: m }, stre
         .updateMany({ touchedAt: maxTimestamp }, [{ $set: { touchedAt: '$$CLUSTER_TIME' } }]))).then(() => { }));
     const projection = { ...(p ? mapExactToObject(p, v => v) : {}), deletedAt: 1 };
     let notify = makePromise();
-    register(collection, p ? Object.keys(projection) : null, doc => {
+    register(collection, p ? Object.keys(projection) : null, m, doc => {
         log(streamName, 'change detected', doc);
         notify.resolve(doc);
     });
@@ -2266,4 +2274,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, $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, 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, $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, $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

@@ -301,6 +301,18 @@ const $entries = (expr) => func(function (obj) {
 const concat$1 = (...expr) => asExpr({
     raw: f => asExprRaw({ $concat: expr.map(e => e.raw(f).get()) }),
 });
+const padLeft = (expr, pad) => asExpr({
+    raw: f => asExprRaw({
+        $let: {
+            vars: {
+                x: {
+                    $concat: [{ $literal: pad }, expr.raw(f).get()],
+                },
+            },
+            in: { $substrCP: ['$$x', { $subtract: [{ $strLenCP: '$$x' }, pad.length] }, pad.length] },
+        },
+    }),
+});
 const regex = (expr, regex, options) => asExpr({
     raw: f => asExprRaw({
         $regexMatch: {
@@ -317,10 +329,7 @@ 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).flatMap(([dom, ref]) => expr[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);
@@ -1765,9 +1774,8 @@ const loop = async (db) => {
             const m = watchers.get(doc.ns);
             if (!m)
                 continue;
-            for (const { cb, keys, rem } of [...m.values()]) {
-                if (!keys ||
-                    (doc.op === 'i' ? keys.p.every(k => fields.has(k)) : keys.k.some(k => fields.has(k)))) {
+            for (const { cb, keys, rem, match } of [...m.values()]) {
+                if (!keys || (doc.op === 'i' ? (match ? true : true) : keys.some(k => fields.has(k)))) {
                     cb(doc);
                     rem();
                 }
@@ -1775,7 +1783,7 @@ const loop = async (db) => {
         }
     }
 };
-const register = (coll, keys, cb) => {
+const register = (coll, keys, match, cb) => {
     const ns = coll.namespace;
     let m = watchers.get(ns);
     if (!m)
@@ -1786,7 +1794,7 @@ const register = (coll, keys, cb) => {
         if (m.size === 0)
             watchers.delete(ns);
     };
-    m.set(id, { cb, keys: keys ? { k: keys, p: keys.filter(k => k !== 'deletedAt') } : null, rem });
+    m.set(id, { cb, keys, match, rem });
     if (!running) {
         running = true;
         loop(coll.s.db);
@@ -1801,7 +1809,7 @@ const makeWatchStream = async ({ collection, projection: p, hardMatch: m }, stre
         .updateMany({ touchedAt: maxTimestamp }, [{ $set: { touchedAt: '$$CLUSTER_TIME' } }]))).then(() => { }));
     const projection = { ...(p ? mapExactToObject(p, v => v) : {}), deletedAt: 1 };
     let notify = makePromise();
-    register(collection, p ? Object.keys(projection) : null, doc => {
+    register(collection, p ? Object.keys(projection) : null, m, doc => {
         log(streamName, 'change detected', doc);
         notify.resolve(doc);
     });
@@ -2387,6 +2395,7 @@ exports.not = not;
 exports.notNull = notNull;
 exports.now = now;
 exports.or = or;
+exports.padLeft = padLeft;
 exports.pair = pair;
 exports.prepare = prepare;
 exports.rand = rand;

package/package.json

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