@lowdefy/connection-mongodb 4.0.0-rc.0 → 4.0.0-rc.10

package/dist/auth/adapters/MongoDBAdapter/MongoDBAdapter.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ Default collections are:
   VerificationTokens: "verification_tokens",
 }
 */ // TODO: Docs: MongoDB database name should be in databaseUri
-function MongoDBAdapter({ properties  }) {
-    const { databaseUri , mongoDBClientOptions , collections  } = properties;
+function MongoDBAdapter({ properties }) {
+    const { databaseUri, mongoDBClientOptions, options } = properties;
     const clientPromise = new MongoClient(databaseUri, mongoDBClientOptions).connect();
-    return NextAuthMongoDBAdapter(clientPromise, collections);
+    return NextAuthMongoDBAdapter(clientPromise, options);
 }
 export default MongoDBAdapter;

package/dist/connections/MongoDBCollection/MongoDBAggregation/MongoDBAggregation.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-function checkOutAndMerge({ pipeline , connection  }) {
+function checkOutAndMerge({ pipeline, connection }) {
     if (connection.write !== true) {
         pipeline.forEach((stage)=>{
             if (stage.$out != null || stage.$merge != null) {
@@ -24,14 +24,14 @@ function checkOutAndMerge({ pipeline , connection  }) {
         });
     }
 }
-async function MongodbAggregation({ request , connection  }) {
+async function MongodbAggregation({ request, connection }) {
     const deserializedRequest = deserialize(request);
-    const { pipeline , options  } = deserializedRequest;
+    const { pipeline, options } = deserializedRequest;
     checkOutAndMerge({
         pipeline,
         connection
     });
-    const { collection , client  } = await getCollection({
+    const { collection, client } = await getCollection({
         connection
     });
     let res;

package/dist/connections/MongoDBCollection/MongoDBAggregation/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBCollection.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBDeleteMany/MongoDBDeleteMany.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbDeleteMany({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbDeleteMany({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { filter , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { filter, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
@@ -36,8 +36,8 @@ async function MongodbDeleteMany({ blockId , connection , pageId , request , req
                 requestId,
                 response,
                 timestamp: new Date(),
-                type: 'MongoDBInsertMany',
-                user: connection.changeLog?.user
+                type: 'MongoDBDeleteMany',
+                meta: connection.changeLog?.meta
             });
         }
     } catch (error) {
@@ -45,7 +45,7 @@ async function MongodbDeleteMany({ blockId , connection , pageId , request , req
         throw error;
     }
     await client.close();
-    const { acknowledged , deletedCount  } = serialize(response);
+    const { acknowledged, deletedCount } = serialize(response);
     return {
         acknowledged,
         deletedCount

package/dist/connections/MongoDBCollection/MongoDBDeleteMany/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBDeleteOne/MongoDBDeleteOne.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,16 +15,17 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbDeleteOne({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbDeleteOne({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { filter , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { filter, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
     try {
         if (logCollection) {
-            response = await collection.findOneAndDelete(filter, options);
+            const { value, ...responseWithoutValue } = await collection.findOneAndDelete(filter, options);
+            response = responseWithoutValue;
             await logCollection.insertOne({
                 args: {
                     filter,
@@ -34,10 +35,10 @@ async function MongodbDeleteOne({ blockId , connection , pageId , request , requ
                 pageId,
                 payload,
                 requestId,
-                before: response,
+                before: value,
                 timestamp: new Date(),
                 type: 'MongoDBDeleteOne',
-                user: connection.changeLog?.user
+                meta: connection.changeLog?.meta
             });
         } else {
             response = await collection.deleteOne(filter, options);
@@ -47,11 +48,7 @@ async function MongodbDeleteOne({ blockId , connection , pageId , request , requ
         throw error;
     }
     await client.close();
-    const { acknowledged , deletedCount  } = serialize(response);
-    return {
-        acknowledged,
-        deletedCount
-    };
+    return serialize(response);
 }
 MongodbDeleteOne.schema = schema;
 MongodbDeleteOne.meta = {

package/dist/connections/MongoDBCollection/MongoDBDeleteOne/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBFind/MongoDBFind.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbFind({ request , connection  }) {
+async function MongodbFind({ request, connection }) {
     const deserializedRequest = deserialize(request);
-    const { query , options  } = deserializedRequest;
-    const { collection , client  } = await getCollection({
+    const { query, options } = deserializedRequest;
+    const { collection, client } = await getCollection({
         connection
     });
     let res;

package/dist/connections/MongoDBCollection/MongoDBFind/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBFindOne/MongoDBFindOne.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbFindOne({ request , connection  }) {
+async function MongodbFindOne({ request, connection }) {
     const deserializedRequest = deserialize(request);
-    const { query , options  } = deserializedRequest;
-    const { collection , client  } = await getCollection({
+    const { query, options } = deserializedRequest;
+    const { collection, client } = await getCollection({
         connection
     });
     let res;

package/dist/connections/MongoDBCollection/MongoDBFindOne/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBInsertMany/MongoDBInsertMany.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbInsertMany({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbInsertMany({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { docs , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { docs, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
@@ -37,7 +37,7 @@ async function MongodbInsertMany({ blockId , connection , pageId , request , req
                 response,
                 timestamp: new Date(),
                 type: 'MongoDBInsertMany',
-                user: connection.changeLog?.user
+                meta: connection.changeLog?.meta
             });
         }
     } catch (error) {
@@ -45,7 +45,7 @@ async function MongodbInsertMany({ blockId , connection , pageId , request , req
         throw error;
     }
     await client.close();
-    const { acknowledged , insertedCount  } = serialize(response);
+    const { acknowledged, insertedCount } = serialize(response);
     return {
         acknowledged,
         insertedCount

package/dist/connections/MongoDBCollection/MongoDBInsertMany/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBInsertOne/MongoDBInsertOne.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbInsertOne({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbInsertOne({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { doc , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { doc, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
@@ -37,7 +37,7 @@ async function MongodbInsertOne({ blockId , connection , pageId , request , requ
                 response,
                 timestamp: new Date(),
                 type: 'MongoDBInsertOne',
-                user: connection.changeLog?.user
+                meta: connection.changeLog?.meta
             });
         }
     } catch (error) {
@@ -45,7 +45,7 @@ async function MongodbInsertOne({ blockId , connection , pageId , request , requ
         throw error;
     }
     await client.close();
-    const { acknowledged , insertedId  } = serialize(response);
+    const { acknowledged, insertedId } = serialize(response);
     return {
         acknowledged,
         insertedId

package/dist/connections/MongoDBCollection/MongoDBInsertOne/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBUpdateMany/MongoDBUpdateMany.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbUpdateMany({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbUpdateMany({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { filter , update , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { filter, update, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
@@ -38,7 +38,7 @@ async function MongodbUpdateMany({ blockId , connection , pageId , request , req
                 response,
                 timestamp: new Date(),
                 type: 'MongoDBUpdateMany',
-                user: connection.changeLog?.user
+                meta: connection.changeLog?.meta
             });
         }
     } catch (error) {
@@ -46,7 +46,7 @@ async function MongodbUpdateMany({ blockId , connection , pageId , request , req
         throw error;
     }
     await client.close();
-    const { modifiedCount , upsertedId , upsertedCount , matchedCount  } = serialize(response);
+    const { modifiedCount, upsertedId, upsertedCount, matchedCount } = serialize(response);
     return {
         modifiedCount,
         upsertedId,

package/dist/connections/MongoDBCollection/MongoDBUpdateMany/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/MongoDBUpdateOne/MongoDBUpdateOne.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,18 +15,19 @@
 */ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
-async function MongodbUpdateOne({ blockId , connection , pageId , request , requestId , payload  }) {
+async function MongodbUpdateOne({ blockId, connection, pageId, request, requestId, payload }) {
     const deserializedRequest = deserialize(request);
-    const { filter , update , options  } = deserializedRequest;
-    const { collection , client , logCollection  } = await getCollection({
+    const { filter, update, options } = deserializedRequest;
+    const { collection, client, logCollection } = await getCollection({
         connection
     });
     let response;
     try {
         if (logCollection) {
-            response = await collection.findOneAndUpdate(filter, update, options);
+            const { value, ...responseWithoutValue } = await collection.findOneAndUpdate(filter, update, options);
+            response = responseWithoutValue;
             const after = await collection.findOne({
-                _id: response._id
+                _id: value ? value._id : response.lastErrorObject?.upserted
             });
             await logCollection.insertOne({
                 args: {
@@ -38,11 +39,11 @@ async function MongodbUpdateOne({ blockId , connection , pageId , request , requ
                 pageId,
                 payload,
                 requestId,
-                before: response,
+                before: value,
                 after,
                 timestamp: new Date(),
                 type: 'MongoDBUpdateOne',
-                user: connection.changeLog?.user
+                meta: connection.changeLog?.meta
             });
         } else {
             response = await collection.updateOne(filter, update, options);
@@ -52,13 +53,7 @@ async function MongodbUpdateOne({ blockId , connection , pageId , request , requ
         throw error;
     }
     await client.close();
-    const { modifiedCount , upsertedId , upsertedCount , matchedCount  } = serialize(response);
-    return {
-        modifiedCount,
-        upsertedId,
-        upsertedCount,
-        matchedCount
-    };
+    return serialize(response);
 }
 MongodbUpdateOne.schema = schema;
 MongodbUpdateOne.meta = {

package/dist/connections/MongoDBCollection/MongoDBUpdateOne/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/getCollection.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { MongoClient } from 'mongodb';
-async function getCollection({ connection  }) {
+async function getCollection({ connection }) {
     let client;
-    const { collection , databaseName , databaseUri , changeLog , options  } = connection;
+    const { collection, databaseName, databaseUri, changeLog, options } = connection;
     client = new MongoClient(databaseUri, options);
     await client.connect();
     try {

package/dist/connections/MongoDBCollection/schema.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/connections/MongoDBCollection/serialize.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { ObjectId } from 'mongodb';
-import { type } from '@lowdefy/helpers';
+import { serializer, type } from '@lowdefy/helpers';
 function replacer(_, value) {
     if (type.isObject(value)) {
         Object.keys(value).forEach((key)=>{
@@ -23,12 +23,6 @@ function replacer(_, value) {
                     _oid: value[key].toHexString()
                 };
             }
-            if (type.isDate(value[key])) {
-                // eslint-disable-next-line no-param-reassign
-                value[key] = {
-                    _date: value[key].valueOf()
-                };
-            }
         });
         return value;
     }
@@ -39,11 +33,6 @@ function replacer(_, value) {
                     _oid: item.toHexString()
                 };
             }
-            if (type.isDate(item)) {
-                return {
-                    _date: item.valueOf()
-                };
-            }
             return item;
         });
     }
@@ -54,20 +43,17 @@ function reviver(key, value) {
         if (value._oid) {
             return ObjectId.createFromHexString(value._oid);
         }
-        if (type.isInt(value._date) || type.isString(value._date)) {
-            return new Date(value._date);
-        }
     }
     return value;
 }
 function serialize(obj) {
-    if (type.isUndefined(obj)) return obj;
-    return JSON.parse(JSON.stringify(obj, replacer));
+    return serializer.copy(obj, {
+        replacer
+    });
 }
-// need to use replacer here, since objects are already partially deserialised.
-// otherwise dates become strings
 function deserialize(obj) {
-    if (type.isUndefined(obj)) return obj;
-    return JSON.parse(JSON.stringify(obj, replacer), reviver);
+    return serializer.copy(obj, {
+        reviver
+    });
 }
 export { serialize, deserialize };

package/dist/connections.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/types.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/namespace */ /*
-  Copyright 2020-2022 Lowdefy, Inc
+  Copyright 2020-2023 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/connection-mongodb",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.10",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -42,25 +42,26 @@
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-rc.0",
-    "@next-auth/mongodb-adapter": "1.0.3",
-    "mongodb": "4.6.0",
+    "@lowdefy/helpers": "4.0.0-rc.10",
+    "@next-auth/mongodb-adapter": "1.1.1",
+    "mongodb": "4.13.0",
     "saslprep": "1.0.3"
   },
   "devDependencies": {
-    "@lowdefy/ajv": "4.0.0-rc.0",
-    "@shelf/jest-mongodb": "4.1.0",
-    "@swc/cli": "0.1.57",
-    "@swc/core": "1.2.194",
-    "@swc/jest": "0.2.21",
-    "jest": "28.1.0",
-    "jest-environment-node": "28.1.0",
-    "next-auth": "4.10.3",
+    "@lowdefy/ajv": "4.0.0-rc.10",
+    "@shelf/jest-mongodb": "4.1.4",
+    "@swc/cli": "0.1.62",
+    "@swc/core": "1.3.70",
+    "@swc/jest": "0.2.27",
+    "jest": "28.1.3",
+    "jest-environment-node": "28.1.3",
+    "next": "12.3.4",
+    "next-auth": "4.20.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6872d7ff6da421710096536fce7b2016ef8f35c"
+  "gitHead": "537af074f27770e32da9da8d48490f2eda94b406"
 }