@budibase/server 2.1.32-alpha.7 → 2.1.32

package/dist/constants/screens.js

@@ -1,5 +1,5 @@
 "use strict";
-const { roles } = require("@budibase/backend-core");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { BASE_LAYOUT_PROP_IDS } = require("./layouts");
 exports.createHomeScreen = () => ({
     description: "",
@@ -40,7 +40,7 @@ exports.createHomeScreen = () => ({
     },
     routing: {
         route: "/",
-        roleId: roles.BUILTIN_ROLE_IDS.BASIC,
+        roleId: BUILTIN_ROLE_IDS.BASIC,
     },
     name: "home-screen",
 });

package/dist/db/inMemoryView.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const newid = require("./newid");
 // bypass the main application db config
 // use in memory pouchdb directly
-const { db: dbCore } = require("@budibase/backend-core");
-const Pouch = dbCore.getPouch({ inMemory: true });
+const { getPouch, closeDB } = require("@budibase/backend-core/db");
+const Pouch = getPouch({ inMemory: true });
 exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0, void 0, function* () {
     // use a different ID each time for the DB, make sure they
     // are always unique for each query, don't want overlap
@@ -48,6 +48,6 @@ exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0,
     }
     finally {
         yield db.destroy();
-        yield dbCore.closePouchDB(db);
+        yield closeDB(db);
     }
 });

package/dist/db/linkedRows/LinkController.js

@@ -9,14 +9,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils");
-const { InternalTables, getUserMetadataParams } = require("../utils");
+const { generateLinkID, InternalTables, getUserMetadataParams, } = require("../utils");
 const Sentry = require("@sentry/node");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
