@omegup/msync 0.1.63 → 0.1.64
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.esm.js +1 -1
- package/index.esm.js.map +1 -1
- package/index.js +1 -1
- package/index.js.map +1 -1
- package/lib/utils/merge/combiners.d.ts +3 -2
- package/lib/utils/merge/merge.d.ts +1 -2
- package/lib/utils/merge/next-winner.d.ts +1 -2
- package/lib/utils/merge/types.d.ts +5 -6
- package/lib/utils/merge/utils.d.ts +2 -3
- package/package.json +1 -1
- package/types/global-aug.d.ts +3 -0
- package/types/mongo.d.ts +1 -0
package/index.js
CHANGED
|
@@ -668,7 +668,7 @@ const getWhenMatched = (whenNotMatched, canWrite) => {
|
|
|
668
668
|
touchedAt: ["touchedAt", root().of("merged").of("touchedAt").expr()]
|
|
669
669
|
}));
|
|
670
670
|
const diff = ne(preMergeOld)(root().of("merged").expr());
|
|
671
|
-
const useNew = canWrite ? and(diff, canWrite) : diff;
|
|
671
|
+
const useNew = canWrite ? and(diff, or(notNull(root().of("old").of("deletedAt").expr()), canWrite)) : diff;
|
|
672
672
|
return link().with($replaceWith_(ite(useNew, root().of("merged").expr(), root().of("old").expr()))).stages;
|
|
673
673
|
};
|
|
674
674
|
const $mergeX = (out, keys, f, map, ext, update) => {
|