@omegup/msync 0.1.43 → 0.1.45

package/index.esm.js

@@ -76,7 +76,7 @@ const spread = (a, b) => ({ ...a, ...mapExact(b, id$1) });
 const spread0 = (a, b) => ({ ...a, ...mapExact0(b, id$1) });
 
 const val = (val) => asExpr({
-    raw: () => asExprRaw((val && typeof val === 'object') || (typeof val === 'string' && val[0] === '$')
+    raw: () => asExprRaw((val && typeof val === 'object' && !(val instanceof Date)) || (typeof val === 'string' && val[0] === '$')
         ? { $literal: val }
         : val),
 });
@@ -1628,8 +1628,7 @@ const aggregate = (db, streamName, input, snapshot = true, start = Date.now()) =
     };
     log('exec', streamName, req);
     const start2 = Date.now();
-    return db
-        .then(d => d.command(req))
+    return db.command(req)
         .then(result => {
         log('prepare', streamName, Date.now() - start);
         log('prepare2', streamName, start2 - start);
@@ -1880,54 +1879,9 @@ const getFirstStages = (view, needs) => {
     return { firstStages, hardMatch };
 };
 
-require('dotenv').config();
-const uri = process.env['MONGO_URL'];
-
-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 makeCol = async (docs, database, name) => {
-    if (!name) {
-        (name = crypto.randomUUID());
-    }
-    try {
-        const col = await database.createCollection(name, {
-            changeStreamPreAndPostImages: { enabled: true },
-        });
-        if (docs.length)
-            await col.insertMany([...docs]);
-        return col;
-    }
-    catch {
-        return database.collection(name);
-    }
-};
-
 const streamNames = {};
 const executes$2 = (view, input, streamName, skip = false, after, needs = {}) => {
     const { collection, projection, match } = view;
-    const client = prepare();
-    const pdb = client.then(cl => cl.db(collection.dbName));
     const { firstStages, hardMatch } = getFirstStages(view, needs);
     const db = collection.s.db, coll = collection.collectionName;
     const hash = crypto$1
@@ -2065,7 +2019,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 whenNotMatched: 'insert',
             })).stages;
             const stream = await makeStream();
-            const r = await aggregate(pdb, streamName, c => c({ coll: collection, input: cloneIntoNew }));
+            const r = await aggregate(db, streamName, c => c({ coll: collection, input: cloneIntoNew }));
             const start = Date.now();
             const res = await snapshotCollection.deleteMany({ updated: true, after: null, before: null });
             log('deleting from cloned into new collection', Date.now() - start, res, `db['${snapshotCollection.collectionName}'].deleteMany({ updated: true, after: null, before: null })`);
@@ -2079,7 +2033,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
             const stages = finalInput.raw(first);
             await last.updateOne({ _id: streamName }, { $set: { job: 1 } }, { upsert: true });
             const nextRes = stream.tryNext();
