@omegup/msync 0.0.18 → 0.0.20

package/index.d.ts

@@ -479,14 +479,16 @@ declare const $unwind: <T extends doc, K extends s, U extends doc>(k: AsLiteral<
 
 type Allowed$2<K extends string> = Exclude<K, keyof (TS & ID)>;
 type Patch<V, KK extends StrKey<V>> = ((OPick<V, Allowed$2<KK>> & ID) | (Rec<Allowed$2<KK>, N> & ID)) & TS;
-declare const $simpleMerge: <V extends Model & ID>() => <KK extends StrKey<V>, Out extends doc, E = unknown>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>) => StreamRunnerParam<OPick<V, Allowed$2<KK>> & ID & E, "out">;
-declare const $merge: <V extends Model & ID>() => <KK extends StrKey<V>, Out extends doc>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>) => StreamRunnerParam<Delta<OPick<V, Allowed$2<KK>> & ID>, "out">;
+declare const $simpleMerge: <V extends O>() => <KK extends StrKey<V>, Out extends doc, E = unknown>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>) => StreamRunnerParam<OPick<V, Allowed$2<KK>> & ID & E, "out">;
+declare const $merge: <V extends O>() => <KK extends StrKey<V>, Out extends doc>(out: RWCollection<Out | Replace<Out, Patch<V, KK>>, Out>, keys: ExactKeys<Allowed$2<KK>>) => StreamRunnerParam<Delta<OPick<V, Allowed$2<KK>> & ID>, "out">;
 
 type ND = {
     readonly deletedAt?: null;
 };
 type Merge<T extends ID> = (T & ND & TS) | Del;
-declare const $upsert: <T extends doc>(out: RWCollection<Merge<T>>) => StreamRunnerParam<Delta<T>, "out">;
+declare const $insertX: <T extends doc, D extends O>(out: RWCollection<Merge<T>>, expr: Expr<T, D>, map: (x: Expr<T & ND & TS, D>) => Expr<Merge<T>, D>) => StreamRunnerParam<D, "out">;
+declare const $simpleInsert: <T extends doc>(out: RWCollection<Merge<T>>) => StreamRunnerParam<T, "out">;
+declare const $insert: <T extends doc>(out: RWCollection<Merge<T>>) => StreamRunnerParam<Delta<T>, "out">;
 
 type DeltaPipe<Q extends O, T extends Q, F extends HKT<O2>, G extends HKT<O3>> = {
     with: <Q2 extends O, V extends Q2>(map: (a: Stream<Q, T, F, G>) => Stream<Q | Q2, V, F, G>) => DeltaPipe<Q | Q2, V, F, G>;
@@ -653,4 +655,4 @@ 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, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type N, type NoRaw, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, type notArr, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type N, type NoRaw, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, type notArr, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.esm.js

@@ -1079,18 +1079,14 @@ const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .expr()));
 const assertNotNull$1 = (expr) => expr;
 
