@budibase/server 1.2.58 → 1.2.59-alpha.0

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 (typeof json[field] === "string" &&
+                        json[field].toLowerCase().startsWith("objectid")) {
+                        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;

package/dist/middleware/joi-validator.js

@@ -13,10 +13,13 @@ function validate(schema, property) {
         else if (ctx.request[property] != null) {
             params = ctx.request[property];
         }
-        schema = schema.append({
-            createdAt: Joi.any().optional(),
-            updatedAt: Joi.any().optional(),
-        });
+        // not all schemas have the append property e.g. array schemas
+        if (schema.append) {
+            schema = schema.append({
+                createdAt: Joi.any().optional(),
+                updatedAt: Joi.any().optional(),
+            });
+        }
         const { error } = schema.validate(params);
         if (error) {
             ctx.throw(400, `Invalid ${property} - ${error.message}`);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.57",
+    "version": "1.2.58",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.2.57",
-        "@budibase/client": "^1.2.57",
-        "@budibase/pro": "1.2.57",
-        "@budibase/string-templates": "^1.2.57",
-        "@budibase/types": "^1.2.57",
+        "@budibase/backend-core": "^1.2.58",
+        "@budibase/client": "^1.2.58",
+        "@budibase/pro": "1.2.58",
+        "@budibase/string-templates": "^1.2.58",
+        "@budibase/types": "^1.2.58",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -107,7 +107,7 @@
         "google-auth-library": "7.12.0",
         "google-spreadsheet": "3.2.0",
         "jimp": "0.16.1",
-        "joi": "17.2.1",
+        "joi": "17.6.0",
         "js-yaml": "4.1.0",
         "jsonschema": "1.4.0",
         "knex": "0.95.15",

package/dist/threads/index.js

@@ -129,6 +129,7 @@ class Thread {
     static shutdown() {
         return __awaiter(this, void 0, void 0, function* () {
             yield Thread.stopThreads();
+            console.log("Threads shutdown");
         });
     }
 }