@omegup/msync 0.1.1 → 0.1.3

package/index.d.ts

@@ -415,7 +415,7 @@ type MergeInto<T extends O, Out extends O, E = unknown> = {
 type MergeArgs<T extends O, Out extends O, Ctx, In extends O> = {
     on: Field<T, jsonItem> & Field<Out, jsonItem>;
 } & MergeInto<T, Out> & (({
-    stages?: undefined;
+    stages?: never;
 } & ({
     whenMatched: 'keepExisting' | 'fail';
 } | {
@@ -437,6 +437,7 @@ type MergeArgs<T extends O, Out extends O, Ctx, In extends O> = {
     whenMatched: RawStages<unknown, Out, In, Ctx>;
 });
 declare const $merge_: <T extends O, Out extends O = T, Ctx = unknown, In extends O = Out>({ into, on, whenNotMatched, ...notMatched }: MergeArgs<T, Out, Ctx, In>) => RawStages<unknown, T, "out", unknown, number>;
+declare const $merge2: <T extends O, Out extends O = T, Ctx = unknown, In extends O = Out>(args: MergeArgs<T, Out, Ctx, In>) => RawStages<unknown, T, "out", unknown, number>;
 
 type GI$1<GG> = Exclude<GG, keyof TS>;
 type IdAndTsKeys = keyof (TS & ID);
@@ -526,7 +527,7 @@ interface SnapshotStreamHKT extends HKT<O2> {
 interface DeltaHKT extends HKT<O3> {
     readonly out: DeltaStages<I<O3, this>[0], I<O3, this>[1], I<O3, this>[2]>;
 }
-declare const staging: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed$1<KK>>, streamName: string, skip?: boolean, after?: () => Promise<void>, allowEmtpies?: readonly KK[]) => DeltaPipe<AllowedPick$1<V, KK>, AllowedPick$1<V, KK>, SnapshotStreamHKT, DeltaHKT>;
+declare const staging: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed$1<KK>>, streamName: string, skip?: boolean, after?: () => Promise<void>) => DeltaPipe<AllowedPick$1<V, KK>, AllowedPick$1<V, KK>, SnapshotStreamHKT, DeltaHKT>;
 
 type Allowed<K> = Exclude<K, 'deletedAt' | '_id'>;
 type AllowedPick<V extends Model, K extends StrKey<V>> = OPickD<V, Allowed<K>>;
@@ -703,4 +704,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, $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, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $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 MongoTypeNames, type N, type NoRaw, type NullToOBJ, 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, anyElementTrue, 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, not, type notArr, 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, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $reduce, $replaceWith, $set, $simpleInsert, $simpleMerge, $simpleMergePart, $sum, $type, $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 MongoTypeNames, type N, type NoRaw, type NullToOBJ, 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, anyElementTrue, 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, not, type notArr, 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.esm.js

@@ -573,6 +573,7 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
         },
     },
 ]);
+const $merge2 = (args) => $merge_(args);
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const doubleReplace = (x) => x;
@@ -1384,14 +1385,12 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
             whenMatched: asStages([
                 {
                     $replaceWith: {
-                        old: setDeleted
-                            ? { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] }
-                            : '$$ROOT',
+                        old: '$$ROOT',
                         merged: {
                             $mergeObjects: [
                                 '$$ROOT',
                                 '$$new',
-                                ...(setDeleted ? [{ deletedAt: '$deletedAt' }] : []),
+                                ...(setDeleted ? [{ deletedAt: { $ifNull: ['$deletedAt', null] } }] : []),
                             ],
                         },
                     },
@@ -1401,7 +1400,7 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
                         $cond: {
                             if: {
                                 $eq: [
-                                    '$old',
+                                    { $mergeObjects: ['$old', { deletedAt: { $ifNull: ['$old.deletedAt', null] } }] },
                                     { $mergeObjects: ['$merged', { touchedAt: '$old.touchedAt' }] },
                                 ],
                             },
@@ -1630,7 +1629,7 @@ const getFirstStages = (view) => {
 };
 
 const streamNames = {};
-const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies) => {
+const executes$2 = (view, input, streamName, skip = false, after) => {
     const { collection, projection, match } = view;
     const { firstStages, hardMatch } = getFirstStages(view);
     const db = collection.s.db, coll = collection.collectionName;
@@ -1819,7 +1818,7 @@ const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies)
         out: run,
     };
 };
-const staging = (view, streamName, skip = false, after, allowEmtpies) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
+const staging = (view, streamName, skip = false, after) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
 
 const executes$1 = (view, input, streamName, allowEmtpies) => {
     const hash = crypto$1
@@ -2002,4 +2001,4 @@ const makeCol = async (docs, database, name) => {
     }
 };
 
-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, $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, 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, $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, 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

@@ -575,6 +575,7 @@ const $merge_ = ({ into, on, whenNotMatched, ...notMatched }) => asStages([
         },
     },
 ]);
+const $merge2 = (args) => $merge_(args);
 
 const subMerge = (args, out, gid, extra, idPrefix, first) => {
     const doubleReplace = (x) => x;
@@ -1386,14 +1387,12 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
             whenMatched: asStages([
                 {
                     $replaceWith: {
-                        old: setDeleted
-                            ? { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] }
-                            : '$$ROOT',
+                        old: '$$ROOT',
                         merged: {
                             $mergeObjects: [
                                 '$$ROOT',
                                 '$$new',
-                                ...(setDeleted ? [{ deletedAt: '$deletedAt' }] : []),
+                                ...(setDeleted ? [{ deletedAt: { $ifNull: ['$deletedAt', null] } }] : []),
                             ],
                         },
                     },
@@ -1403,7 +1402,7 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
                         $cond: {
                             if: {
                                 $eq: [
-                                    '$old',
+                                    { $mergeObjects: ['$old', { deletedAt: { $ifNull: ['$old.deletedAt', null] } }] },
                                     { $mergeObjects: ['$merged', { touchedAt: '$old.touchedAt' }] },
                                 ],
                             },
@@ -1632,7 +1631,7 @@ const getFirstStages = (view) => {
 };
 
 const streamNames = {};
-const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies) => {
+const executes$2 = (view, input, streamName, skip = false, after) => {
     const { collection, projection, match } = view;
     const { firstStages, hardMatch } = getFirstStages(view);
     const db = collection.s.db, coll = collection.collectionName;
@@ -1821,7 +1820,7 @@ const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies)
         out: run,
     };
 };
-const staging = (view, streamName, skip = false, after, allowEmtpies) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
+const staging = (view, streamName, skip = false, after) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
 
 const executes$1 = (view, input, streamName, allowEmtpies) => {
     const hash = crypto$1
@@ -2036,6 +2035,7 @@ exports.$map1 = $map1;
 exports.$match = $match;
 exports.$matchDelta = $matchDelta;
 exports.$merge = $merge;
+exports.$merge2 = $merge2;
 exports.$merge_ = $merge_;
 exports.$ne = $ne;
 exports.$nin = $nin;

package/package.json

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