@omegup/msync 0.1.62 → 0.1.64

package/adapters/mongodb.d.ts

@@ -0,0 +1,22 @@
+import 'mongodb';
+import type { BSON } from 'mongodb';
+import type { Driver, RawStage } from '../types';
+declare module 'mongodb' {
+    interface Collection<TSchema extends BSON.Document = BSON.Document> {
+        [RawStage]: {
+            (_: 2): TSchema;
+            (_: 1, x: TSchema): TSchema;
+        };
+        s: {
+            db: Db;
+        };
+    }
+    interface Db {
+        s: {
+            client?: MongoClient;
+        };
+        client: MongoClient;
+    }
+}
+export declare const mongodbDriver: Driver;
+export declare const useMongoDB: () => void;

package/adapters/mongodb.esm.js

@@ -0,0 +1,12 @@
+import { n as useDriver } from "../driver-sc6MCG57.esm.js";
+import { Timestamp, UUID } from "mongodb";
+//#region .build/adapters/mongodb.js
+const mongodbDriver = {
+	Timestamp,
+	UUID
+};
+const useMongoDB = () => useDriver(mongodbDriver);
+//#endregion
+export { mongodbDriver, useMongoDB };
+
+//# sourceMappingURL=mongodb.esm.js.map

package/adapters/mongodb.esm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mongodb.esm.js","names":[],"sources":["../../.build/adapters/mongodb.js"],"sourcesContent":["import 'mongodb';\nimport { Timestamp, UUID } from 'mongodb';\nimport { useDriver } from '../lib/driver';\nexport const mongodbDriver = { Timestamp, UUID };\nexport const useMongoDB = () => useDriver(mongodbDriver);\n//# sourceMappingURL=mongodb.js.map"],"mappings":";;;AAGA,MAAa,gBAAgB;CAAE;CAAW;AAAK;AAC/C,MAAa,mBAAmB,UAAU,aAAa"}

package/adapters/mongodb.js

@@ -0,0 +1,14 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_driver = require("../driver-BUCc3b89.js");
+let mongodb = require("mongodb");
+//#region .build/adapters/mongodb.js
+const mongodbDriver = {
+	Timestamp: mongodb.Timestamp,
+	UUID: mongodb.UUID
+};
+const useMongoDB = () => require_driver.useDriver(mongodbDriver);
+//#endregion
+exports.mongodbDriver = mongodbDriver;
+exports.useMongoDB = useMongoDB;
+
+//# sourceMappingURL=mongodb.js.map

package/adapters/mongodb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mongodb.js","names":["useDriver"],"sources":["../../.build/adapters/mongodb.js"],"sourcesContent":["import 'mongodb';\nimport { Timestamp, UUID } from 'mongodb';\nimport { useDriver } from '../lib/driver';\nexport const mongodbDriver = { Timestamp, UUID };\nexport const useMongoDB = () => useDriver(mongodbDriver);\n//# sourceMappingURL=mongodb.js.map"],"mappings":";;;;AAGA,MAAa,gBAAgB;CAAE,WAAA,QAAA;CAAW,MAAA,QAAA;AAAK;AAC/C,MAAa,mBAAmBA,eAAAA,UAAU,aAAa"}

package/driver-BUCc3b89.js

@@ -0,0 +1,31 @@
+//#region .build/lib/driver.js
+let current;
+const useDriver = (driver) => {
+	current = driver;
+};
+const driver = () => {
+	if (!current) throw new Error("msync: call useDriver({ Timestamp, UUID }) before running");
+	return current;
+};
+const uuid = () => new (driver()).UUID().toString("base64");
+//#endregion
+Object.defineProperty(exports, "driver", {
+	enumerable: true,
+	get: function() {
+		return driver;
+	}
+});
+Object.defineProperty(exports, "useDriver", {
+	enumerable: true,
+	get: function() {
+		return useDriver;
+	}
+});
+Object.defineProperty(exports, "uuid", {
+	enumerable: true,
+	get: function() {
+		return uuid;
+	}
+});
+
+//# sourceMappingURL=driver-BUCc3b89.js.map

