@budibase/server 1.2.37 → 1.2.39-alpha.1

package/dist/integrations/googlesheets.js

@@ -12,7 +12,7 @@ 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 types_1 = require("@budibase/types");
 const google_auth_library_1 = require("google-auth-library");
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
@@ -37,59 +37,59 @@ var GoogleSheetsModule;
         datasource: {
             spreadsheetId: {
                 display: "Google Sheet URL",
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     sheet: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     row: {
-                        type: datasource_1.QueryTypes.JSON,
+                        type: types_1.QueryType.JSON,
                         required: true,
                     },
                 },
             },
             read: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     sheet: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             update: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     sheet: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     rowIndex: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     row: {
-                        type: datasource_1.QueryTypes.JSON,
+                        type: types_1.QueryType.JSON,
                         required: true,
                     },
                 },
             },
             delete: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     sheet: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     rowIndex: {
-                        type: datasource_1.DatasourceFieldTypes.NUMBER,
+                        type: types_1.DatasourceFieldType.NUMBER,
                         required: true,
                     },
                 },

package/dist/integrations/index.js

@@ -14,50 +14,50 @@ const googlesheets = require("./googlesheets");
 const firebase = require("./firebase");
 const redis = require("./redis");
 const snowflake = require("./snowflake");
-const { SourceNames } = require("../definitions/datasource");
+const { SourceName } = require("@budibase/types");
 const environment = require("../environment");
 const DEFINITIONS = {
-    [SourceNames.POSTGRES]: postgres.schema,
-    [SourceNames.DYNAMODB]: dynamodb.schema,
-    [SourceNames.MONGODB]: mongodb.schema,
-    [SourceNames.ELASTICSEARCH]: elasticsearch.schema,
-    [SourceNames.COUCHDB]: couchdb.schema,
-    [SourceNames.SQL_SERVER]: sqlServer.schema,
-    [SourceNames.S3]: s3.schema,
-    [SourceNames.AIRTABLE]: airtable.schema,
-    [SourceNames.MYSQL]: mysql.schema,
-    [SourceNames.ARANGODB]: arangodb.schema,
-    [SourceNames.REST]: rest.schema,
-    [SourceNames.FIRESTORE]: firebase.schema,
-    [SourceNames.REDIS]: redis.schema,
-    [SourceNames.SNOWFLAKE]: snowflake.schema,
+    [SourceName.POSTGRES]: postgres.schema,
+    [SourceName.DYNAMODB]: dynamodb.schema,
+    [SourceName.MONGODB]: mongodb.schema,
+    [SourceName.ELASTICSEARCH]: elasticsearch.schema,
+    [SourceName.COUCHDB]: couchdb.schema,
+    [SourceName.SQL_SERVER]: sqlServer.schema,
+    [SourceName.S3]: s3.schema,
+    [SourceName.AIRTABLE]: airtable.schema,
+    [SourceName.MYSQL]: mysql.schema,
+    [SourceName.ARANGODB]: arangodb.schema,
+    [SourceName.REST]: rest.schema,
+    [SourceName.FIRESTORE]: firebase.schema,
+    [SourceName.REDIS]: redis.schema,
+    [SourceName.SNOWFLAKE]: snowflake.schema,
 };
 const INTEGRATIONS = {
-    [SourceNames.POSTGRES]: postgres.integration,
-    [SourceNames.DYNAMODB]: dynamodb.integration,
-    [SourceNames.MONGODB]: mongodb.integration,
-    [SourceNames.ELASTICSEARCH]: elasticsearch.integration,
-    [SourceNames.COUCHDB]: couchdb.integration,
-    [SourceNames.SQL_SERVER]: sqlServer.integration,
-    [SourceNames.S3]: s3.integration,
-    [SourceNames.AIRTABLE]: airtable.integration,
-    [SourceNames.MYSQL]: mysql.integration,
-    [SourceNames.ARANGODB]: arangodb.integration,
-    [SourceNames.REST]: rest.integration,
-    [SourceNames.FIRESTORE]: firebase.integration,
-    [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
-    [SourceNames.REDIS]: redis.integration,
-    [SourceNames.FIREBASE]: firebase.integration,
-    [SourceNames.SNOWFLAKE]: snowflake.integration,
+    [SourceName.POSTGRES]: postgres.integration,
+    [SourceName.DYNAMODB]: dynamodb.integration,
+    [SourceName.MONGODB]: mongodb.integration,
+    [SourceName.ELASTICSEARCH]: elasticsearch.integration,
+    [SourceName.COUCHDB]: couchdb.integration,
+    [SourceName.SQL_SERVER]: sqlServer.integration,
+    [SourceName.S3]: s3.integration,
+    [SourceName.AIRTABLE]: airtable.integration,
+    [SourceName.MYSQL]: mysql.integration,
+    [SourceName.ARANGODB]: arangodb.integration,
+    [SourceName.REST]: rest.integration,
+    [SourceName.FIRESTORE]: firebase.integration,
+    [SourceName.GOOGLE_SHEETS]: googlesheets.integration,
+    [SourceName.REDIS]: redis.integration,
+    [SourceName.FIREBASE]: firebase.integration,
+    [SourceName.SNOWFLAKE]: snowflake.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (process.arch && !process.arch.startsWith("arm")) {
     const oracle = require("./oracle");
-    DEFINITIONS[SourceNames.ORACLE] = oracle.schema;
-    INTEGRATIONS[SourceNames.ORACLE] = oracle.integration;
+    DEFINITIONS[SourceName.ORACLE] = oracle.schema;
+    INTEGRATIONS[SourceName.ORACLE] = oracle.integration;
 }
 if (environment.SELF_HOSTED) {
-    DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema;
+    DEFINITIONS[SourceName.GOOGLE_SHEETS] = googlesheets.schema;
 }
 module.exports = {
     definitions: DEFINITIONS,

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 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",
@@ -24,54 +27,54 @@ var MSSQLModule;
         type: "Relational",
         datasource: {
             user: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
                 default: "localhost",
             },
             password: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 required: true,
             },
             server: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "localhost",
             },
             port: {
-                type: datasource_1.DatasourceFieldTypes.NUMBER,
+                type: types_1.DatasourceFieldType.NUMBER,
                 required: false,
                 default: 1433,
             },
             database: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "root",
             },
             schema: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: DEFAULT_SCHEMA,
             },
             encrypt: {
-                type: datasource_1.DatasourceFieldTypes.BOOLEAN,
+                type: types_1.DatasourceFieldType.BOOLEAN,
                 default: true,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             read: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             update: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             delete: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
         },
     };