-const { context } = require("@budibase/backend-core");
-const LinkDocument = require("./LinkDocument");
+const { getAppDB } = require("@budibase/backend-core/context");
+/**
+ * Creates a new link document structure which can be put to the database. It is important to
+ * note that while this talks about linker/linked the link is bi-directional and for all intent
+ * and purposes it does not matter from which direction the link was initiated.
+ * @param {string} tableId1 The ID of the first table (the linker).
+ * @param {string} tableId2 The ID of the second table (the linked).
+ * @param {string} fieldName1 The name of the field in the linker table.
+ * @param {string} fieldName2 The name of the field in the linked table.
+ * @param {string} rowId1 The ID of the row which is acting as the linker.
+ * @param {string} rowId2 The ID of the row which is acting as the linked.
+ * @constructor
+ */
+function LinkDocument(tableId1, fieldName1, rowId1, tableId2, fieldName2, rowId2) {
+    // build the ID out of unique references to this link document
+    this._id = generateLinkID(tableId1, tableId2, rowId1, rowId2, fieldName1, fieldName2);
+    // required for referencing in view
+    this.type = FieldTypes.LINK;
+    this.doc1 = {
+        tableId: tableId1,
+        fieldName: fieldName1,
+        rowId: rowId1,
+    };
+    this.doc2 = {
+        tableId: tableId2,
+        fieldName: fieldName2,
+        rowId: rowId2,
+    };
+}
 class LinkController {
     constructor({ tableId, row, table, oldTable }) {
-        this._db = context.getAppDB();
+        this._db = getAppDB();
         this._tableId = tableId;
         this._row = row;
         this._table = table;

package/dist/db/linkedRows/index.js

@@ -16,7 +16,7 @@ const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils");
 const { partition } = require("lodash");
 const { getGlobalUsersFromMetadata } = require("../../utilities/global");
 const { processFormulas } = require("../../utilities/rowProcessor/utils");
-const { context } = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * This functionality makes sure that when rows with links are created, updated or deleted they are processed
  * correctly - making sure that no stale links are left around and that all links have been made successfully.
@@ -64,7 +64,7 @@ function getLinksForRows(rows) {
 function getFullLinkedDocs(links) {
     return __awaiter(this, void 0, void 0, function* () {
         // create DBs
-        const db = context.getAppDB();
+        const db = getAppDB();
         const linkedRowIds = links.map(link => link.id);
         const uniqueRowIds = [...new Set(linkedRowIds)];
         let dbRows = (yield db.allDocs(getMultiIDParams(uniqueRowIds))).rows.map(row => row.doc);

package/dist/db/linkedRows/linkUtils.js

@@ -12,7 +12,7 @@ const Sentry = require("@sentry/node");
 const { ViewName, getQueryIndex } = require("../utils");
 const { FieldTypes } = require("../../constants");
 const { createLinkView } = require("../views/staticViews");
-const { context } = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * Only needed so that boolean parameters are being used for includeDocs
  * @type {{EXCLUDE: boolean, INCLUDE: boolean}}
@@ -38,7 +38,7 @@ exports.createLinkView = createLinkView;
 exports.getLinkDocuments = function (args) {
     return __awaiter(this, arguments, void 0, function* () {
         const { tableId, rowId, includeDocs } = args;
-        const db = context.getAppDB();
+        const db = getAppDB();
         let params;
         if (rowId != null) {
             params = { key: [tableId, rowId] };
@@ -95,7 +95,7 @@ exports.getLinkedTableIDs = table => {
         .map(column => column.tableId);
 };
 exports.getLinkedTable = (id, tables) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     let linkedTable = tables.find(table => table._id === id);
     if (linkedTable) {
         return linkedTable;

package/dist/db/utils.js

@@ -1,93 +1,87 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMemoryViewID = exports.getMetadataParams = exports.generateMetadataID = exports.generateUserFlagID = exports.getQueryParams = exports.getAutomationMetadataParams = exports.generateAutomationMetadataID = exports.generateQueryID = exports.getDatasourceParams = exports.generateDatasourceID = exports.getWebhookParams = exports.generateWebhookID = exports.getScreenParams = exports.generateScreenID = exports.getLayoutParams = exports.generateLayoutID = exports.getLinkParams = exports.generateLinkID = exports.generateAutomationID = exports.getAutomationParams = exports.getTableIDFromRowID = exports.generateTableID = exports.getTableParams = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.getUserMetadataParams = exports.generateRowID = exports.getRowParams = exports.getDocParams = exports.getQueryIndex = exports.getRoleParams = exports.generateRoleID = exports.generateDevAppID = exports.generateAppID = exports.UNICODE_MAX = exports.InternalTables = exports.ViewName = exports.TABLE_ROW_PREFIX = exports.LINK_USER_METADATA_PREFIX = exports.USER_METDATA_PREFIX = exports.isProdAppID = exports.isDevAppID = exports.APP_DEV_PREFIX = exports.APP_PREFIX = exports.DocumentType = exports.StaticDatabases = exports.SEPARATOR = exports.BudibaseInternalDB = exports.SearchIndexes = exports.AppStatus = void 0;
-exports.getMultiIDParams = exports.generatePluginID = exports.getMemoryViewParams = void 0;
-const newid_1 = __importDefault(require("./newid"));
-const backend_core_1 = require("@budibase/backend-core");
-exports.AppStatus = {
+const newid = require("./newid");
+const { DocumentType: CoreDocType, InternalTable, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewName, getDocParams, getRowParams, generateRowID, getUserMetadataParams, generateUserMetadataID, getGlobalIDFromUserMetadataID, } = require("@budibase/backend-core/db");
+const UNICODE_MAX = "\ufff0";
+const AppStatus = {
     DEV: "development",
     ALL: "all",
     DEPLOYED: "published",
 };
-exports.SearchIndexes = {
+const DocumentType = CoreDocType;
+const SearchIndexes = {
     ROWS: "rows",
 };
-exports.BudibaseInternalDB = {
+exports.StaticDatabases = StaticDatabases;
+const BudibaseInternalDB = {
     _id: "bb_internal",
-    type: backend_core_1.db.BUDIBASE_DATASOURCE_TYPE,
+    type: "budibase",
     name: "Budibase DB",
     source: "BUDIBASE",
     config: {},
 };
-exports.SEPARATOR = backend_core_1.db.SEPARATOR;
-exports.StaticDatabases = backend_core_1.db.StaticDatabases;
-exports.DocumentType = backend_core_1.db.DocumentType;
-exports.APP_PREFIX = backend_core_1.db.APP_PREFIX;
-exports.APP_DEV_PREFIX = backend_core_1.db.APP_DEV_PREFIX;
-exports.isDevAppID = backend_core_1.db.isDevAppID;
-exports.isProdAppID = backend_core_1.db.isProdAppID;
-exports.USER_METDATA_PREFIX = `${exports.DocumentType.ROW}${exports.SEPARATOR}${backend_core_1.db.InternalTable.USER_METADATA}${exports.SEPARATOR}`;
-exports.LINK_USER_METADATA_PREFIX = `${exports.DocumentType.LINK}${exports.SEPARATOR}${backend_core_1.db.InternalTable.USER_METADATA}${exports.SEPARATOR}`;
-exports.TABLE_ROW_PREFIX = `${exports.DocumentType.ROW}${exports.SEPARATOR}${exports.DocumentType.TABLE}`;
-exports.ViewName = backend_core_1.db.ViewName;
-exports.InternalTables = backend_core_1.db.InternalTable;
-exports.UNICODE_MAX = backend_core_1.db.UNICODE_MAX;
-exports.generateAppID = backend_core_1.db.generateAppID;
-exports.generateDevAppID = backend_core_1.db.getDevelopmentAppID;
-exports.generateRoleID = backend_core_1.db.generateRoleID;
-exports.getRoleParams = backend_core_1.db.getRoleParams;
-exports.getQueryIndex = backend_core_1.db.getQueryIndex;
-exports.getDocParams = backend_core_1.db.getDocParams;
-exports.getRowParams = backend_core_1.db.getRowParams;
-exports.generateRowID = backend_core_1.db.generateRowID;
-exports.getUserMetadataParams = backend_core_1.db.getUserMetadataParams;
-exports.generateUserMetadataID = backend_core_1.db.generateUserMetadataID;
-exports.getGlobalIDFromUserMetadataID = backend_core_1.db.getGlobalIDFromUserMetadataID;
+exports.APP_PREFIX = APP_PREFIX;
+exports.APP_DEV_PREFIX = APP_DEV_PREFIX;
+exports.isDevAppID = isDevAppID;
+exports.isProdAppID = isProdAppID;
+exports.USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
+exports.LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}`;
+exports.TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}`;
+exports.ViewName = ViewName;
+exports.InternalTables = InternalTable;
+exports.DocumentType = DocumentType;
+exports.SEPARATOR = SEPARATOR;
+exports.UNICODE_MAX = UNICODE_MAX;
+exports.SearchIndexes = SearchIndexes;
+exports.AppStatus = AppStatus;
+exports.BudibaseInternalDB = BudibaseInternalDB;
+exports.generateAppID = generateAppID;
+exports.generateDevAppID = getDevelopmentAppID;
+exports.generateRoleID = generateRoleID;
+exports.getRoleParams = getRoleParams;
+exports.getQueryIndex = getQueryIndex;
+exports.getDocParams = getDocParams;
+exports.getRowParams = getRowParams;
+exports.generateRowID = generateRowID;
+exports.getUserMetadataParams = getUserMetadataParams;
+exports.generateUserMetadataID = generateUserMetadataID;
+exports.getGlobalIDFromUserMetadataID = getGlobalIDFromUserMetadataID;
 /**
  * Gets parameters for retrieving tables, this is a utility function for the getDocParams function.
  */
-function getTableParams(tableId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.TABLE, tableId, otherProps);
-}
-exports.getTableParams = getTableParams;
+exports.getTableParams = (tableId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.TABLE, tableId, otherProps);
+};
 /**
  * Generates a new table ID.
  * @returns {string} The new table ID which the table doc can be stored under.
  */
-function generateTableID() {
-    return `${exports.DocumentType.TABLE}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateTableID = generateTableID;
+exports.generateTableID = () => {
+    return `${DocumentType.TABLE}${SEPARATOR}${newid()}`;
+};
 /**
  * Given a row ID this will find the table ID within it (only works for internal tables).
  * @param {string} rowId The ID of the row.
  * @returns {string} The table ID.
  */
-function getTableIDFromRowID(rowId) {
+exports.getTableIDFromRowID = rowId => {
     const components = rowId
-        .split(exports.DocumentType.TABLE + exports.SEPARATOR)[1]
-        .split(exports.SEPARATOR);
-    return `${exports.DocumentType.TABLE}${exports.SEPARATOR}${components[0]}`;
-}
-exports.getTableIDFromRowID = getTableIDFromRowID;
+        .split(DocumentType.TABLE + SEPARATOR)[1]
+        .split(SEPARATOR);
+    return `${DocumentType.TABLE}${SEPARATOR}${components[0]}`;
+};
 /**
  * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
  */
-function getAutomationParams(automationId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.AUTOMATION, automationId, otherProps);
-}
-exports.getAutomationParams = getAutomationParams;
+exports.getAutomationParams = (automationId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.AUTOMATION, automationId, otherProps);
+};
 /**
  * Generates a new automation ID.
  * @returns {string} The new automation ID which the automation doc can be stored under.
  */
-function generateAutomationID() {
-    return `${exports.DocumentType.AUTOMATION}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateAutomationID = generateAutomationID;
+exports.generateAutomationID = () => {
+    return `${DocumentType.AUTOMATION}${SEPARATOR}${newid()}`;
+};
 /**
  * Generates a new link doc ID. This is currently not usable with the alldocs call,
  * instead a view is built to make walking to tree easier.
@@ -99,152 +93,131 @@ exports.generateAutomationID = generateAutomationID;
  * @param {string} fieldName2 the name of the field in the linked row.
  * @returns {string} The new link doc ID which the automation doc can be stored under.
  */
-function generateLinkID(tableId1, tableId2, rowId1, rowId2, fieldName1, fieldName2) {
-    const tables = `${exports.SEPARATOR}${tableId1}${exports.SEPARATOR}${tableId2}`;
-    const rows = `${exports.SEPARATOR}${rowId1}${exports.SEPARATOR}${rowId2}`;
-    const fields = `${exports.SEPARATOR}${fieldName1}${exports.SEPARATOR}${fieldName2}`;
-    return `${exports.DocumentType.LINK}${tables}${rows}${fields}`;
-}
-exports.generateLinkID = generateLinkID;
+exports.generateLinkID = (tableId1, tableId2, rowId1, rowId2, fieldName1, fieldName2) => {
+    const tables = `${SEPARATOR}${tableId1}${SEPARATOR}${tableId2}`;
+    const rows = `${SEPARATOR}${rowId1}${SEPARATOR}${rowId2}`;
+    const fields = `${SEPARATOR}${fieldName1}${SEPARATOR}${fieldName2}`;
+    return `${DocumentType.LINK}${tables}${rows}${fields}`;
+};
 /**
  * Gets parameters for retrieving link docs, this is a utility function for the getDocParams function.
  */
-function getLinkParams(otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.LINK, null, otherProps);
-}
-exports.getLinkParams = getLinkParams;
+exports.getLinkParams = (otherProps = {}) => {
+    return getDocParams(DocumentType.LINK, null, otherProps);
+};
 /**
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.
  */
-function generateLayoutID(id) {
-    return `${exports.DocumentType.LAYOUT}${exports.SEPARATOR}${id || (0, newid_1.default)()}`;
-}
-exports.generateLayoutID = generateLayoutID;
+exports.generateLayoutID = id => {
+    return `${DocumentType.LAYOUT}${SEPARATOR}${id || newid()}`;
+};
 /**
  * Gets parameters for retrieving layout, this is a utility function for the getDocParams function.
  */
-function getLayoutParams(layoutId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.LAYOUT, layoutId, otherProps);
-}
-exports.getLayoutParams = getLayoutParams;
+exports.getLayoutParams = (layoutId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.LAYOUT, layoutId, otherProps);
+};
 /**
  * Generates a new screen ID.
  * @returns {string} The new screen ID which the screen doc can be stored under.
  */
-function generateScreenID() {
-    return `${exports.DocumentType.SCREEN}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateScreenID = generateScreenID;
+exports.generateScreenID = () => {
+    return `${DocumentType.SCREEN}${SEPARATOR}${newid()}`;
+};
 /**
  * Gets parameters for retrieving screens, this is a utility function for the getDocParams function.
  */
-function getScreenParams(screenId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.SCREEN, screenId, otherProps);
-}
-exports.getScreenParams = getScreenParams;
+exports.getScreenParams = (screenId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.SCREEN, screenId, otherProps);
+};
 /**
  * Generates a new webhook ID.
  * @returns {string} The new webhook ID which the webhook doc can be stored under.
  */
-function generateWebhookID() {
-    return `${exports.DocumentType.WEBHOOK}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateWebhookID = generateWebhookID;
+exports.generateWebhookID = () => {
+    return `${DocumentType.WEBHOOK}${SEPARATOR}${newid()}`;
+};
 /**
  * Gets parameters for retrieving a webhook, this is a utility function for the getDocParams function.
  */
-function getWebhookParams(webhookId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.WEBHOOK, webhookId, otherProps);
-}
-exports.getWebhookParams = getWebhookParams;
+exports.getWebhookParams = (webhookId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.WEBHOOK, webhookId, otherProps);
+};
 /**
  * Generates a new datasource ID.
  * @returns {string} The new datasource ID which the webhook doc can be stored under.
  */
-function generateDatasourceID({ plus = false } = {}) {
-    return `${plus ? exports.DocumentType.DATASOURCE_PLUS : exports.DocumentType.DATASOURCE}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateDatasourceID = generateDatasourceID;
+exports.generateDatasourceID = ({ plus = false } = {}) => {
+    return `${plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE}${SEPARATOR}${newid()}`;
+};
 /**
  * Gets parameters for retrieving a datasource, this is a utility function for the getDocParams function.
  */
-function getDatasourceParams(datasourceId, otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.DATASOURCE, datasourceId, otherProps);
-}
-exports.getDatasourceParams = getDatasourceParams;
+exports.getDatasourceParams = (datasourceId = null, otherProps = {}) => {
+    return getDocParams(DocumentType.DATASOURCE, datasourceId, otherProps);
+};
 /**
  * Generates a new query ID.
  * @returns {string} The new query ID which the query doc can be stored under.
  */
-function generateQueryID(datasourceId) {
-    return `${exports.DocumentType.QUERY}${exports.SEPARATOR}${datasourceId}${exports.SEPARATOR}${(0, newid_1.default)()}`;
-}
-exports.generateQueryID = generateQueryID;
+exports.generateQueryID = datasourceId => {
+    return `${DocumentType.QUERY}${SEPARATOR}${datasourceId}${SEPARATOR}${newid()}`;
+};
 /**
  * Generates a metadata ID for automations, used to track errors in recurring
  * automations etc.
  */
-function generateAutomationMetadataID(automationId) {
-    return `${exports.DocumentType.AUTOMATION_METADATA}${exports.SEPARATOR}${automationId}`;
-}
-exports.generateAutomationMetadataID = generateAutomationMetadataID;
+exports.generateAutomationMetadataID = automationId => {
+    return `${DocumentType.AUTOMATION_METADATA}${SEPARATOR}${automationId}`;
+};
 /**
  * Retrieve all automation metadata in an app database.
  */
-function getAutomationMetadataParams(otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.AUTOMATION_METADATA, null, otherProps);
-}
-exports.getAutomationMetadataParams = getAutomationMetadataParams;
+exports.getAutomationMetadataParams = (otherProps = {}) => {
+    return getDocParams(DocumentType.AUTOMATION_METADATA, null, otherProps);
+};
 /**
  * Gets parameters for retrieving a query, this is a utility function for the getDocParams function.
  */
-function getQueryParams(datasourceId, otherProps = {}) {
+exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
     if (datasourceId == null) {
-        return (0, exports.getDocParams)(exports.DocumentType.QUERY, null, otherProps);
+        return getDocParams(DocumentType.QUERY, null, otherProps);
     }
-    return (0, exports.getDocParams)(exports.DocumentType.QUERY, `${datasourceId}${exports.SEPARATOR}`, otherProps);
-}
-exports.getQueryParams = getQueryParams;
+    return getDocParams(DocumentType.QUERY, `${datasourceId}${SEPARATOR}`, otherProps);
+};
 /**
  * Generates a new flag document ID.
  * @returns {string} The ID of the flag document that was generated.
  */
-function generateUserFlagID(userId) {
-    return `${exports.DocumentType.USER_FLAG}${exports.SEPARATOR}${userId}`;
-}
-exports.generateUserFlagID = generateUserFlagID;
-function generateMetadataID(type, entityId) {
-    return `${exports.DocumentType.METADATA}${exports.SEPARATOR}${type}${exports.SEPARATOR}${entityId}`;
-}
-exports.generateMetadataID = generateMetadataID;
-function getMetadataParams(type, entityId, otherProps = {}) {
-    let docId = `${type}${exports.SEPARATOR}`;
+exports.generateUserFlagID = userId => {
+    return `${DocumentType.USER_FLAG}${SEPARATOR}${userId}`;
+};
+exports.generateMetadataID = (type, entityId) => {
+    return `${DocumentType.METADATA}${SEPARATOR}${type}${SEPARATOR}${entityId}`;
+};
+exports.getMetadataParams = (type, entityId = null, otherProps = {}) => {
+    let docId = `${type}${SEPARATOR}`;
     if (entityId != null) {
         docId += entityId;
     }
-    return (0, exports.getDocParams)(exports.DocumentType.METADATA, docId, otherProps);
-}
-exports.getMetadataParams = getMetadataParams;
-function generateMemoryViewID(viewName) {
-    return `${exports.DocumentType.MEM_VIEW}${exports.SEPARATOR}${viewName}`;
-}
-exports.generateMemoryViewID = generateMemoryViewID;
-function getMemoryViewParams(otherProps = {}) {
-    return (0, exports.getDocParams)(exports.DocumentType.MEM_VIEW, null, otherProps);
-}
-exports.getMemoryViewParams = getMemoryViewParams;
-function generatePluginID(name) {
-    return `${exports.DocumentType.PLUGIN}${exports.SEPARATOR}${name}`;
-}
-exports.generatePluginID = generatePluginID;
+    return getDocParams(DocumentType.METADATA, docId, otherProps);
+};
+exports.generateMemoryViewID = viewName => {
+    return `${DocumentType.MEM_VIEW}${SEPARATOR}${viewName}`;
+};
+exports.getMemoryViewParams = (otherProps = {}) => {
+    return getDocParams(DocumentType.MEM_VIEW, null, otherProps);
+};
+exports.generatePluginID = name => {
+    return `${DocumentType.PLUGIN}${SEPARATOR}${name}`;
+};
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
-function getMultiIDParams(ids) {
+exports.getMultiIDParams = ids => {
     return {
         keys: ids,
         include_docs: true,
     };
-}
-exports.getMultiIDParams = getMultiIDParams;
+};

package/dist/db/views/staticViews.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { context } = require("@budibase/backend-core");
+const { getAppDB } = require("@budibase/backend-core/context");
 const { DocumentType, SEPARATOR, ViewName, SearchIndexes } = require("../utils");
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR;
 /**************************************************
@@ -28,7 +28,7 @@ const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR;
  * so it may be slow.
  */
 exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         map: function (doc) {
@@ -58,7 +58,7 @@ exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
     yield db.put(designDoc);
 });
 exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = context.getAppDB();
+    const db = getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         // if using variables in a map function need to inject them before use
@@ -76,7 +76,7 @@ exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* ()
 });
 function searchIndex(indexName, fnString) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB();
+        const db = getAppDB();
         const designDoc = yield db.get("_design/database");
         designDoc.indexes = {
             [indexName]: {

package/dist/integrations/elasticsearch.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const elasticsearch_1 = require("@elastic/elasticsearch");
+const { Client } = require("@elastic/elasticsearch");
 const SCHEMA = {
     docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
@@ -22,21 +22,6 @@ const SCHEMA = {
             required: true,
             default: "http://localhost:9200",
         },
-        ssl: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: false,
-            required: false,
-        },
-        rejectUnauthorized: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: true,
-            required: false,
-        },
-        ca: {
-            type: types_1.DatasourceFieldType.LONGFORM,
-            default: false,
-            required: false,
-        },
     },
     query: {
         create: {
@@ -91,16 +76,7 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        const clientConfig = {
-            node: this.config.url,
-        };
-        if (this.config.ssl) {
-            clientConfig.ssl = {
-                rejectUnauthorized: this.config.rejectUnauthorized,
-                ca: this.config.ca || undefined,
-            };
-        }
-        this.client = new elasticsearch_1.Client(clientConfig);
+        this.client = new Client({ node: config.url });
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/googlesheets.js

@@ -18,7 +18,9 @@ const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
 const environment_1 = __importDefault(require("../environment"));
-const backend_core_1 = require("@budibase/backend-core");
+const { getGlobalDB } = require("@budibase/backend-core/tenancy");
+const { getScopedConfig } = require("@budibase/backend-core/db");
+const { Configs } = require("@budibase/backend-core/constants");
 const fetch = require("node-fetch");
 const SCHEMA = {
     plus: true,
@@ -138,9 +140,9 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
-                const db = backend_core_1.tenancy.getGlobalDB();
-                let googleConfig = yield backend_core_1.db.getScopedConfig(db, {
-                    type: backend_core_1.constants.Config.GOOGLE,
+                const db = getGlobalDB();
+                let googleConfig = yield getScopedConfig(db, {
+                    type: Configs.GOOGLE,
                 });
                 if (!googleConfig) {
                     googleConfig = {