-const $upsert = (out) => ({
+const $insertX = (out, expr, map) => ({
     teardown: c => c({
         collection: out,
         method: 'updateMany',
         params: [{}, [{ $set: { deletedAt: '$$NOW', touchedAt: '$$CLUSTER_TIME' } }]],
     }),
     raw: () => {
-        const replacer = ite(eq(root().of('after').expr())(nil), field({
-            deletedAt: ['deletedAt', current],
-            _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-            touchedAt: ['touchedAt', current],
-        }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+        const replacer = map(mergeObjects(expr, field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
         return link()
             .with($replaceWith_(replacer))
             .with($merge_({
@@ -1101,6 +1097,12 @@ const $upsert = (out) => ({
         })).stages;
     },
 });
+const $simpleInsert = (out) => $insertX(out, root().expr(), id$1);
+const $insert = (out) => $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field({
+    deletedAt: ['deletedAt', current],
+    _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
+    touchedAt: ['touchedAt', current],
+}), x));
 const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
@@ -1257,6 +1259,8 @@ const executes$1 = (view, input, streamName) => {
         ]).then(ts => next(step2_5(ts), 'handle teardown'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
+                if (!last.data.teardown)
+                    return;
                 const { collection: c, method: m, params: p } = last.data.teardown;
                 const { collection, method, params } = {
                     collection: db.collection(c),
@@ -1411,6 +1415,8 @@ const executes = (view, input, streamName) => {
         ]).then(ts => next(step2_5(ts), 'handle teardown'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
+                if (!last.data.teardown)
+                    return;
                 const { collection: c, method: m, params: p } = last.data.teardown;
                 const { collection, method, params } = {
                     collection: db.collection(c),
@@ -1735,4 +1741,4 @@ const makeCol = async (docs, database, name) => {
     }
 };
 
-export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, Field, Machine, add, and, 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, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $unwind, $unwindDelta, Field, Machine, add, and, 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, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.js

@@ -1081,18 +1081,14 @@ const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .expr()));
 const assertNotNull$1 = (expr) => expr;
 
-const $upsert = (out) => ({
+const $insertX = (out, expr, map) => ({
     teardown: c => c({
         collection: out,
         method: 'updateMany',
         params: [{}, [{ $set: { deletedAt: '$$NOW', touchedAt: '$$CLUSTER_TIME' } }]],
     }),
     raw: () => {
-        const replacer = ite(eq(root().of('after').expr())(nil), field({
-            deletedAt: ['deletedAt', current],
-            _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
-            touchedAt: ['touchedAt', current],
-        }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+        const replacer = map(mergeObjects(expr, field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
         return link()
             .with($replaceWith_(replacer))
             .with($merge_({
@@ -1103,6 +1099,12 @@ const $upsert = (out) => ({
         })).stages;
     },
 });
+const $simpleInsert = (out) => $insertX(out, root().expr(), id$1);
+const $insert = (out) => $insertX(out, assertNotNull(root().of('after').expr()), x => ite(eq(root().of('after').expr())(nil), field({
+    deletedAt: ['deletedAt', current],
+    _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
+    touchedAt: ['touchedAt', current],
+}), x));
 const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
@@ -1259,6 +1261,8 @@ const executes$1 = (view, input, streamName) => {
         ]).then(ts => next(step2_5(ts), 'handle teardown'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
+                if (!last.data.teardown)
+                    return;
                 const { collection: c, method: m, params: p } = last.data.teardown;
                 const { collection, method, params } = {
                     collection: db.collection(c),
@@ -1413,6 +1417,8 @@ const executes = (view, input, streamName) => {
         ]).then(ts => next(step2_5(ts), 'handle teardown'));
         const step2_5 = ([same, exists]) => async () => {
             const handleTeardown = async (last) => {
+                if (!last.data.teardown)
+                    return;
                 const { collection: c, method: m, params: p } = last.data.teardown;
                 const { collection, method, params } = {
                     collection: db.collection(c),
@@ -1753,6 +1759,8 @@ exports.$gte = $gte;
 exports.$gteTs = $gteTs;
 exports.$ifNull = $ifNull;
 exports.$in = $in;
+exports.$insert = $insert;
+exports.$insertX = $insertX;
 exports.$keys = $keys;
 exports.$let = $let;
 exports.$lookup = $lookup;
@@ -1772,11 +1780,11 @@ exports.$pushDict = $pushDict;
 exports.$rand = $rand;
 exports.$replaceWith = $replaceWith;
 exports.$set = $set;
+exports.$simpleInsert = $simpleInsert;
 exports.$simpleMerge = $simpleMerge;
 exports.$sum = $sum;
 exports.$unwind = $unwind;
 exports.$unwindDelta = $unwindDelta;
-exports.$upsert = $upsert;
 exports.Field = Field;
 exports.Machine = Machine;
 exports.add = add;

package/package.json

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