@budibase/server 1.0.162 → 1.0.164

package/dist/integrations/mongodb.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const datasource_1 = require("../definitions/datasource");
+const mongodb_1 = require("mongodb");
 var MongoDBModule;
 (function (MongoDBModule) {
-    const { MongoClient } = require("mongodb");
     const SCHEMA = {
         docs: "https://github.com/mongodb/node-mongodb-native",
         friendlyName: "MongoDB",
@@ -64,27 +64,79 @@ var MongoDBModule;
     class MongoIntegration {
         constructor(config) {
             this.config = config;
-            this.client = new MongoClient(config.connectionString);
+            this.client = new mongodb_1.MongoClient(config.connectionString);
         }
         connect() {
             return __awaiter(this, void 0, void 0, function* () {
                 return this.client.connect();
             });
         }
+        createObjectIds(json) {
+            const self = this;
+            function interpolateObjectIds(json) {
+                var _a;
+                for (let field of Object.keys(json)) {
+                    if (json[field] instanceof Object) {
+                        json[field] = self.createObjectIds(json[field]);
+                    }
+                    if (field === "_id" && typeof json[field] === "string") {
+                        const id = (_a = json["_id"].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)) === null || _a === void 0 ? void 0 : _a[0];
+                        if (id) {
+                            json["_id"] = mongodb_1.ObjectID.createFromHexString(id);
+                        }
+                    }
+                }
+                return json;
+            }
+            if (Array.isArray(json)) {
+                for (let i = 0; i < json.length; i++) {
+                    json[i] = interpolateObjectIds(json[i]);
+                }
+                return json;
+            }
+            return interpolateObjectIds(json);
+        }
+        parseQueryParams(params, mode) {
+            let queryParams = params.split(/(?<=(},)).*{/g);
+            let group1 = queryParams[0];
+            let group2 = queryParams[2];
+            let group3 = queryParams[4];
+            if (group1) {
+                group1 = JSON.parse(group1.replace(/,+$/, ""));
+            }
+            if (group2) {
+                group2 = JSON.parse("{" + group2.replace(/,+$/, ""));
+            }
+            if (group3) {
+                group3 = JSON.parse("{" + group3.replace(/,+$/, ""));
+            }
+            if (mode === "update") {
+                return {
+                    filter: group1,
+                    update: group2,
+                    options: group3 !== null && group3 !== void 0 ? group3 : {},
+                };
+            }
+            return {
+                filter: group1,
+                options: group2 !== null && group2 !== void 0 ? group2 : {},
+            };
+        }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
                     yield this.connect();
                     const db = this.client.db(this.config.db);
                     const collection = db.collection(query.extra.collection);
+                    let json = this.createObjectIds(query.json);
                     // For mongodb we add an extra actionType to specify
                     // which method we want to call on the collection
                     switch (query.extra.actionTypes) {
                         case "insertOne": {
-                            return yield collection.insertOne(query.json);
+                            return yield collection.insertOne(json);
                         }
                         case "insertMany": {
-                            return yield collection.insertOne(query.json).toArray();
+                            return yield collection.insertMany(json);
                         }
                         default: {
                             throw new Error(`actionType ${query.extra.actionTypes} does not exist on DB for create`);
@@ -106,21 +158,23 @@ var MongoDBModule;
                     yield this.connect();
                     const db = this.client.db(this.config.db);
                     const collection = db.collection(query.extra.collection);
+                    let json = this.createObjectIds(query.json);
                     switch (query.extra.actionTypes) {
                         case "find": {
-                            return yield collection.find(query.json).toArray();
+                            return yield collection.find(json).toArray();
                         }
                         case "findOne": {
-                            return yield collection.findOne(query.json);
+                            return yield collection.findOne(json);
                         }
                         case "findOneAndUpdate": {
-                            return yield collection.findOneAndUpdate(query.json);
+                            let findAndUpdateJson = json;
+                            return yield collection.findOneAndUpdate(findAndUpdateJson.filter, findAndUpdateJson.update, findAndUpdateJson.options);
                         }
                         case "count": {
-                            return yield collection.countDocuments(query.json);
+                            return yield collection.countDocuments(json);
                         }
                         case "distinct": {
-                            return yield collection.distinct(query.json);
+                            return yield collection.distinct(json);
                         }
                         default: {
                             throw new Error(`actionType ${query.extra.actionTypes} does not exist on DB for read`);
@@ -142,12 +196,17 @@ var MongoDBModule;
                     yield this.connect();
                     const db = this.client.db(this.config.db);
                     const collection = db.collection(query.extra.collection);
+                    let queryJson = query.json;
+                    if (typeof queryJson === "string") {
+                        queryJson = this.parseQueryParams(queryJson, "update");
+                    }
+                    let json = this.createObjectIds(queryJson);
                     switch (query.extra.actionTypes) {
                         case "updateOne": {
-                            return yield collection.updateOne(query.json);
+                            return yield collection.updateOne(json.filter, json.update, json.options);
                         }
                         case "updateMany": {
-                            return yield collection.updateMany(query.json).toArray();
+                            return yield collection.updateMany(json.filter, json.update, json.options);
                         }
                         default: {
                             throw new Error(`actionType ${query.extra.actionTypes} does not exist on DB for update`);
@@ -169,12 +228,17 @@ var MongoDBModule;
                     yield this.connect();
                     const db = this.client.db(this.config.db);
                     const collection = db.collection(query.extra.collection);
+                    let queryJson = query.json;
+                    if (typeof queryJson === "string") {
+                        queryJson = this.parseQueryParams(queryJson, "delete");
+                    }
+                    let json = this.createObjectIds(queryJson);
                     switch (query.extra.actionTypes) {
                         case "deleteOne": {
-                            return yield collection.deleteOne(query.json);
+                            return yield collection.deleteOne(json.filter, json.options);
                         }
                         case "deleteMany": {
-                            return yield collection.deleteMany(query.json).toArray();
+                            return yield collection.deleteMany(json.filter, json.options);
                         }
                         default: {
                             throw new Error(`actionType ${query.extra.actionTypes} does not exist on DB for delete`);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.161",
+    "version": "1.0.163",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,10 +69,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.161",
-        "@budibase/client": "^1.0.161",
-        "@budibase/pro": "1.0.161",
-        "@budibase/string-templates": "^1.0.161",
+        "@budibase/backend-core": "^1.0.163",
+        "@budibase/client": "^1.0.163",
+        "@budibase/pro": "1.0.163",
+        "@budibase/string-templates": "^1.0.163",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -155,6 +155,7 @@
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@types/redis": "^4.0.11",
+        "@types/mongodb": "3.6.3",
         "@typescript-eslint/parser": "5.12.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",