@budibase/server 1.0.160 → 1.0.163

package/coverage/lcov.info

@@ -3477,15 +3477,15 @@ BRH:18
 end_of_record
 TN:
 SF:src/api/controllers/view/utils.js
-FN:11,(anonymous_0)
-FN:27,(anonymous_1)
-FN:49,(anonymous_2)
-FN:60,(anonymous_3)
-FN:98,(anonymous_4)
-FN:114,(anonymous_5)
-FN:123,(anonymous_6)
-FN:131,(anonymous_7)
-FN:140,(anonymous_8)
+FN:12,(anonymous_0)
+FN:28,(anonymous_1)
+FN:50,(anonymous_2)
+FN:61,(anonymous_3)
+FN:99,(anonymous_4)
+FN:115,(anonymous_5)
+FN:125,(anonymous_6)
+FN:133,(anonymous_7)
+FN:142,(anonymous_8)
 FNF:9
 FNH:6
 FNDA:2,(anonymous_0)
@@ -3500,194 +3500,210 @@ FNDA:1,(anonymous_8)
 DA:7,41
 DA:8,41
 DA:9,41
-DA:11,41
-DA:12,2
+DA:10,41
+DA:12,41
 DA:13,2
 DA:14,2
 DA:15,2
-DA:18,0
+DA:16,2
 DA:19,0
-DA:22,0
+DA:20,0
 DA:23,0
-DA:27,41
-DA:28,2
+DA:24,0
+DA:28,41
 DA:29,2
 DA:30,2
 DA:31,2
 DA:32,2
-DA:34,5
-DA:35,4
-DA:37,1
-DA:43,0
-DA:49,0
+DA:33,2
+DA:35,5
+DA:36,4
+DA:38,1
+DA:44,0
 DA:50,0
 DA:51,0
-DA:57,2
-DA:60,41
-DA:61,8
+DA:52,0
+DA:58,2
+DA:61,41
 DA:62,8
 DA:63,8
 DA:64,8
-DA:69,8
-DA:70,0
-DA:72,8
-DA:74,0
+DA:65,8
+DA:70,8
+DA:71,0
+DA:73,8
 DA:75,0
 DA:76,0
-DA:82,0
+DA:77,0
 DA:83,0
 DA:84,0
 DA:85,0
 DA:86,0
-DA:88,0
+DA:87,0
 DA:89,0
-DA:94,0
-DA:98,41
-DA:99,1
+DA:90,0
+DA:95,0
+DA:99,41
 DA:100,1
 DA:101,1
 DA:102,1
 DA:103,1
 DA:104,1
 DA:105,1
-DA:107,0
+DA:106,1
 DA:108,0
 DA:109,0
 DA:110,0
-DA:114,41
-DA:116,0
+DA:111,0
+DA:115,41
 DA:117,0
-DA:118,0
 DA:119,0
 DA:120,0
-DA:123,41
-DA:124,0
-DA:125,0
+DA:121,0
+DA:122,0
+DA:125,41
 DA:126,0
 DA:127,0
 DA:128,0
-DA:131,41
-DA:132,6
-DA:133,6
+DA:129,0
+DA:130,0
+DA:133,41
 DA:134,6
-DA:135,1
-DA:137,5
-DA:140,41
-DA:141,1
-DA:142,0
-DA:143,0
+DA:135,6
+DA:136,6
+DA:137,1
+DA:139,5
+DA:142,41
+DA:143,1
+DA:144,0
 DA:145,0
 DA:147,0
-LF:81
-LH:43
-BRDA:13,0,0,2
-BRDA:13,0,1,0
-BRDA:18,1,0,0
-BRDA:18,1,1,0
-BRDA:30,2,0,2
-BRDA:30,2,1,0
-BRDA:34,3,0,4
-BRDA:34,3,1,1
-BRDA:62,4,0,8
-BRDA:62,4,1,0
-BRDA:69,5,0,0
-BRDA:69,5,1,8
-BRDA:75,6,0,0
-BRDA:75,6,1,0
-BRDA:84,7,0,0
-BRDA:84,7,1,0
-BRDA:88,8,0,0
-BRDA:88,8,1,0
-BRDA:88,9,0,0
-BRDA:88,9,1,0
-BRDA:100,10,0,1
-BRDA:100,10,1,0
-BRDA:134,11,0,1
-BRDA:134,11,1,5
-BRDA:142,12,0,0
-BRDA:142,12,1,0
+DA:149,0
+LF:82
+LH:44
+BRDA:14,0,0,2
+BRDA:14,0,1,0
+BRDA:19,1,0,0
+BRDA:19,1,1,0
+BRDA:31,2,0,2
+BRDA:31,2,1,0
+BRDA:35,3,0,4
+BRDA:35,3,1,1
+BRDA:63,4,0,8
+BRDA:63,4,1,0
+BRDA:70,5,0,0
+BRDA:70,5,1,8
+BRDA:76,6,0,0
+BRDA:76,6,1,0
+BRDA:85,7,0,0
+BRDA:85,7,1,0
+BRDA:89,8,0,0
+BRDA:89,8,1,0
+BRDA:89,9,0,0
+BRDA:89,9,1,0
+BRDA:101,10,0,1
+BRDA:101,10,1,0
+BRDA:136,11,0,1
+BRDA:136,11,1,5
+BRDA:144,12,0,0
+BRDA:144,12,1,0
 BRF:26
 BRH:9
 end_of_record
 TN:
 SF:src/api/controllers/view/viewBuilder.js