package/driver-BUCc3b89.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"driver-BUCc3b89.js","names":[],"sources":["../.build/lib/driver.js"],"sourcesContent":["let current;\nexport const useDriver = (driver) => {\n    current = driver;\n};\nexport const driver = () => {\n    if (!current)\n        throw new Error('msync: call useDriver({ Timestamp, UUID }) before running');\n    return current;\n};\nexport const uuid = () => new (driver().UUID)().toString('base64');\n//# sourceMappingURL=driver.js.map"],"mappings":";AAAA,IAAI;AACJ,MAAa,aAAa,WAAW;CACjC,UAAU;AACd;AACA,MAAa,eAAe;CACxB,IAAI,CAAC,SACD,MAAM,IAAI,MAAM,2DAA2D;CAC/E,OAAO;AACX;AACA,MAAa,aAAa,KAAK,OAAO,EAAA,CAAE,KAAM,CAAC,CAAC,SAAS,QAAQ"}

package/driver-sc6MCG57.esm.js

@@ -0,0 +1,14 @@
+//#region .build/lib/driver.js
+let current;
+const useDriver = (driver) => {
+	current = driver;
+};
+const driver = () => {
+	if (!current) throw new Error("msync: call useDriver({ Timestamp, UUID }) before running");
+	return current;
+};
+const uuid = () => new (driver()).UUID().toString("base64");
+//#endregion
+export { useDriver as n, uuid as r, driver as t };
+
+//# sourceMappingURL=driver-sc6MCG57.esm.js.map

package/driver-sc6MCG57.esm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"driver-sc6MCG57.esm.js","names":[],"sources":["../.build/lib/driver.js"],"sourcesContent":["let current;\nexport const useDriver = (driver) => {\n    current = driver;\n};\nexport const driver = () => {\n    if (!current)\n        throw new Error('msync: call useDriver({ Timestamp, UUID }) before running');\n    return current;\n};\nexport const uuid = () => new (driver().UUID)().toString('base64');\n//# sourceMappingURL=driver.js.map"],"mappings":";AAAA,IAAI;AACJ,MAAa,aAAa,WAAW;CACjC,UAAU;AACd;AACA,MAAa,eAAe;CACxB,IAAI,CAAC,SACD,MAAM,IAAI,MAAM,2DAA2D;CAC/E,OAAO;AACX;AACA,MAAa,aAAa,KAAK,OAAO,EAAA,CAAE,KAAM,CAAC,CAAC,SAAS,QAAQ"}

package/index.d.ts

@@ -10,4 +10,4 @@ export * from './lib/query';
 export * from './lib/utils';
 export * from './lib/types/extern';
 export * from './types/extern';
-export { enablePreAndPostImages, prepare, makeCol } from './test/mongodb';
+export { useDriver, type Driver } from './lib/driver';

package/index.esm.js

@@ -1,35 +1,6 @@
-import { createRequire } from "node:module";
-import { MongoClient, Timestamp, UUID } from "mongodb";
+import { n as useDriver, r as uuid, t as driver } from "./driver-sc6MCG57.esm.js";
 import crypto$1 from "crypto";
 import { canonicalize } from "json-canonicalize";
-import { writeFile } from "fs/promises";
-//#region \0rolldown/runtime.js
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
-//#endregion
 //#region .build/lib/expression/expr-base.js
 const asExprRaw = (raw) => ({ get: () => raw });
 const asExpr = (r) => r;
@@ -74,7 +45,6 @@ const map1 = (k, to) => {
 };
 //#endregion
 //#region .build/lib/utils/map-object.js
