@omegup/msync 0.1.65 → 0.1.66

package/index.js

@@ -97,7 +97,7 @@ const $let = (vars, inExpr) => asExpr({ raw: (f) => asExprRaw({ $let: {
 } }) });
 const nil = val(null);
 const $getField = (expr, field) => asExpr({ raw: (f) => asExprRaw({ $getField: {
-	field,
+	field: typeof field === "string" ? field : field.raw(f).get(),
 	input: expr.raw(f).get()
 } }) });
 const func = (f, ...args) => asExpr({ raw: (field) => asExprRaw({ $function: {
@@ -682,7 +682,7 @@ const $mergeX = (out, keys, f, map, ext, update) => {
 		_id: ["_id", f.of("_id").expr()],
 		touchedAt: ["touchedAt", current]
 	})));
-	const sss = setDeleted ? link().with($set_(set()({ deletedAt: ["deletedAt", to(current)] }))).with($merge_({
+	const sss = setDeleted ? link().with($set_(set()({ deletedAt: ["deletedAt", to(now())] }))).with($merge_({
 		into: out.coll,
 		on: root().of("_id"),
 		whenNotMatched: "insert",
@@ -766,7 +766,7 @@ const subMerge = (args, out, gid, extra, idPrefix, first) => {
 		})).stages;
 	}
 	if (out.whenNotMatched === "discard") {
-		const discardMarker = $set_(set()({ deletedAt: ["deletedAt", to(current)] }));
+		const discardMarker = $set_(set()({ deletedAt: ["deletedAt", to(now())] }));
 		return stages.with(discardMarker).with($merge_({
 			into: out.into,
 			whenNotMatched: "insert",
@@ -1453,7 +1453,7 @@ const $simpleInsert = (out, ext) => {
 const $insertPart = (out, ext) => {
 	const extExpr = mapExact(ext, (v) => val(v));
 	return $insertX(out, assertNotNull(root().of("after").expr()), (x) => ite(eq(root().of("after").expr())(nil), field(mergeExpr(extExpr, {
-		deletedAt: ["deletedAt", current],
+		deletedAt: ["deletedAt", now()],
 		_id: ["_id", assertNotNull(root().of("before").of("_id").expr())],
 		touchedAt: ["touchedAt", current]
 	})), x), ext, extExpr);