-FN:13,(anonymous_0)
-FN:71,parseFilterExpression
-FN:108,parseEmitExpression
-FN:123,viewTemplate
-FNF:4
-FNH:3
-FNDA:0,(anonymous_0)
-FNDA:11,parseFilterExpression
-FNDA:11,parseEmitExpression
-FNDA:11,viewTemplate
+FN:19,(anonymous_0)
+FN:77,parseFilterExpression
+FN:114,parseEmitExpression
+FN:129,viewTemplate
+FN:145,(anonymous_4)
+FNF:5
+FNH:5
+FNDA:7,(anonymous_0)
+FNDA:19,parseFilterExpression
+FNDA:12,parseEmitExpression
+FNDA:12,viewTemplate
+FNDA:1,(anonymous_4)
 DA:1,42
 DA:13,42
-DA:14,0
-DA:22,42
+DA:19,42
+DA:20,7
 DA:28,42
 DA:34,42
-DA:72,11
-DA:74,11
-DA:75,11
-DA:76,2
-DA:77,1
-DA:80,2
-DA:81,0
-DA:84,2
-DA:85,0
-DA:86,2
+DA:40,42
+DA:78,19
+DA:80,19
+DA:81,19
+DA:82,10
+DA:83,1
+DA:86,10
 DA:87,0
-DA:90,2
-DA:92,2
-DA:96,2
-DA:99,11
-DA:109,11
-DA:125,11
-DA:126,0
-DA:128,11
-DA:129,11
-DA:131,11
-DA:133,11
-DA:135,11
-DA:137,11
-DA:138,6
-DA:144,11
-DA:162,42
-LF:33
-LH:28
-BRDA:76,0,0,1
-BRDA:76,0,1,1
-BRDA:76,1,0,2
-BRDA:76,1,1,1
-BRDA:80,2,0,0
-BRDA:80,2,1,2
-BRDA:84,3,0,0
-BRDA:84,3,1,2
-BRDA:86,4,0,0
-BRDA:86,4,1,2
-BRDA:90,5,0,2
-BRDA:90,5,1,0
-BRDA:109,6,0,11
-BRDA:109,6,1,9
-BRDA:123,7,0,8
-BRDA:125,8,0,0
-BRDA:125,8,1,11
-BRDA:125,9,0,11
-BRDA:125,9,1,11
-BRDA:125,9,2,1
-BRDA:129,10,0,1
-BRDA:129,10,1,10
-BRDA:133,11,0,6
-BRDA:133,11,1,5
-BRDA:133,12,0,11
-BRDA:133,12,1,7
-BRDA:137,13,0,6
-BRDA:137,13,1,5
-BRDA:139,14,0,1
-BRDA:139,14,1,5
-BRF:30
-BRH:25
+DA:90,10
+DA:91,0
+DA:92,10
+DA:93,7
+DA:96,3
+DA:98,3
+DA:102,10
+DA:105,19
+DA:115,12
+DA:131,12
+DA:132,0
+DA:135,12
+DA:136,12
+DA:138,12
+DA:139,7
+DA:143,7
+DA:146,1
+DA:149,7
+DA:155,12
+DA:156,12
+DA:158,12
+DA:159,12
+DA:160,12
+DA:163,12
+DA:165,12
+DA:183,42
+LF:40
+LH:37
+BRDA:82,0,0,1
+BRDA:82,0,1,9
+BRDA:82,1,0,10
+BRDA:82,1,1,1
+BRDA:86,2,0,0
+BRDA:86,2,1,10
+BRDA:90,3,0,0
+BRDA:90,3,1,10
+BRDA:92,4,0,7
+BRDA:92,4,1,3
+BRDA:96,5,0,2
+BRDA:96,5,1,1
+BRDA:115,6,0,12
+BRDA:115,6,1,10
+BRDA:129,7,0,8
+BRDA:131,8,0,0
+BRDA:131,8,1,12
+BRDA:131,9,0,12
+BRDA:131,9,1,12
+BRDA:131,9,2,2
+BRDA:138,10,0,7
+BRDA:138,10,1,5
+BRDA:140,11,0,1
+BRDA:140,11,1,6
+BRDA:143,12,0,7
+BRDA:143,12,1,0
+BRDA:146,13,0,1
+BRDA:146,13,1,0
+BRDA:156,14,0,2
+BRDA:156,14,1,10
+BRDA:160,15,0,7
+BRDA:160,15,1,5
+BRDA:163,16,0,7
+BRDA:163,16,1,5
+BRDA:163,17,0,12
+BRDA:163,17,1,8
+BRF:36
+BRH:31
 end_of_record
 TN:
 SF:src/api/routes/analytics.js

