@budibase/server 1.2.37 → 1.2.39-alpha.1

package/dist/integrations/base/sql.js

@@ -13,10 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const knex_1 = require("knex");
-const datasource_1 = require("../../definitions/datasource");
+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;
@@ -30,14 +31,14 @@ function likeKey(client, key) {
     }
     let start, end;
     switch (client) {
-        case utils_1.SqlClients.MY_SQL:
+        case utils_1.SqlClient.MY_SQL:
             start = end = "`";
             break;
-        case utils_1.SqlClients.ORACLE:
-        case utils_1.SqlClients.POSTGRES:
+        case utils_1.SqlClient.ORACLE:
+        case utils_1.SqlClient.POSTGRES:
             start = end = '"';
             break;
-        case utils_1.SqlClients.MS_SQL:
+        case utils_1.SqlClient.MS_SQL:
             start = "[";
             end = "]";
             break;
@@ -99,7 +100,7 @@ function generateSelectStatement(json, knex) {
         const columnName = fieldNames[1];
         if (columnName &&
             (schema === null || schema === void 0 ? void 0 : schema[columnName]) &&
-            knex.client.config.client === utils_1.SqlClients.POSTGRES) {
+            knex.client.config.client === utils_1.SqlClient.POSTGRES) {
             const externalType = schema[columnName].externalType;
             if (externalType === null || externalType === void 0 ? void 0 : externalType.includes("money")) {
                 return knex.raw(`"${tableName}"."${columnName}"::money::numeric as "${field}"`);
@@ -116,19 +117,20 @@ 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);
                 }
             }
         }
         const like = (key, value) => {
             const fnc = allOr ? "orWhere" : "where";
             // postgres supports ilike, nothing else does
-            if (this.client === utils_1.SqlClients.POSTGRES) {
+            if (this.client === utils_1.SqlClient.POSTGRES) {
                 query = query[fnc](key, "ilike", `%${value}%`);
             }
             else {
@@ -155,7 +157,7 @@ class InternalBuilder {
             iterate(filters.string, (key, value) => {
                 const fnc = allOr ? "orWhere" : "where";
                 // postgres supports ilike, nothing else does
-                if (this.client === utils_1.SqlClients.POSTGRES) {
+                if (this.client === utils_1.SqlClient.POSTGRES) {
                     query = query[fnc](key, "ilike", `${value}%`);
                 }
                 else {
@@ -214,7 +216,7 @@ class InternalBuilder {
         if (filters.contains) {
             const fnc = allOr ? "orWhere" : "where";
             const rawFnc = `${fnc}Raw`;
-            if (this.client === utils_1.SqlClients.POSTGRES) {
+            if (this.client === utils_1.SqlClient.POSTGRES) {
                 iterate(filters.contains, (key, value) => {
                     const fieldNames = key.split(/\./g);
                     const tableName = fieldNames[0];
@@ -226,7 +228,7 @@ class InternalBuilder {
                     query = query[rawFnc](`"${tableName}"."${columnName}"::jsonb @> '[${value}]'`);
                 });
             }
-            else if (this.client === utils_1.SqlClients.MY_SQL) {
+            else if (this.client === utils_1.SqlClient.MY_SQL) {
                 iterate(filters.contains, (key, value) => {
                     if (typeof value === "string") {
                         value = `"${value}"`;
@@ -247,11 +249,11 @@ class InternalBuilder {
         const table = (_a = json.meta) === null || _a === void 0 ? void 0 : _a.table;
         if (sort) {
             for (let [key, value] of Object.entries(sort)) {
-                const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
+                const direction = value === types_1.SortDirection.ASCENDING ? "asc" : "desc";
                 query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${key}`, direction);
             }
         }
-        else if (this.client === utils_1.SqlClients.MS_SQL && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
+        else if (this.client === utils_1.SqlClient.MS_SQL && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
             // @ts-ignore
             query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${table === null || table === void 0 ? void 0 : table.primary[0]}`);
         }
@@ -391,7 +393,7 @@ class InternalBuilder {
             [tableName]: query,
         }).select(selectStatement);
         // have to add after as well (this breaks MS-SQL)
-        if (this.client !== utils_1.SqlClients.MS_SQL) {
+        if (this.client !== utils_1.SqlClient.MS_SQL) {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
@@ -448,24 +450,24 @@ class SqlQueryBuilder extends sqlTable_1.default {
         let query;
         const builder = new InternalBuilder(sqlClient);
         switch (this._operation(json)) {
-            case datasource_1.Operation.CREATE:
+            case types_1.Operation.CREATE:
                 query = builder.create(client, json, opts);
                 break;
-            case datasource_1.Operation.READ:
+            case types_1.Operation.READ:
                 query = builder.read(client, json, this.limit);
                 break;
-            case datasource_1.Operation.UPDATE:
+            case types_1.Operation.UPDATE:
                 query = builder.update(client, json, opts);
                 break;
-            case datasource_1.Operation.DELETE:
+            case types_1.Operation.DELETE:
                 query = builder.delete(client, json, opts);
                 break;
-            case datasource_1.Operation.BULK_CREATE:
+            case types_1.Operation.BULK_CREATE:
                 query = builder.bulkCreate(client, json);
                 break;
-            case datasource_1.Operation.CREATE_TABLE:
-            case datasource_1.Operation.UPDATE_TABLE:
-            case datasource_1.Operation.DELETE_TABLE:
+            case types_1.Operation.CREATE_TABLE:
+            case types_1.Operation.UPDATE_TABLE:
+            case types_1.Operation.DELETE_TABLE:
                 return this._tableQuery(json);
             default:
                 throw `Operation type is not supported by SQL query builder`;
@@ -479,7 +481,7 @@ class SqlQueryBuilder extends sqlTable_1.default {
                 return {};
             }
             const input = this._query({
-                endpoint: Object.assign(Object.assign({}, json.endpoint), { operation: datasource_1.Operation.READ }),
+                endpoint: Object.assign(Object.assign({}, json.endpoint), { operation: types_1.Operation.READ }),
                 resource: {
                     fields: [],
                 },
@@ -489,7 +491,7 @@ class SqlQueryBuilder extends sqlTable_1.default {
                 },
                 meta: json.meta,
             });
-            return queryFn(input, datasource_1.Operation.READ);
+            return queryFn(input, types_1.Operation.READ);
         });
     }
     // when creating if an ID has been inserted need to make sure
@@ -524,23 +526,23 @@ class SqlQueryBuilder extends sqlTable_1.default {
             }
             let row;
             // need to manage returning, a feature mySQL can't do
-            if (operation === datasource_1.Operation.DELETE) {
+            if (operation === types_1.Operation.DELETE) {
                 row = processFn(yield this.getReturningRow(queryFn, json));
             }
             const response = yield queryFn(input, operation);
             const results = processFn(response);
             // same as delete, manage returning
-            if (operation === datasource_1.Operation.CREATE || operation === datasource_1.Operation.UPDATE) {
+            if (operation === types_1.Operation.CREATE || operation === types_1.Operation.UPDATE) {
                 let id;
-                if (sqlClient === utils_1.SqlClients.MS_SQL) {
+                if (sqlClient === utils_1.SqlClient.MS_SQL) {
                     id = results === null || results === void 0 ? void 0 : results[0].id;
                 }
-                else if (sqlClient === utils_1.SqlClients.MY_SQL) {
+                else if (sqlClient === utils_1.SqlClient.MY_SQL) {
                     id = results === null || results === void 0 ? void 0 : results.insertId;
                 }
                 row = processFn(yield this.getReturningRow(queryFn, this.checkLookupKeys(id, json)));
             }
-            if (operation !== datasource_1.Operation.READ) {
+            if (operation !== types_1.Operation.READ) {
                 return row;
             }
             return results.length ? results : [{ [operation.toLowerCase()]: true }];
@@ -548,4 +550,3 @@ class SqlQueryBuilder extends sqlTable_1.default {
     }
 }
 exports.default = SqlQueryBuilder;
-module.exports = SqlQueryBuilder;

package/dist/integrations/base/sqlTable.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const knex_1 = require("knex");
-const datasource_1 = require("../../definitions/datasource");
+const types_1 = require("@budibase/types");
 const utils_1 = require("../utils");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
 function generateSchema(schema, table, tables, oldTable = null, renamed) {
@@ -135,16 +135,16 @@ class SqlTableQueryBuilder {
             throw "Cannot execute without table being specified";
         }
         switch (this._operation(json)) {
-            case datasource_1.Operation.CREATE_TABLE:
+            case types_1.Operation.CREATE_TABLE:
                 query = buildCreateTable(client, json.table, json.meta.tables);
                 break;
-            case datasource_1.Operation.UPDATE_TABLE:
+            case types_1.Operation.UPDATE_TABLE:
                 if (!json.meta || !json.meta.table) {
                     throw "Must specify old table for update";
                 }
                 query = buildUpdateTable(client, json.table, json.meta.tables, json.meta.table, json.meta.renamed);
                 break;
-            case datasource_1.Operation.DELETE_TABLE:
+            case types_1.Operation.DELETE_TABLE:
                 query = buildDeleteTable(client, json.table);
                 break;
             default:

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/couchdb.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");
 var CouchDBModule;
 (function (CouchDBModule) {
     const PouchDB = require("pouchdb");
@@ -20,30 +20,30 @@ var CouchDBModule;
         description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
         datasource: {
             url: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
                 default: "http://localhost:5984",
             },
             database: {
-                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.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     id: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },

package/dist/integrations/dynamodb.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");
 var DynamoModule;
 (function (DynamoModule) {
     const AWS = require("aws-sdk");
@@ -21,101 +21,101 @@ var DynamoModule;
         type: "Non-relational",
         datasource: {
             region: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
                 default: "us-east-1",
             },
             accessKeyId: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 required: true,
             },
             secretAccessKey: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 required: true,
             },
             endpoint: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: false,
                 default: "https://dynamodb.us-east-1.amazonaws.com",
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             read: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 readable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                     },
                 },
             },
             scan: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 readable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                     },
                 },
             },
             describe: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 readable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             get: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 readable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             update: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             delete: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     table: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },

package/dist/integrations/elasticsearch.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");
 var ElasticsearchModule;
 (function (ElasticsearchModule) {
     const { Client } = require("@elastic/elasticsearch");
@@ -20,55 +20,55 @@ var ElasticsearchModule;
         type: "Non-relational",
         datasource: {
             url: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
                 default: "http://localhost:9200",
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             read: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             update: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 customisable: true,
                 fields: {
                     id: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             delete: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     index: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     id: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },

package/dist/integrations/firebase.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 firestore_1 = require("@google-cloud/firestore");
 var Firebase;
 (function (Firebase) {
@@ -20,46 +20,46 @@ var Firebase;
         description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
         datasource: {
             email: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             privateKey: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: true,
             },
             projectId: {
-                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,
             },
             filterField: {
                 displayName: "Filter field",
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: false,
             },
             filter: {
                 displayName: "Filter comparison",
-                type: datasource_1.DatasourceFieldTypes.LIST,
+                type: types_1.DatasourceFieldType.LIST,
                 required: false,
                 data: {
                     read: [
@@ -78,7 +78,7 @@ var Firebase;
             },
             filterValue: {
                 displayName: "Filter value",
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 required: false,
             },
         },