@budibase/server 1.2.26 → 1.2.28-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");
@@ -169,6 +170,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,
                 });
@@ -280,6 +283,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/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/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 datasource_1 = require("../../definitions/datasource");
 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);
                 }
             }
         }
@@ -548,4 +550,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 datasource_1 = require("../definitions/datasource");
 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.SqlClients.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 datasource_1 = require("../definitions/datasource");
 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.SqlClients.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 datasource_1 = require("../definitions/datasource");
 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.SqlClients.POSTGRES);
             this.index = 1;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.25",
+    "version": "1.2.28-alpha.0",
     "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.25",
-        "@budibase/client": "^1.2.25",
-        "@budibase/pro": "1.2.25",
-        "@budibase/string-templates": "^1.2.25",
-        "@budibase/types": "^1.2.25",
+        "@budibase/backend-core": "1.2.28-alpha.0",
+        "@budibase/client": "1.2.28-alpha.0",
+        "@budibase/pro": "1.2.28-alpha.0",
+        "@budibase/string-templates": "1.2.28-alpha.0",
+        "@budibase/types": "1.2.28-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,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",