package/dist/api/controllers/view/utils.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { ViewNames, generateMemoryViewID, getMemoryViewParams, DocumentTypes, SEPARATOR, } = require("../../../db/utils");
 const env = require("../../../environment");
 const { getAppDB } = require("@budibase/backend-core/context");
+const viewBuilder = require("./viewBuilder");
 exports.getView = (viewName) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     if (env.SELF_HOSTED) {
@@ -104,7 +105,8 @@ exports.deleteView = (viewName) => __awaiter(void 0, void 0, void 0, function* (
 exports.migrateToInMemoryView = (db, viewName) => __awaiter(void 0, void 0, void 0, function* () {
     // delete the view initially
     const designDoc = yield db.get("_design/database");
-    const view = designDoc.views[viewName];
+    // run the view back through the view builder to update it
+    const view = viewBuilder(designDoc.views[viewName].meta);
     delete designDoc.views[viewName];
     yield db.put(designDoc);
     yield exports.saveView(db, null, viewName, view);
@@ -112,7 +114,7 @@ exports.migrateToInMemoryView = (db, viewName) => __awaiter(void 0, void 0, void
 exports.migrateToDesignView = (db, viewName) => __awaiter(void 0, void 0, void 0, function* () {
     let view = yield db.get(generateMemoryViewID(viewName));
     const designDoc = yield db.get("_design/database");
-    designDoc.views[viewName] = view.view;
+    designDoc.views[viewName] = viewBuilder(view.view.meta);
     yield db.put(designDoc);
     yield db.remove(view._id, view._rev);
 });

package/dist/api/controllers/view/viewBuilder.js

@@ -10,6 +10,11 @@ const TOKEN_MAP = {
     AND: "&&",
     OR: "||",
 };
+const CONDITIONS = {
+    EMPTY: "EMPTY",
+    NOT_EMPTY: "NOT_EMPTY",
+    CONTAINS: "CONTAINS",
+};
 const isEmptyExpression = key => {
     return `(
       doc["${key}"] === undefined ||
@@ -71,13 +76,13 @@ function parseFilterExpression(filters) {
         if (!first && filter.conjunction) {
             expression.push(TOKEN_MAP[filter.conjunction]);
         }
-        if (filter.condition === "CONTAINS") {
+        if (filter.condition === CONDITIONS.CONTAINS) {
             expression.push(`doc["${filter.key}"].${TOKEN_MAP[filter.condition]}("${filter.value}")`);
         }
-        else if (filter.condition === "EMPTY") {
+        else if (filter.condition === CONDITIONS.EMPTY) {
             expression.push(isEmptyExpression(filter.key));
         }
-        else if (filter.condition === "NOT_EMPTY") {
+        else if (filter.condition === CONDITIONS.NOT_EMPTY) {
             expression.push(`!${isEmptyExpression(filter.key)}`);
         }
         else {
@@ -113,14 +118,23 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) {
     if (filters && filters.length > 0 && filters[0].conjunction) {
         delete filters[0].conjunction;
     }
+    let schema = null, statFilter = null;
+    if (calculation) {
+        schema = Object.assign(Object.assign({}, (groupBy ? GROUP_PROPERTY : FIELD_PROPERTY)), SCHEMA_MAP[calculation]);
+        if (!filters.find(filter => filter.key === field && filter.condition === CONDITIONS.NOT_EMPTY)) {
+            statFilter = parseFilterExpression([
+                { key: field, condition: CONDITIONS.NOT_EMPTY },
+            ]);
+        }
+    }
     const parsedFilters = parseFilterExpression(filters);
     const filterExpression = parsedFilters ? `&& (${parsedFilters})` : "";
     const emitExpression = parseEmitExpression(field, groupBy);
+    const tableExpression = `doc.tableId === "${tableId}"`;
+    const coreExpression = statFilter
+        ? `(${tableExpression} && ${statFilter})`
+        : tableExpression;
     const reduction = field && calculation ? { reduce: `_${calculation}` } : {};
-    let schema = null;
-    if (calculation) {
-        schema = Object.assign(Object.assign({}, (groupBy ? GROUP_PROPERTY : FIELD_PROPERTY)), SCHEMA_MAP[calculation]);
-    }
     return Object.assign({ meta: {
             field,
             tableId,
@@ -129,7 +143,7 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) {
             schema,
             calculation,
         }, map: `function (doc) {
-      if (doc.tableId === "${tableId}" ${filterExpression}) {
+      if (${coreExpression} ${filterExpression}) {
         ${emitExpression}
       }
     }` }, reduction);

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.159",
+    "version": "1.0.162",
     "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.159",
-        "@budibase/client": "^1.0.159",
-        "@budibase/pro": "1.0.159",
-        "@budibase/string-templates": "^1.0.159",
+        "@budibase/backend-core": "^1.0.162",
+        "@budibase/client": "^1.0.162",
+        "@budibase/pro": "1.0.162",
+        "@budibase/string-templates": "^1.0.162",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",