-            const aggResult = await aggregate(pdb, streamName, c => c({
+            const aggResult = await aggregate(db, streamName, c => c({
                 coll: snapshotCollection,
                 input: link()
                     .with($match_(root().of('updated').has($eq(true))))
@@ -2161,8 +2115,6 @@ const executes$1 = (view, input, streamName, needs) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const client = prepare();
-    const pdb = client.then(cl => cl.db(collection.dbName));
     const removeNotYetSynchronizedFields = projection &&
         Object.values(mapExactToObject(projection, (_, k) => (needs[k] ?? k.startsWith('_')) ? root().of(k).has($exists(true)) : null));
     const hardMatch = removeNotYetSynchronizedFields
@@ -2256,7 +2208,7 @@ const executes$1 = (view, input, streamName, needs) => {
             const raw = stages(lastTS).with(finalInput.raw(lastTS === null)).stages;
             const stream = await makeStream();
             const nextRes = stream.tryNext();
-            const aggResult = await aggregate(pdb, streamName, c => c({
+            const aggResult = await aggregate(db, streamName, c => c({
                 coll: collection,
                 input: raw,
             }));
@@ -2299,4 +2251,47 @@ const executes = (view, input, needs) => {
 };
 const single = (view, needs = {}) => pipe(input => executes(view, input, needs), emptyDelta(), concatDelta, emptyDelta);
 
+require('dotenv').config();
+const uri = process.env['MONGO_URL'];
+
+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 makeCol = async (docs, database, name) => {
+    if (!name) {
+        (name = crypto.randomUUID());
+    }
+    try {
+        const col = await database.createCollection(name, {
+            changeStreamPreAndPostImages: { enabled: true },
+        });
+        if (docs.length)
+            await col.insertMany([...docs]);
+        return col;
+    }
+    catch {
+        return database.collection(name);
+    }
+};
+
 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$1 as first, firstSure, floor, from, func, getWhenMatched, getWhenMatchedForMerge, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapFromPlainDateTime, mapToPlainDateTime, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, not, notNull, now, or, padLeft, 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

@@ -78,7 +78,7 @@ const spread = (a, b) => ({ ...a, ...mapExact(b, id$1) });
 const spread0 = (a, b) => ({ ...a, ...mapExact0(b, id$1) });
 
 const val = (val) => asExpr({
-    raw: () => asExprRaw((val && typeof val === 'object') || (typeof val === 'string' && val[0] === '$')
+    raw: () => asExprRaw((val && typeof val === 'object' && !(val instanceof Date)) || (typeof val === 'string' && val[0] === '$')
         ? { $literal: val }
         : val),
 });
@@ -1630,8 +1630,7 @@ const aggregate = (db, streamName, input, snapshot = true, start = Date.now()) =
     };
     log('exec', streamName, req);
     const start2 = Date.now();
-    return db
-        .then(d => d.command(req))
+    return db.command(req)
         .then(result => {
         log('prepare', streamName, Date.now() - start);
         log('prepare2', streamName, start2 - start);
@@ -1882,54 +1881,9 @@ const getFirstStages = (view, needs) => {
     return { firstStages, hardMatch };
 };
 
-require('dotenv').config();
-const uri = process.env['MONGO_URL'];
-
-const enablePreAndPostImages = (coll) => coll.s.db.command({
-    collMod: coll.collectionName,
-    changeStreamPreAndPostImages: { enabled: true },
-});
-const prepare = async (testName) => {
-    const client = new mongodb.MongoClient(uri, testName ? { monitorCommands: true } : {});
-    if (testName) {
-        const handler = (c) => {
-            promises.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 makeCol = async (docs, database, name) => {
-    if (!name) {
-        (name = crypto.randomUUID());
-    }
-    try {
-        const col = await database.createCollection(name, {
-            changeStreamPreAndPostImages: { enabled: true },
-        });
-        if (docs.length)
-            await col.insertMany([...docs]);
-        return col;
-    }
-    catch {
-        return database.collection(name);
-    }
-};
-
 const streamNames = {};
 const executes$2 = (view, input, streamName, skip = false, after, needs = {}) => {
     const { collection, projection, match } = view;
-    const client = prepare();
-    const pdb = client.then(cl => cl.db(collection.dbName));
     const { firstStages, hardMatch } = getFirstStages(view, needs);
     const db = collection.s.db, coll = collection.collectionName;
     const hash = crypto$1
@@ -2067,7 +2021,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
                 whenNotMatched: 'insert',
             })).stages;
             const stream = await makeStream();
-            const r = await aggregate(pdb, streamName, c => c({ coll: collection, input: cloneIntoNew }));
+            const r = await aggregate(db, streamName, c => c({ coll: collection, input: cloneIntoNew }));
             const start = Date.now();
             const res = await snapshotCollection.deleteMany({ updated: true, after: null, before: null });
             log('deleting from cloned into new collection', Date.now() - start, res, `db['${snapshotCollection.collectionName}'].deleteMany({ updated: true, after: null, before: null })`);
@@ -2081,7 +2035,7 @@ const executes$2 = (view, input, streamName, skip = false, after, needs = {}) =>
             const stages = finalInput.raw(first);
             await last.updateOne({ _id: streamName }, { $set: { job: 1 } }, { upsert: true });
             const nextRes = stream.tryNext();
-            const aggResult = await aggregate(pdb, streamName, c => c({
+            const aggResult = await aggregate(db, streamName, c => c({
                 coll: snapshotCollection,
                 input: link()
                     .with($match_(root().of('updated').has($eq(true))))
@@ -2163,8 +2117,6 @@ const executes$1 = (view, input, streamName, needs) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const client = prepare();
-    const pdb = client.then(cl => cl.db(collection.dbName));
     const removeNotYetSynchronizedFields = projection &&
         Object.values(mapExactToObject(projection, (_, k) => (needs[k] ?? k.startsWith('_')) ? root().of(k).has($exists(true)) : null));
     const hardMatch = removeNotYetSynchronizedFields
@@ -2258,7 +2210,7 @@ const executes$1 = (view, input, streamName, needs) => {
             const raw = stages(lastTS).with(finalInput.raw(lastTS === null)).stages;
             const stream = await makeStream();
             const nextRes = stream.tryNext();
-            const aggResult = await aggregate(pdb, streamName, c => c({
+            const aggResult = await aggregate(db, streamName, c => c({
                 coll: collection,
                 input: raw,
             }));
@@ -2301,6 +2253,49 @@ const executes = (view, input, needs) => {
 };
 const single = (view, needs = {}) => pipe(input => executes(view, input, needs), emptyDelta(), concatDelta, emptyDelta);
 
+require('dotenv').config();
+const uri = process.env['MONGO_URL'];
+
+const enablePreAndPostImages = (coll) => coll.s.db.command({
+    collMod: coll.collectionName,
+    changeStreamPreAndPostImages: { enabled: true },
+});
+const prepare = async (testName) => {
+    const client = new mongodb.MongoClient(uri, testName ? { monitorCommands: true } : {});
+    if (testName) {
+        const handler = (c) => {
+            promises.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 makeCol = async (docs, database, name) => {
+    if (!name) {
+        (name = crypto.randomUUID());
+    }
+    try {
+        const col = await database.createCollection(name, {
+            changeStreamPreAndPostImages: { enabled: true },
+        });
+        if (docs.length)
+            await col.insertMany([...docs]);
+        return col;
+    }
+    catch {
+        return database.collection(name);
+    }
+};
+
 exports.$accumulator = $accumulator;
 exports.$and = $and;
 exports.$countDict = $countDict;

package/package.json

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