@budibase/server 1.2.42 → 1.2.44-alpha.1

package/dist/api/controllers/row/internalSearch.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { SearchIndexes } = require("../../../db/utils");
+const { removeKeyNumbering } = require("./utils");
 const fetch = require("node-fetch");
 const { getCouchInfo } = require("@budibase/backend-core/db");
 const { getAppId } = require("@budibase/backend-core/context");
@@ -18,7 +19,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {}, contains: {}, notContains: {}, containsAny: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -104,6 +105,14 @@ class QueryBuilder {
         this.query.contains[key] = value;
         return this;
     }
+    addNotContains(key, value) {
+        this.query.notContains[key] = value;
+        return this;
+    }
+    addContainsAny(key, value) {
+        this.query.containsAny[key] = value;
+        return this;
+    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -146,11 +155,27 @@ class QueryBuilder {
             }
             return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
         };
-        const contains = (key, value) => {
-            if (!value && value !== 0) {
+        const contains = (key, value, mode = "AND") => {
+            if (Array.isArray(value) && value.length === 0) {
                 return null;
             }
-            return `${key}:${builder.preprocess(value, { escape: true })}`;
+            if (!Array.isArray(value)) {
+                return `${key}:${value}`;
+            }
+            let statement = `${builder.preprocess(value[0], { escape: true })}`;
+            for (let i = 1; i < value.length; i++) {
+                statement += ` ${mode} ${builder.preprocess(value[i], {
+                    escape: true,
+                })}`;
+            }
+            return `${key}:(${statement})`;
+        };
+        const notContains = (key, value) => {
+            const allPrefix = allOr === "" ? "*:* AND" : "";
+            return allPrefix + "NOT " + contains(key, value);
+        };
+        const containsAny = (key, value) => {
+            return contains(key, value, "OR");
         };
         const oneOf = (key, value) => {
             if (!Array.isArray(value)) {
@@ -169,6 +194,8 @@ class QueryBuilder {
         };
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
+                // check for new format - remove numbering if needed
+                key = removeKeyNumbering(key);
                 key = builder.preprocess(key.replace(/ /g, "_"), {
                     escape: true,
                 });
@@ -246,6 +273,12 @@ class QueryBuilder {
         if (this.query.contains) {
             build(this.query.contains, contains);
         }
+        if (this.query.notContains) {
+            build(this.query.notContains, notContains);
+        }
+        if (this.query.containsAny) {
+            build(this.query.containsAny, containsAny);
+        }
         // make sure table ID is always added as an AND
         if (tableId) {
             query = `(${query})`;
@@ -280,6 +313,8 @@ class QueryBuilder {
         });
     }
 }
+// exported for unit testing
+exports.QueryBuilder = QueryBuilder;
 /**
  * Executes a lucene search query.
  * @param url The query URL

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

@@ -13,8 +13,9 @@ const { cloneDeep } = require("lodash/fp");
 const { InternalTables } = require("../../../db/utils");
 const userController = require("../user");
 const { FieldTypes } = require("../../../constants");
-const { makeExternalQuery } = require("../../../integrations/base/utils");
 const { getAppDB } = require("@budibase/backend-core/context");
+const { makeExternalQuery } = require("../../../integrations/base/query");
+const { removeKeyNumbering } = require("../../../integrations/base/utils");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -24,6 +25,7 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
+exports.removeKeyNumbering = removeKeyNumbering;
 exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
     const datasourceId = json.endpoint.datasourceId;
     const db = getAppDB();

package/dist/api/controllers/static/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveApp = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
+exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
@@ -19,7 +19,7 @@ const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
-const { upload } = require("../../../utilities/fileSystem");
+const { upload, deleteFiles } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
@@ -95,6 +95,12 @@ const uploadFile = function (ctx) {
     });
 };
 exports.uploadFile = uploadFile;
+const deleteObjects = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        ctx.body = yield deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
+    });
+};
+exports.deleteObjects = deleteObjects;
 const serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB({ skip_setup: true });
@@ -123,6 +129,24 @@ const serveApp = function (ctx) {
     });
 };
 exports.serveApp = serveApp;
+const serveBuilderPreview = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = getAppDB({ skip_setup: true });
+        const appInfo = yield db.get(DocumentType.APP_METADATA);
+        if (!env.isJest()) {
+            let appId = getAppId();
+            const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
+            ctx.body = yield processString(previewHbs, {
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
+            });
+        }
+        else {
+            // just return the app info for jest to assert on
+            ctx.body = Object.assign(Object.assign({}, appInfo), { builderPreview: true });
+        }
+    });
+};
+exports.serveBuilderPreview = serveBuilderPreview;
 const serveClientLibrary = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         return send(ctx, "budibase-client.js", {

package/dist/api/controllers/static/templates/preview.hbs

@@ -0,0 +1,103 @@
+<html lang="en">
+<head>
+  <title>Budibase Builder Preview</title>
+  <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" />
+  <link
+    href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
+    rel="stylesheet"
+  />
+  <link
+    href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css"
+    rel="stylesheet"
+  />
+  <style>
+    html, body {
+      padding: 0;
+      margin: 0;
+    }
+    html {
+      height: 100%;
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      align-items: stretch;
+    }
+    body {
+      flex: 1 1 auto;
+      overflow: hidden;
+    }
+
+    *,
+    *:before,
+    *:after {
+      box-sizing: border-box;
+    }
+  </style>
+  <script src='{{ clientLibPath }}'></script>
+  <script>
+    function receiveMessage(event) {
+      if (!event.data) {
+        return
+      }
+
+      // Parse received message
+      // If parsing fails, just ignore and wait for the next message
+      let parsed
+      try {
+        parsed = JSON.parse(event.data)
+      } catch (error) {
+        console.error("Client received invalid JSON")
+        // Ignore
+      }
+      if (!parsed || !parsed.isBudibaseEvent) {
+        return
+      }
+
+      // Extract data from message
+      const {
+        selectedComponentId,
+        layout,
+        screen,
+        appId,
+        theme,
+        customTheme,
+        previewDevice,
+        navigation,
+        hiddenComponentIds
+      } = parsed
+
+      // Set some flags so the app knows we're in the builder
+      window["##BUDIBASE_IN_BUILDER##"] = true
+      window["##BUDIBASE_APP_ID##"] = appId
+      window["##BUDIBASE_PREVIEW_LAYOUT##"] = layout
+      window["##BUDIBASE_PREVIEW_SCREEN##"] = screen
+      window["##BUDIBASE_SELECTED_COMPONENT_ID##"] = selectedComponentId
+      window["##BUDIBASE_PREVIEW_ID##"] = Math.random()
+      window["##BUDIBASE_PREVIEW_THEME##"] = theme
+      window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"] = customTheme
+      window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice
+      window["##BUDIBASE_PREVIEW_NAVIGATION##"] = navigation
+      window["##BUDIBASE_HIDDEN_COMPONENT_IDS##"] = hiddenComponentIds
+
+      // Initialise app
+      try {
+        if (window.loadBudibase) {
+          window.loadBudibase()
+          document.documentElement.classList.add("loaded")
+        } else {
+          throw "The client library couldn't be loaded"
+        }
+      } catch (error) {
+        window.parent.postMessage({ type: "error", error })
+      }
+    }
+
+    window.addEventListener("message", receiveMessage)
+    window.parent.postMessage({ type: "ready" })
+  </script>
+</head>
+<body></body>
+</html>

package/dist/api/controllers/table/external.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { buildExternalTableId, breakExternalTableId, } = require("../../../integrations/utils");
 const { getTable, generateForeignKey, generateJunctionTableName, foreignKeyStructure, hasTypeChanged, } = require("./utils");
 const { DataSourceOperation, FieldTypes, RelationshipTypes, } = require("../../../constants");
-const { makeExternalQuery } = require("../../../integrations/base/utils");
+const { makeExternalQuery } = require("../../../integrations/base/query");
 const { cloneDeep } = require("lodash/fp");
 const csvParser = require("../../../utilities/csvParser");
 const { handleRequest } = require("../row/external");

package/dist/api/routes/static.js

@@ -68,8 +68,11 @@ router
     // TODO: for now this builder endpoint is not authorized/secured, will need to be
     .get("/builder/:file*", controller.serveBuilder)
     .post("/api/attachments/process", (0, authorized_1.default)(permissions_1.BUILDER), controller.uploadFile)
+    .post("/api/attachments/delete", (0, authorized_1.default)(permissions_1.BUILDER), controller.deleteObjects)
     .post("/api/beta/:feature", controller.toggleBetaUiFeature)
     .post("/api/attachments/:tableId/upload", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.WRITE), controller.uploadFile)
+    .post("/api/attachments/:tableId/delete", (0, resourceId_1.paramResource)("tableId"), (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.WRITE), controller.deleteObjects)
+    .get("/preview", (0, authorized_1.default)(permissions_1.BUILDER), controller.serveBuilderPreview)
     .get("/:appId/:path*", controller.serveApp)
     .get("/app/:appUrl/:path*", controller.serveApp)
     .post("/api/attachments/:datasourceId/url", (0, authorized_1.default)(permissions_1.PermissionTypes.TABLE, permissions_1.PermissionLevels.READ), controller.getSignedUploadURL);

package/dist/automations/logging/index.js

@@ -56,6 +56,9 @@ function checkAppMetadata(apps) {
             for (let [key, errors] of Object.entries(metadata.automationErrors)) {
                 const updated = [];
                 for (let error of errors) {
+                    if (!error) {
+                        continue;
+                    }
                     const startDate = error.split(backend_core_1.db.SEPARATOR)[2];
                     if (startDate > maxStartDate) {
                         updated.push(error);

package/dist/integrations/base/query.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeExternalQuery = void 0;
+const { integrations } = require("../index");
+function makeExternalQuery(datasource, json) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const Integration = integrations[datasource.source];
+        // query is the opinionated function
+        if (Integration.prototype.query) {
+            const integration = new Integration(datasource.config);
+            return integration.query(json);
+        }
+        else {
+            throw "Datasource does not support query.";
+        }
+    });
+}
+exports.makeExternalQuery = makeExternalQuery;

package/dist/integrations/base/sql.js

@@ -17,6 +17,7 @@ const types_1 = require("@budibase/types");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
 const environment_1 = __importDefault(require("../../environment"));
+const utils_2 = require("./utils");
 const envLimit = environment_1.default.SQL_MAX_ROWS
     ? parseInt(environment_1.default.SQL_MAX_ROWS)
     : null;
@@ -116,12 +117,13 @@ class InternalBuilder {
     addFilters(query, filters, opts) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                const isRelationshipField = key.includes(".");
+                const updatedKey = (0, utils_2.removeKeyNumbering)(key);
+                const isRelationshipField = updatedKey.includes(".");
                 if (!opts.relationship && !isRelationshipField) {
-                    fn(`${opts.tableName}.${key}`, value);
+                    fn(`${opts.tableName}.${updatedKey}`, value);
                 }
                 if (opts.relationship && isRelationshipField) {
-                    fn(key, value);
+                    fn(updatedKey, value);
                 }
             }
         }
@@ -139,6 +141,56 @@ class InternalBuilder {
                 ]);
             }
         };
+        const contains = (mode, any = false) => {
+            const fnc = allOr ? "orWhere" : "where";
+            const rawFnc = `${fnc}Raw`;
+            const not = mode === (filters === null || filters === void 0 ? void 0 : filters.notContains) ? "NOT " : "";
+            function stringifyArray(value, quoteStyle = '"') {
+                for (let i in value) {
+                    if (typeof value[i] === "string") {
+                        value[i] = `${quoteStyle}${value[i]}${quoteStyle}`;
+                    }
+                }
+                return `[${value.join(",")}]`;
+            }
+            if (this.client === utils_1.SqlClient.POSTGRES) {
+                iterate(mode, (key, value) => {
+                    const wrap = any ? "" : "'";
+                    const containsOp = any ? "\\?| array" : "@>";
+                    const fieldNames = key.split(/\./g);
+                    const tableName = fieldNames[0];
+                    const columnName = fieldNames[1];
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}"${tableName}"."${columnName}"::jsonb ${containsOp} ${wrap}${stringifyArray(value, any ? "'" : '"')}${wrap}`);
+                });
+            }
+            else if (this.client === utils_1.SqlClient.MY_SQL) {
+                const jsonFnc = any ? "JSON_OVERLAPS" : "JSON_CONTAINS";
+                iterate(mode, (key, value) => {
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}${jsonFnc}(${key}, '${stringifyArray(value)}')`);
+                });
+            }
+            else {
+                const andOr = mode === (filters === null || filters === void 0 ? void 0 : filters.containsAny) ? " OR " : " AND ";
+                iterate(mode, (key, value) => {
+                    let statement = "";
+                    for (let i in value) {
+                        if (typeof value[i] === "string") {
+                            value[i] = `%"${value[i]}"%`;
+                        }
+                        else {
+                            value[i] = `%${value[i]}%`;
+                        }
+                        statement +=
+                            (statement ? andOr : "") +
+                                `LOWER(${likeKey(this.client, key)}) LIKE ?`;
+                    }
+                    // @ts-ignore
+                    query = query[rawFnc](`${not}(${statement})`, value);
+                });
+            }
+        };
         if (!filters) {
             return query;
         }
@@ -212,32 +264,13 @@ class InternalBuilder {
             });
         }
         if (filters.contains) {
-            const fnc = allOr ? "orWhere" : "where";
-            const rawFnc = `${fnc}Raw`;
-            if (this.client === utils_1.SqlClient.POSTGRES) {
-                iterate(filters.contains, (key, value) => {
-                    const fieldNames = key.split(/\./g);
-                    const tableName = fieldNames[0];
-                    const columnName = fieldNames[1];
-                    if (typeof value === "string") {
-                        value = `"${value}"`;
-                    }
-                    // @ts-ignore
-                    query = query[rawFnc](`"${tableName}"."${columnName}"::jsonb @> '[${value}]'`);
-                });
-            }
-            else if (this.client === utils_1.SqlClient.MY_SQL) {
-                iterate(filters.contains, (key, value) => {
-                    if (typeof value === "string") {
-                        value = `"${value}"`;
-                    }
-                    // @ts-ignore
-                    query = query[rawFnc](`JSON_CONTAINS(${key}, '${value}')`);
-                });
-            }
-            else {
-                iterate(filters.contains, like);
-            }
+            contains(filters.contains);
+        }
+        if (filters.notContains) {
+            contains(filters.notContains);
+        }
+        if (filters.containsAny) {
+            contains(filters.containsAny, true);
         }
         return query;
     }
@@ -548,4 +581,3 @@ class SqlQueryBuilder extends sqlTable_1.default {
     }
 }
 exports.default = SqlQueryBuilder;
-module.exports = SqlQueryBuilder;

package/dist/integrations/base/utils.js

@@ -1,30 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var DatasourceUtils;
-(function (DatasourceUtils) {
-    const { integrations } = require("../index");
-    function makeExternalQuery(datasource, json) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const Integration = integrations[datasource.source];
-            // query is the opinionated function
-            if (Integration.prototype.query) {
-                const integration = new Integration(datasource.config);
-                return integration.query(json);
-            }
-            else {
-                throw "Datasource does not support query.";
-            }
-        });
+exports.removeKeyNumbering = void 0;
+const QUERY_START_REGEX = /\d[0-9]*:/g;
+function removeKeyNumbering(key) {
+    if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
+        const parts = key.split(":");
+        // remove the number
+        parts.shift();
+        return parts.join(":");
     }
-    DatasourceUtils.makeExternalQuery = makeExternalQuery;
-    module.exports.makeExternalQuery = makeExternalQuery;
-})(DatasourceUtils || (DatasourceUtils = {}));
+    else {
+        return key;
+    }
+}
+exports.removeKeyNumbering = removeKeyNumbering;

package/dist/integrations/microsoftSqlServer.js

@@ -8,13 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
+const sql_1 = __importDefault(require("./base/sql"));
 var MSSQLModule;
 (function (MSSQLModule) {
     const sqlServer = require("mssql");
-    const Sql = require("./base/sql");
     const DEFAULT_SCHEMA = "dbo";
     const SCHEMA = {
         docs: "https://github.com/tediousjs/node-mssql",
@@ -69,7 +72,7 @@ var MSSQLModule;
             },
         },
     };
-    class SqlServerIntegration extends Sql {
+    class SqlServerIntegration extends sql_1.default {
         constructor(config) {
             super(utils_1.SqlClient.MS_SQL);
             this.index = 0;

package/dist/integrations/mongodb.js

@@ -80,10 +80,11 @@ var MongoDBModule;
                     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 ((field === "_id" || (field === null || field === void 0 ? void 0 : field.startsWith("$"))) &&
+                        typeof json[field] === "string") {
+                        const id = (_a = json[field].match(/(?<=objectid\(['"]).*(?=['"]\))/gi)) === null || _a === void 0 ? void 0 : _a[0];
                         if (id) {
-                            json["_id"] = mongodb_1.ObjectID.createFromHexString(id);
+                            json[field] = mongodb_1.ObjectID.createFromHexString(id);
                         }
                     }
                 }
@@ -98,10 +99,33 @@ var MongoDBModule;
             return interpolateObjectIds(json);
         }
         parseQueryParams(params, mode) {
-            let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g);
-            let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {};
-            let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {};
-            let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {};
+            var _a, _b, _c;
+            let queryParams = [];
+            let openCount = 0;
+            let inQuotes = false;
+            let i = 0;
+            let startIndex = 0;
+            for (let c of params) {
+                if (c === '"' && i > 0 && params[i - 1] !== "\\") {
+                    inQuotes = !inQuotes;
+                }
+                if (c === "{" && !inQuotes) {
+                    openCount++;
+                    if (openCount === 1) {
+                        startIndex = i;
+                    }
+                }
+                else if (c === "}" && !inQuotes) {
+                    if (openCount === 1) {
+                        queryParams.push(JSON.parse(params.substring(startIndex, i + 1)));
+                    }
+                    openCount--;
+                }
+                i++;
+            }
+            let group1 = (_a = queryParams[0]) !== null && _a !== void 0 ? _a : {};
+            let group2 = (_b = queryParams[1]) !== null && _b !== void 0 ? _b : {};
+            let group3 = (_c = queryParams[2]) !== null && _c !== void 0 ? _c : {};
             if (mode === "update") {
                 return {
                     filter: group1,
@@ -159,7 +183,10 @@ var MongoDBModule;
                             return yield collection.findOne(json);
                         }
                         case "findOneAndUpdate": {
-                            let findAndUpdateJson = json;
+                            if (typeof query.json === "string") {
+                                json = this.parseQueryParams(query.json, "update");
+                            }
+                            let findAndUpdateJson = this.createObjectIds(json);
                             return yield collection.findOneAndUpdate(findAndUpdateJson.filter, findAndUpdateJson.update, findAndUpdateJson.options);
                         }
                         case "count": {

package/dist/integrations/mysql.js

@@ -16,10 +16,10 @@ const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const dayjs_1 = __importDefault(require("dayjs"));
 const { NUMBER_REGEX } = require("../utilities");
+const sql_1 = __importDefault(require("./base/sql"));
 var MySQLModule;
 (function (MySQLModule) {
     const mysql = require("mysql2/promise");
-    const Sql = require("./base/sql");
     const SCHEMA = {
         docs: "https://github.com/sidorares/node-mysql2",
         plus: true,
@@ -96,7 +96,7 @@ var MySQLModule;
         }
         return bindings;
     }
-    class MySQLIntegration extends Sql {
+    class MySQLIntegration extends sql_1.default {
         constructor(config) {
             super(utils_1.SqlClient.MY_SQL);
             this.tables = {};

package/dist/integrations/postgres.js

@@ -8,13 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
+const sql_1 = __importDefault(require("./base/sql"));
 var PostgresModule;
 (function (PostgresModule) {
     const { Client, types } = require("pg");
-    const Sql = require("./base/sql");
     const { escapeDangerousCharacters } = require("../utilities");
     // Return "date" and "timestamp" types as plain strings.
     // This lets us reference the original stored timezone.
@@ -93,7 +96,7 @@ var PostgresModule;
             },
         },
     };
-    class PostgresIntegration extends Sql {
+    class PostgresIntegration extends sql_1.default {
         constructor(config) {
             super(utils_1.SqlClient.POSTGRES);
             this.index = 1;