@omegup/msync 0.1.28 → 0.1.29

package/index.d.ts

@@ -327,6 +327,7 @@ type View<V extends Model, K extends StrKey<V>> = {
 };
 
 declare const val: <T extends rawItem>(val: T) => Expr<T, unknown>;
+declare const afterWriteTime: Expr<Timestamp, unknown>;
 declare const current: Expr<Timestamp, unknown>;
 declare const $let: <T, D, C, V extends RORec<string, jsonItem>>(vars: ExprsExact<V, D, C>, inExpr: Expr<T, D, C & V>) => Expr<T, D, C>;
 declare const nil: Expr<null, unknown>;
@@ -680,5 +681,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, 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, afterWriteTime, 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, 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 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

@@ -81,9 +81,12 @@ const val = (val) => asExpr({
         ? { $literal: val }
         : val),
 });
-const current = asExpr({
+const afterWriteTime = asExpr({
     raw: () => asExprRaw(new Timestamp(0xffffffffffffffffn)),
 });
+const current = asExpr({
+    raw: () => asExprRaw('$$CLUSTER_TIME'),
+});
 const $let = (vars, inExpr) => asExpr({
     raw: f => asExprRaw({
         $let: {
@@ -842,7 +845,7 @@ const $mergeX = (out, keys, f, map, ext) => {
     const setDeleted = out.whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
-        touchedAt: ['touchedAt', current],
+        touchedAt: ['touchedAt', afterWriteTime],
     }))));
     const sss = setDeleted
         ? link()
@@ -886,7 +889,7 @@ const $mergeId = () => (out, keys, id, ext) => {
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
-            touchedAt: ['touchedAt', current],
+            touchedAt: ['touchedAt', afterWriteTime],
         }))), or);
     }, ext);
 };
@@ -908,7 +911,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const mapId = (k, v) => map1(k, v);
     const F1 = {
         _id: ['_id', to(idPrefix ? concat$1(val(idPrefix), $rand) : $rand)],
-        touchedAt: ['touchedAt', to(current)],
+        touchedAt: ['touchedAt', to(afterWriteTime)],
     };
     const F2 = mapId(gid, to(gidPath));
     const addExtraAndMerge = {
@@ -918,7 +921,8 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     };
     const addTSAndExtra = {
         ...mapExact0(e, to),
-        touchedAt: ['touchedAt', to(current)],
+        ...(out.whenNotMatched === 'insert' ? { deletedAt: ['deletedAt', to(nil)] } : {}),
+        touchedAt: ['touchedAt', to(afterWriteTime)],
     };
     const updater = set()(addTSAndExtra);
     const whenMatched = getWhenMatched(out.whenNotMatched);
@@ -1280,7 +1284,8 @@ const createIndexWithRetry = async (collection, indexSpec, options) => {
         }
         catch (e) {
             if ([85, 276].includes(e.code)) {
-                log('Index created with different name', e.code, { collection: collection.collectionName});
+                log('Index created with different name', e.code, {
+                    collection: collection.collectionName});
                 break;
             }
             if (e.code == 12587) {
@@ -1295,6 +1300,11 @@ const createIndexWithRetry = async (collection, indexSpec, options) => {
         break;
     }
 };
+const ensureCollection = async (db, collectionName) => {
+    if (!(await db.listCollections({ name: collectionName }, { nameOnly: true }).next())) {
+        await db.createCollection(collectionName);
+    }
+};
 
 const patch = ({ ...x }, k, v) => {
     delete x[k];
@@ -1530,7 +1540,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
         raw: () => {
             const replacer = map(mergeObjects(expr, field(mergeExpr(extExpr, {
                 deletedAt: ['deletedAt', nil],
-                touchedAt: ['touchedAt', current],
+                touchedAt: ['touchedAt', afterWriteTime],
             }))));
             return link()
                 .with($replaceWith_(replacer))
@@ -1550,7 +1560,7 @@ const $insertPart = (out, ext) => {
     return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
         deletedAt: ['deletedAt', current],
         _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-        touchedAt: ['touchedAt', current],
+        touchedAt: ['touchedAt', afterWriteTime],
     })), x), ext, extExpr);
 };
 const $insert = (out) => $insertPart(out, {});
@@ -1967,6 +1977,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 partialFilterExpression: { updated: true, after: null, before: null },
                 name: 'updated_nulls_' + new UUID().toString('base64'),
             });