-const map = (x, f) => Object.fromEntries(Object.entries(x).map(([k, v]) => [k, f(v, k)]));
 const mapExactToObject0 = (x, f) => {
 	const filter = (x) => x.filter((x) => x[0] === x[1][0]);
 	const matched = filter(Object.entries(x));
@@ -660,8 +630,8 @@ const getSubsetMatchForExt = (ext) => {
 };
 const getWhenMatchedForMerge = (whenNotMatched, update, canWrite) => {
 	const orNull = (e) => whenNotMatched === "discard" ? $ifNull(e, nil) : e;
-	const newOrOld = whenNotMatched === "insert" ? ctx()("new") : root();
-	const merged = mergeObjects(root().expr(), update(ctx()("new").expr(), root().expr()), field({ deletedAt: ["deletedAt", orNull(newOrOld.of("deletedAt").expr())] }));
+	const deletedAt = orNull((whenNotMatched === "insert" ? ctx()("new") : root()).of("deletedAt").expr());
+	const merged = mergeObjects(root().expr(), update(ctx()("new").expr(), root().expr()), field({ deletedAt: ["deletedAt", deletedAt] }));
 	return link().with($replaceWith_(field({
 		old: ["old", root().expr()],
 		merged: ["merged", merged]
@@ -674,7 +644,7 @@ const getWhenMatched = (whenNotMatched, canWrite) => {
 		touchedAt: ["touchedAt", root().of("merged").of("touchedAt").expr()]
 	}));
 	const diff = ne(preMergeOld)(root().of("merged").expr());
-	const useNew = canWrite ? and(diff, canWrite) : diff;
+	const useNew = canWrite ? and(diff, or(notNull(root().of("old").of("deletedAt").expr()), canWrite)) : diff;
 	return link().with($replaceWith_(ite(useNew, root().of("merged").expr(), root().of("old").expr()))).stages;
 };
 const $mergeX = (out, keys, f, map, ext, update) => {
@@ -819,15 +789,6 @@ const $group = (id, args, out, extra, idPrefix = "") => $groupMerge(id, args, {
 	whenNotMatched: "insert"
 }, "_grp", extra, idPrefix);
 //#endregion
-//#region .build/types/mongo.js
-var mongo_exports = /* @__PURE__ */ __exportAll({});
-import * as import_mongodb from "mongodb";
-__reExport(mongo_exports, import_mongodb);
-//#endregion
-//#region .build/types/index.js
-var types_exports = /* @__PURE__ */ __exportAll({});
-__reExport(types_exports, mongo_exports);
-//#endregion
 //#region .build/lib/aggregate/set/$replace-with-each.js
 const deltaExpr = (expr) => (field) => {
 	return ite(eqTyped($ifNull(root().of(field).expr(), nil), nil), nil, expr(field));
@@ -1177,6 +1138,7 @@ const ensureCollection = async (db, collectionName) => {
 };
 //#endregion
 //#region .build/lib/utils/merge/utils.js
+const map = (x, f) => Object.fromEntries(Object.entries(x).map(([k, v]) => [k, f(v, k)]));
 const patch = ({ ...x }, k, v) => {
 	delete x[k];
 	return {
@@ -1188,10 +1150,12 @@ const restart = (sources) => {
 	return map(sources, (x) => x.stop());
 };
 const race = (sources) => {
-	const promises = Object.values(map(sources, ({ next }, key) => next.then((frame) => ({
-		key,
-		frame
-	}), (error) => new Error(error))));
+	const promises = Object.values(map(sources, (p, key) => {
+		return p.next.then((frame) => ({
+			key,
+			frame
+		}), (error) => new Error(error));
+	}));
 	return Promise.any(promises).then((result) => {
 		if (result instanceof Error) throw result;
 		else return result;
@@ -1247,7 +1211,7 @@ const mergeIterators = (params) => {
 		}),
 		next: select(sources).then(makeReiterate(sources, interrupt, hooks)),
 		clear: async () => {
-			for (const key in sources) await sources[key].clear();
+			for (const key in sources) await sources[key]?.clear();
 		}
 	};
 };
@@ -1370,9 +1334,9 @@ const join = (params, leftSnapshot, rightSnapshot, stagesUntilNextLookup, outerL
 				teardown: final.teardown
 			}, async () => {
 				log("Creating indexes for lookup left", leftSnapshot.coll.collectionName, { [`before.${lField.str()}`]: 1 });
-				await createIndex(leftSnapshot.coll, { [`before.${lField.str()}`]: 1 }, { name: "left_" + new types_exports.UUID().toString("base64") });
+				await createIndex(leftSnapshot.coll, { [`before.${lField.str()}`]: 1 }, { name: "left_" + new (driver()).UUID().toString("base64") });
 				log("Creating indexes for lookup right", rightSnapshot.coll.collectionName, { [`before.${rField.str()}`]: 1 });
-				await createIndex(rightSnapshot.coll, { [`before.${rField.str()}`]: 1 }, { name: "right_" + new types_exports.UUID().toString("base64") });
+				await createIndex(rightSnapshot.coll, { [`before.${rField.str()}`]: 1 }, { name: "right_" + new (driver()).UUID().toString("base64") });
 			});
 			const lRunner = getRunner(left, lRunnerInput, finalInput);
 			const rRunner = getRunner(right, rRunnerInput, finalInput);
@@ -1518,12 +1482,12 @@ const addTeardown = (it, tr) => {
 //#endregion
 //#region .build/lib/watch.js
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-const maxTimestamp = new Timestamp(18446744073709551615n);
+const maxTimestamp = () => new (driver()).Timestamp(18446744073709551615n);
 const getCurrentTimestamp = async (db) => {
-	return (await db.admin().command({ serverStatus: 1 }))["operationTime"];
+	return (await db.admin().command({ serverStatus: 1 })).operationTime;
 };
 async function getLastCommittedTs(adminDb) {
-	return (await adminDb.command({ replSetGetStatus: 1 }))?.optimes?.lastCommittedOpTime?.ts ?? null;
+	return (await adminDb.command({ replSetGetStatus: 1 })).optimes?.lastCommittedOpTime?.ts ?? null;
 }
 async function waitUntilStablePast(db, oplogTs, { pollMs = 0, timeoutMs = 1e4 } = {}) {
 	const adminDb = db.client.db("admin");
@@ -1666,7 +1630,7 @@ const register = (coll, keys, match, cb) => {
 let maxKeysRemoved = null;
 const makeWatchStream = async ({ collection, projection: p, hardMatch: m }, streamName) => {
 	const { db } = collection.s;
-	await (maxKeysRemoved ??= Promise.all((await db.listCollections({}, { nameOnly: true }).toArray()).map((x) => void db.collection(x.name).updateMany({ touchedAt: maxTimestamp }, [{ $set: { touchedAt: "$$CLUSTER_TIME" } }]))).then(() => {}));
+	await (maxKeysRemoved ??= Promise.all((await db.listCollections({}, { nameOnly: true }).toArray()).map((x) => void db.collection(x.name).updateMany({ touchedAt: maxTimestamp() }, [{ $set: { touchedAt: "$$CLUSTER_TIME" } }]))).then(() => {}));
 	const projection = {
 		...p ? mapExactToObject(p, (v) => v) : {},
 		deletedAt: 1
@@ -1717,7 +1681,7 @@ const $nor = combine("$nor", filterUndefined(all));
 const $or = combine("$or", filterUndefined(first$1));
 //#endregion
 //#region .build/lib/boot/first-stages.js
-const previous = (ts) => new Timestamp({
+const previous = (ts) => new (driver()).Timestamp({
 	t: ts.high - 60,
 	i: 0
 });
@@ -1825,11 +1789,11 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 			log("creating indexes");
 			await createIndex(snapshotCollection, { before: 1 }, {
 				partialFilterExpression: { before: null },
-				name: "before_" + new UUID().toString("base64")
+				name: "before_" + uuid()
 			});
 			await createIndex(snapshotCollection, { updated: 1 }, {
 				partialFilterExpression: { updated: true },
-				name: "updated_" + new UUID().toString("base64")
+				name: "updated_" + uuid()
 			});
 			await createIndex(snapshotCollection, {
 				updated: 1,
@@ -1841,7 +1805,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 					after: null,
 					before: null
 				},
-				name: "updated_nulls_" + new UUID().toString("base64")
+				name: "updated_nulls_" + uuid()
 			});
 			await createIndex(snapshotCollection, {
 				updated: 1,
@@ -1851,7 +1815,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 					updated: true,
 					after: null
 				},
-				name: "updated_no_after_" + new UUID().toString("base64")
+				name: "updated_no_after_" + uuid()
 			});
 			await createIndex(snapshotCollection, { updated: 1 }, {
 				partialFilterExpression: {
@@ -1859,7 +1823,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 					after: null,
 					before: null
 				},
-				name: "updated_nulls_" + new UUID().toString("base64")
+				name: "updated_nulls_" + uuid()
 			});
 			await ensureCollection(db, coll);
 			await db.command({
@@ -1868,7 +1832,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 			});
 			await createIndex(collection, { touchedAt: 1 }, hardMatch ? {
 				partialFilterExpression: hardMatch.raw(root()),
-				name: "touchedAt_hard_" + new UUID().toString("base64")
+				name: "touchedAt_hard_" + uuid()
 			} : {});
 			await setup?.();
 			await after?.();
@@ -1912,7 +1876,8 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
 			}), "run the aggregation", () => stream.close());
 		};
 		const makeStream = () => makeWatchStream(view, streamName);
-		const step4 = ({ result, ts, stream }) => async () => {
+		const step4 = (args) => async () => {
+			const { result, ts, stream } = args;
 			const start = Date.now();
 			log("snapshot", streamName, "ensure before null", Date.now() - start);
 			const first = ts === void 0;
@@ -2049,7 +2014,7 @@ const executes$1 = (view, input, streamName, needs) => {
 			});
 			await createIndex(collection, { touchedAt: 1 }, {
 				partialFilterExpression: { deletedAt: { $eq: null } },
-				name: "touchedAt_" + new UUID().toString("base64")
+				name: "touchedAt_" + new (driver()).UUID().toString("base64")
 			});
 			log("stream started", {
 				streamName,
@@ -2154,45 +2119,6 @@ const executes = (view, input, needs) => {
 };
 const single = (view, needs = {}) => pipe((input) => executes(view, input, needs), emptyDelta(), concatDelta, emptyDelta);
 //#endregion
-//#region .build/test/uri.js
-__require("dotenv").config();
-const uri = process.env["MONGO_URL"];
-//#endregion
-//#region .build/test/mongodb.js
-const enablePreAndPostImages = (coll) => coll.s.db.command({
-	collMod: coll.collectionName,
-	changeStreamPreAndPostImages: { enabled: true }
-});
-const prepare = async (testName) => {
-	const client = new MongoClient(uri, testName ? { monitorCommands: true } : {});
-	if (testName) {
-		const handler = (c) => {
-			writeFile(`./out/${testName}.log`, JSON.stringify(c.command) + ",\n", { flag: "w" });
-		};
-		client.on("commandStarted", handler);
-		client.on("commandSucceeded", handler);
-	}
-	await client.connect();
-	await client.db("admin").command({ setClusterParameter: { changeStreamOptions: { preAndPostImages: { expireAfterSeconds: 60 } } } });
-	return client;
-};
-const clears = [];
-const makeCol = async (docs, database, name) => {
-	if (!name) {
-		const n = name = crypto.randomUUID();
-		clears.push(async () => {
-			await database.collection(n).drop({ ignoreUndefined: true });
-		});
-	}
-	try {
-		const col = await database.createCollection(name, { changeStreamPreAndPostImages: { enabled: true } });
-		if (docs.length) await col.insertMany([...docs]);
-		return col;
-	} catch {
-		return database.collection(name);
-	}
-};
-//#endregion
-export { $accumulator, $and, $countDict, $countDictArray, $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, $substr, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, emptyDelta, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, fromEq, func, getSubsetMatchForExt, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, joinIdOf, last, literalsEqaul, log, lt, lte, makeCol, map, map1, mapExact, mapExact0, mapExact1, mapExactToObject, mapExactToObject0, mapExactToObject1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, matchDelta, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, min, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, prepare, rand, range, reflex, regex, root, set, setField, single, size, slice, sortArray, spread, spread0, staging, startOf, str, sub, subtract, sym, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $countDictArray, $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, $substr, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, anyElementTrue, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, emptyDelta, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, fromEq, func, getSubsetMatchForExt, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, joinIdOf, last, literalsEqaul, log, lt, lte, map1, mapExact, mapExact0, mapExact1, mapExactToObject, mapExactToObject0, mapExactToObject1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, matchDelta, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, min, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, rand, range, reflex, regex, root, set, setField, single, size, slice, sortArray, spread, spread0, staging, startOf, str, sub, subtract, sym, to, toInt, useDriver, val, weekPart, wrap, year };
 
 //# sourceMappingURL=index.esm.js.map