-    class SqlServerIntegration extends Sql {
+    class SqlServerIntegration extends sql_1.default {
         constructor(config) {
-            super(utils_1.SqlClients.MS_SQL);
+            super(utils_1.SqlClient.MS_SQL);
             this.index = 0;
             this.tables = {};
             this.schemaErrors = {};
@@ -124,7 +127,7 @@ var MSSQLModule;
                     }
                     // this is a hack to get the inserted ID back,
                     //  no way to do this with Knex nicely
-                    const sql = operation === datasource_1.Operation.CREATE
+                    const sql = operation === types_1.Operation.CREATE
                         ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
                         : query.sql;
                     return yield request.query(sql);

package/dist/integrations/mongodb.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const datasource_1 = require("../definitions/datasource");
+const types_1 = require("@budibase/types");
 const mongodb_1 = require("mongodb");
 var MongoDBModule;
 (function (MongoDBModule) {
@@ -20,38 +20,38 @@ var MongoDBModule;
         description: "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.",
         datasource: {
             connectionString: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
                 default: "mongodb://localhost:27017",
             },
             db: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.JSON,
+                type: types_1.QueryType.JSON,
             },
             read: {
-                type: datasource_1.QueryTypes.JSON,
+                type: types_1.QueryType.JSON,
             },
             update: {
-                type: datasource_1.QueryTypes.JSON,
+                type: types_1.QueryType.JSON,
             },
             delete: {
-                type: datasource_1.QueryTypes.JSON,
+                type: types_1.QueryType.JSON,
             },
         },
         extra: {
             collection: {
                 displayName: "Collection",
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             actionTypes: {
                 displayName: "Action Types",
-                type: datasource_1.DatasourceFieldTypes.LIST,
+                type: types_1.DatasourceFieldType.LIST,
                 required: true,
                 data: {
                     read: ["find", "findOne", "findOneAndUpdate", "count", "distinct"],
@@ -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

@@ -12,14 +12,14 @@ 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 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,
@@ -28,51 +28,51 @@ var MySQLModule;
         description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
         datasource: {
             host: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "localhost",
                 required: true,
             },
             port: {
-                type: datasource_1.DatasourceFieldTypes.NUMBER,
+                type: types_1.DatasourceFieldType.NUMBER,
                 default: 3306,
                 required: false,
             },
             user: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "root",
                 required: true,
             },
             password: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 default: "root",
                 required: true,
             },
             database: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             ssl: {
-                type: datasource_1.DatasourceFieldTypes.OBJECT,
+                type: types_1.DatasourceFieldType.OBJECT,
                 required: false,
             },
             rejectUnauthorized: {
-                type: datasource_1.DatasourceFieldTypes.BOOLEAN,
+                type: types_1.DatasourceFieldType.BOOLEAN,
                 default: true,
                 required: false,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             read: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             update: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             delete: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
         },
     };
@@ -96,9 +96,9 @@ var MySQLModule;
         }
         return bindings;
     }
-    class MySQLIntegration extends Sql {
+    class MySQLIntegration extends sql_1.default {
         constructor(config) {
-            super(utils_1.SqlClients.MY_SQL);
+            super(utils_1.SqlClient.MY_SQL);
             this.tables = {};
             this.schemaErrors = {};
             this.config = config;

package/dist/integrations/oracle.js

@@ -12,7 +12,7 @@ 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 types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const oracledb_1 = __importDefault(require("oracledb"));
 const sql_1 = __importDefault(require("./base/sql"));
@@ -28,40 +28,40 @@ var OracleModule;
         description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
         datasource: {
             host: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "localhost",
                 required: true,
             },
             port: {
-                type: datasource_1.DatasourceFieldTypes.NUMBER,
+                type: types_1.DatasourceFieldType.NUMBER,
                 required: true,
                 default: 1521,
             },
             database: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             user: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             password: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 required: true,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             read: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             update: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             delete: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
         },
     };
@@ -74,7 +74,7 @@ var OracleModule;
     };
     class OracleIntegration extends sql_1.default {
         constructor(config) {
-            super(utils_1.SqlClients.ORACLE);
+            super(utils_1.SqlClient.ORACLE);
             this.index = 1;
             this.tables = {};
             this.schemaErrors = {};
@@ -324,7 +324,7 @@ var OracleModule;
                 else {
                     // read the row to be deleted up front for the return
                     let deletedRows;
-                    if (operation === datasource_1.Operation.DELETE) {
+                    if (operation === types_1.Operation.DELETE) {
                         const queryFn = (query) => this.internalQuery(query);
                         deletedRows = yield this.getReturningRow(queryFn, json);
                     }
@@ -341,7 +341,7 @@ var OracleModule;
                         // get the last row that was updated
                         if (response.lastRowid &&
                             ((_c = json.endpoint) === null || _c === void 0 ? void 0 : _c.entityId) &&
-                            operation !== datasource_1.Operation.DELETE) {
+                            operation !== types_1.Operation.DELETE) {
                             const lastRow = yield this.internalQuery({
                                 sql: `SELECT * FROM \"${json.endpoint.entityId}\" WHERE ROWID = '${response.lastRowid}'`,
                             });