+            await ensureCollection(db, coll);
             await db.command({
                 collMod: coll,
                 changeStreamPreAndPostImages: { enabled: true },
@@ -2148,6 +2159,7 @@ const executes$1 = (view, input, streamName, needs) => {
         const stop = withStop(step0);
         const step1 = async () => {
             log('creating indexes');
+            await ensureCollection(db, coll);
             await db.command({
                 collMod: coll,
                 changeStreamPreAndPostImages: { enabled: true },
@@ -2238,4 +2250,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, 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, afterWriteTime, 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, 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 };

package/index.js

@@ -83,9 +83,12 @@ const val = (val) => asExpr({
         ? { $literal: val }
         : val),
 });
-const current = asExpr({
+const afterWriteTime = asExpr({
     raw: () => asExprRaw(new mongodb.Timestamp(0xffffffffffffffffn)),
 });
+const current = asExpr({
+    raw: () => asExprRaw('$$CLUSTER_TIME'),
+});
 const $let = (vars, inExpr) => asExpr({
     raw: f => asExprRaw({
         $let: {
@@ -844,7 +847,7 @@ const $mergeX = (out, keys, f, map, ext) => {
     const setDeleted = out.whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
-        touchedAt: ['touchedAt', current],
+        touchedAt: ['touchedAt', afterWriteTime],
     }))));
     const sss = setDeleted
         ? link()
@@ -888,7 +891,7 @@ const $mergeId = () => (out, keys, id, ext) => {
     return $mergeX(out, keys, root().of('after'), or => {
         return ite(eqTyped(root().of('after').expr(), nil), field(omRORec.backward(spread(mapExact(keys, () => nil), {
             _id: ['_id', id],
-            touchedAt: ['touchedAt', current],
+            touchedAt: ['touchedAt', afterWriteTime],
         }))), or);
     }, ext);
 };
@@ -910,7 +913,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const mapId = (k, v) => map1(k, v);
     const F1 = {
         _id: ['_id', to(idPrefix ? concat$1(val(idPrefix), $rand) : $rand)],
-        touchedAt: ['touchedAt', to(current)],
+        touchedAt: ['touchedAt', to(afterWriteTime)],
     };
     const F2 = mapId(gid, to(gidPath));
     const addExtraAndMerge = {
@@ -920,7 +923,8 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
     };
     const addTSAndExtra = {
         ...mapExact0(e, to),
-        touchedAt: ['touchedAt', to(current)],
+        ...(out.whenNotMatched === 'insert' ? { deletedAt: ['deletedAt', to(nil)] } : {}),
+        touchedAt: ['touchedAt', to(afterWriteTime)],
     };
     const updater = set()(addTSAndExtra);
     const whenMatched = getWhenMatched(out.whenNotMatched);
@@ -1282,7 +1286,8 @@ const createIndexWithRetry = async (collection, indexSpec, options) => {
         }
         catch (e) {
             if ([85, 276].includes(e.code)) {
-                log('Index created with different name', e.code, { collection: collection.collectionName});
+                log('Index created with different name', e.code, {
+                    collection: collection.collectionName});
                 break;
             }
             if (e.code == 12587) {
@@ -1297,6 +1302,11 @@ const createIndexWithRetry = async (collection, indexSpec, options) => {
         break;
     }
 };
+const ensureCollection = async (db, collectionName) => {
+    if (!(await db.listCollections({ name: collectionName }, { nameOnly: true }).next())) {
+        await db.createCollection(collectionName);
+    }
+};
 
 const patch = ({ ...x }, k, v) => {
     delete x[k];
@@ -1532,7 +1542,7 @@ const $insertX = (out, expr, map, ext, extExpr) => {
         raw: () => {
             const replacer = map(mergeObjects(expr, field(mergeExpr(extExpr, {
                 deletedAt: ['deletedAt', nil],
-                touchedAt: ['touchedAt', current],
+                touchedAt: ['touchedAt', afterWriteTime],
             }))));
             return link()
                 .with($replaceWith_(replacer))
@@ -1552,7 +1562,7 @@ const $insertPart = (out, ext) => {
     return $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field(mergeExpr(translateOmit().forward(extExpr), {
         deletedAt: ['deletedAt', current],
         _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-        touchedAt: ['touchedAt', current],
+        touchedAt: ['touchedAt', afterWriteTime],
     })), x), ext, extExpr);
 };
 const $insert = (out) => $insertPart(out, {});
@@ -1969,6 +1979,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 partialFilterExpression: { updated: true, after: null, before: null },
                 name: 'updated_nulls_' + new mongodb.UUID().toString('base64'),
             });
+            await ensureCollection(db, coll);
             await db.command({
                 collMod: coll,
                 changeStreamPreAndPostImages: { enabled: true },
@@ -2150,6 +2161,7 @@ const executes$1 = (view, input, streamName, needs) => {
         const stop = withStop(step0);
         const step1 = async () => {
             log('creating indexes');
+            await ensureCollection(db, coll);
             await db.command({
                 collMod: coll,
                 changeStreamPreAndPostImages: { enabled: true },
@@ -2296,6 +2308,7 @@ exports.$unwindDelta = $unwindDelta;
 exports.Field = Field;
 exports.Machine = Machine;
 exports.add = add;
+exports.afterWriteTime = afterWriteTime;
 exports.and = and;
 exports.anyElementTrue = anyElementTrue;
 exports.array = array;

package/package.json

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