@budibase/server 2.1.32-alpha.7 → 2.1.32

package/src/db/{utils.ts → utils.js}

@@ -1,56 +1,82 @@
-import newid from "./newid"
-import { db as dbCore } from "@budibase/backend-core"
-
-type Optional = string | null
-
-export const 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",
 }
 
-export const SearchIndexes = {
+const DocumentType = CoreDocType
+
+const SearchIndexes = {
   ROWS: "rows",
 }
 
-export const BudibaseInternalDB = {
+exports.StaticDatabases = StaticDatabases
+
+const BudibaseInternalDB = {
   _id: "bb_internal",
-  type: dbCore.BUDIBASE_DATASOURCE_TYPE,
+  type: "budibase",
   name: "Budibase DB",
   source: "BUDIBASE",
   config: {},
 }
 
-export const SEPARATOR = dbCore.SEPARATOR
-export const StaticDatabases = dbCore.StaticDatabases
-export const DocumentType = dbCore.DocumentType
-export const APP_PREFIX = dbCore.APP_PREFIX
-export const APP_DEV_PREFIX = dbCore.APP_DEV_PREFIX
-export const isDevAppID = dbCore.isDevAppID
-export const isProdAppID = dbCore.isProdAppID
-export const USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}`
-export const LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}`
-export const TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}`
-export const ViewName = dbCore.ViewName
-export const InternalTables = dbCore.InternalTable
-export const UNICODE_MAX = dbCore.UNICODE_MAX
-export const generateAppID = dbCore.generateAppID
-export const generateDevAppID = dbCore.getDevelopmentAppID
-export const generateRoleID = dbCore.generateRoleID
-export const getRoleParams = dbCore.getRoleParams
-export const getQueryIndex = dbCore.getQueryIndex
-export const getDocParams = dbCore.getDocParams
-export const getRowParams = dbCore.getRowParams
-export const generateRowID = dbCore.generateRowID
-export const getUserMetadataParams = dbCore.getUserMetadataParams
-export const generateUserMetadataID = dbCore.generateUserMetadataID
-export const getGlobalIDFromUserMetadataID =
-  dbCore.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.
  */
-export function getTableParams(tableId?: Optional, otherProps = {}) {
+exports.getTableParams = (tableId = null, otherProps = {}) => {
   return getDocParams(DocumentType.TABLE, tableId, otherProps)
 }
 
@@ -58,7 +84,7 @@ export function getTableParams(tableId?: Optional, otherProps = {}) {
  * Generates a new table ID.
  * @returns {string} The new table ID which the table doc can be stored under.
  */
-export function generateTableID() {
+exports.generateTableID = () => {
   return `${DocumentType.TABLE}${SEPARATOR}${newid()}`
 }
 
@@ -67,7 +93,7 @@ export function generateTableID() {
  * @param {string} rowId The ID of the row.
  * @returns {string} The table ID.
  */
-export function getTableIDFromRowID(rowId: string) {
+exports.getTableIDFromRowID = rowId => {
   const components = rowId
     .split(DocumentType.TABLE + SEPARATOR)[1]
     .split(SEPARATOR)
@@ -77,10 +103,7 @@ export function getTableIDFromRowID(rowId: string) {
 /**
  * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
  */
-export function getAutomationParams(
-  automationId?: Optional,
-  otherProps: any = {}
-) {
+exports.getAutomationParams = (automationId = null, otherProps = {}) => {
   return getDocParams(DocumentType.AUTOMATION, automationId, otherProps)
 }
 
@@ -88,7 +111,7 @@ export function getAutomationParams(
  * Generates a new automation ID.
  * @returns {string} The new automation ID which the automation doc can be stored under.
  */
-export function generateAutomationID() {
+exports.generateAutomationID = () => {
   return `${DocumentType.AUTOMATION}${SEPARATOR}${newid()}`
 }
 
@@ -103,14 +126,14 @@ export function 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.
  */
-export function generateLinkID(
-  tableId1: string,
-  tableId2: string,
-  rowId1: string,
-  rowId2: string,
-  fieldName1: string,
-  fieldName2: string
-) {
+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}`
@@ -120,7 +143,7 @@ export function generateLinkID(
 /**
  * Gets parameters for retrieving link docs, this is a utility function for the getDocParams function.
  */
-export function getLinkParams(otherProps: any = {}) {
+exports.getLinkParams = (otherProps = {}) => {
   return getDocParams(DocumentType.LINK, null, otherProps)
 }
 
@@ -128,14 +151,14 @@ export function getLinkParams(otherProps: any = {}) {
  * Generates a new layout ID.
  * @returns {string} The new layout ID which the layout doc can be stored under.
  */
-export function generateLayoutID(id?: string) {
+exports.generateLayoutID = id => {
   return `${DocumentType.LAYOUT}${SEPARATOR}${id || newid()}`
 }
 
 /**
  * Gets parameters for retrieving layout, this is a utility function for the getDocParams function.
  */
-export function getLayoutParams(layoutId?: Optional, otherProps: any = {}) {
+exports.getLayoutParams = (layoutId = null, otherProps = {}) => {
   return getDocParams(DocumentType.LAYOUT, layoutId, otherProps)
 }
 
@@ -143,14 +166,14 @@ export function getLayoutParams(layoutId?: Optional, otherProps: any = {}) {
  * Generates a new screen ID.
  * @returns {string} The new screen ID which the screen doc can be stored under.
  */
-export function generateScreenID() {
+exports.generateScreenID = () => {
   return `${DocumentType.SCREEN}${SEPARATOR}${newid()}`
 }
 
 /**
  * Gets parameters for retrieving screens, this is a utility function for the getDocParams function.
  */
-export function getScreenParams(screenId?: Optional, otherProps: any = {}) {
+exports.getScreenParams = (screenId = null, otherProps = {}) => {
   return getDocParams(DocumentType.SCREEN, screenId, otherProps)
 }
 
@@ -158,14 +181,14 @@ export function getScreenParams(screenId?: Optional, otherProps: any = {}) {
  * Generates a new webhook ID.
  * @returns {string} The new webhook ID which the webhook doc can be stored under.
  */
-export function generateWebhookID() {
+exports.generateWebhookID = () => {
   return `${DocumentType.WEBHOOK}${SEPARATOR}${newid()}`
 }
 
 /**
  * Gets parameters for retrieving a webhook, this is a utility function for the getDocParams function.
  */
-export function getWebhookParams(webhookId?: Optional, otherProps: any = {}) {
+exports.getWebhookParams = (webhookId = null, otherProps = {}) => {
   return getDocParams(DocumentType.WEBHOOK, webhookId, otherProps)
 }
 
@@ -173,7 +196,7 @@ export function getWebhookParams(webhookId?: Optional, otherProps: any = {}) {
  * Generates a new datasource ID.
  * @returns {string} The new datasource ID which the webhook doc can be stored under.
  */
-export function generateDatasourceID({ plus = false } = {}) {
+exports.generateDatasourceID = ({ plus = false } = {}) => {
   return `${
     plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE
   }${SEPARATOR}${newid()}`
@@ -182,10 +205,7 @@ export function generateDatasourceID({ plus = false } = {}) {
 /**
  * Gets parameters for retrieving a datasource, this is a utility function for the getDocParams function.
  */
-export function getDatasourceParams(
-  datasourceId?: Optional,
-  otherProps: any = {}
-) {
+exports.getDatasourceParams = (datasourceId = null, otherProps = {}) => {
   return getDocParams(DocumentType.DATASOURCE, datasourceId, otherProps)
 }
 
@@ -193,7 +213,7 @@ export function getDatasourceParams(
  * Generates a new query ID.
  * @returns {string} The new query ID which the query doc can be stored under.
  */
-export function generateQueryID(datasourceId: string) {
+exports.generateQueryID = datasourceId => {
   return `${
     DocumentType.QUERY
   }${SEPARATOR}${datasourceId}${SEPARATOR}${newid()}`
@@ -203,21 +223,21 @@ export function generateQueryID(datasourceId: string) {
  * Generates a metadata ID for automations, used to track errors in recurring
  * automations etc.
  */
-export function generateAutomationMetadataID(automationId: string) {
+exports.generateAutomationMetadataID = automationId => {
   return `${DocumentType.AUTOMATION_METADATA}${SEPARATOR}${automationId}`
 }
 
 /**
  * Retrieve all automation metadata in an app database.
  */
-export function getAutomationMetadataParams(otherProps: any = {}) {
+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.
  */
-export function getQueryParams(datasourceId?: Optional, otherProps: any = {}) {
+exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
   if (datasourceId == null) {
     return getDocParams(DocumentType.QUERY, null, otherProps)
   }
@@ -233,19 +253,15 @@ export function getQueryParams(datasourceId?: Optional, otherProps: any = {}) {
  * Generates a new flag document ID.
  * @returns {string} The ID of the flag document that was generated.
  */
-export function generateUserFlagID(userId: string) {
+exports.generateUserFlagID = userId => {
   return `${DocumentType.USER_FLAG}${SEPARATOR}${userId}`
 }
 
-export function generateMetadataID(type: string, entityId: string) {
+exports.generateMetadataID = (type, entityId) => {
   return `${DocumentType.METADATA}${SEPARATOR}${type}${SEPARATOR}${entityId}`
 }
 
-export function getMetadataParams(
-  type: string,
-  entityId?: Optional,
-  otherProps: any = {}
-) {
+exports.getMetadataParams = (type, entityId = null, otherProps = {}) => {
   let docId = `${type}${SEPARATOR}`
   if (entityId != null) {
     docId += entityId
@@ -253,22 +269,22 @@ export function getMetadataParams(
   return getDocParams(DocumentType.METADATA, docId, otherProps)
 }
 
-export function generateMemoryViewID(viewName: string) {
+exports.generateMemoryViewID = viewName => {
   return `${DocumentType.MEM_VIEW}${SEPARATOR}${viewName}`
 }
 
-export function getMemoryViewParams(otherProps: any = {}) {
+exports.getMemoryViewParams = (otherProps = {}) => {
   return getDocParams(DocumentType.MEM_VIEW, null, otherProps)
 }
 
-export function generatePluginID(name: string) {
+exports.generatePluginID = name => {
   return `${DocumentType.PLUGIN}${SEPARATOR}${name}`
 }
 
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
-export function getMultiIDParams(ids: string[]) {
+exports.getMultiIDParams = ids => {
   return {
     keys: ids,
     include_docs: true,

package/src/db/views/staticViews.js

@@ -1,4 +1,4 @@
-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
 
@@ -20,7 +20,7 @@ const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
  * so it may be slow.
  */
 exports.createLinkView = async () => {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const designDoc = await db.get("_design/database")
   const view = {
     map: function (doc) {
@@ -54,7 +54,7 @@ exports.createLinkView = async () => {
 }
 
 exports.createRoutingView = async () => {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const designDoc = await db.get("_design/database")
   const view = {
     // if using variables in a map function need to inject them before use
@@ -75,7 +75,7 @@ exports.createRoutingView = async () => {
 }
 
 async function searchIndex(indexName, fnString) {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const designDoc = await db.get("_design/database")
   designDoc.indexes = {
     [indexName]: {

package/src/integrations/base/sql.ts

@@ -96,7 +96,7 @@ function generateSelectStatement(
 ): (string | Knex.Raw)[] {
   const { resource, meta } = json
   const schema = meta?.table?.schema
-  return resource!.fields.map(field => {
+  return resource.fields.map(field => {
     const fieldNames = field.split(/\./g)
     const tableName = fieldNames[0]
     const columnName = fieldNames[1]

package/src/integrations/base/sqlTable.ts

@@ -185,7 +185,7 @@ class SqlTableQueryBuilder {
           json.table,
           json.meta.tables,
           json.meta.table,
-          json.meta.renamed!
+          json.meta.renamed
         )
         break
       case Operation.DELETE_TABLE:

package/src/integrations/elasticsearch.ts

@@ -5,13 +5,10 @@ import {
   IntegrationBase,
 } from "@budibase/types"
 
-import { Client, ClientOptions } from "@elastic/elasticsearch"
+const { Client } = require("@elastic/elasticsearch")
 
 interface ElasticsearchConfig {
   url: string
-  ssl?: boolean
-  ca?: string
-  rejectUnauthorized?: boolean
 }
 
 const SCHEMA: Integration = {
@@ -26,21 +23,6 @@ const SCHEMA: Integration = {
       required: true,
       default: "http://localhost:9200",
     },
-    ssl: {
-      type: DatasourceFieldType.BOOLEAN,
-      default: false,
-      required: false,
-    },
-    rejectUnauthorized: {
-      type: DatasourceFieldType.BOOLEAN,
-      default: true,
-      required: false,
-    },
-    ca: {
-      type: DatasourceFieldType.LONGFORM,
-      default: false,
-      required: false,
-    },
   },
   query: {
     create: {
@@ -99,19 +81,7 @@ class ElasticSearchIntegration implements IntegrationBase {
 
   constructor(config: ElasticsearchConfig) {
     this.config = config
-
-    const clientConfig: ClientOptions = {
-      node: this.config.url,
-    }
-
-    if (this.config.ssl) {
-      clientConfig.ssl = {
-        rejectUnauthorized: this.config.rejectUnauthorized,
-        ca: this.config.ca || undefined,
-      }
-    }
-
-    this.client = new Client(clientConfig)
+    this.client = new Client({ node: config.url })
   }
 
   async create(query: { index: string; json: object }) {

package/src/integrations/googlesheets.ts

@@ -12,7 +12,10 @@ import { buildExternalTableId } from "./utils"
 import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
 import env from "../environment"
-import { tenancy, db as dbCore, constants } from "@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")
 
 interface GoogleSheetsConfig {
@@ -173,9 +176,9 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async connect() {
     try {
       // Initialise oAuth client
-      const db = tenancy.getGlobalDB()
-      let googleConfig = await dbCore.getScopedConfig(db, {
-        type: constants.Config.GOOGLE,
+      const db = getGlobalDB()
+      let googleConfig = await getScopedConfig(db, {
+        type: Configs.GOOGLE,
       })
 
       if (!googleConfig) {

package/src/integrations/index.ts

@@ -67,54 +67,50 @@ if (
   INTEGRATIONS[SourceName.ORACLE] = oracle.integration
 }
 
-export async function getDefinitions() {
-  const pluginSchemas: { [key: string]: Integration } = {}
-  if (environment.SELF_HOSTED) {
-    const plugins = await getPlugins(PluginType.DATASOURCE)
-    // extract the actual schema from each custom
-    for (let plugin of plugins) {
-      const sourceId = plugin.name
-      pluginSchemas[sourceId] = {
-        ...plugin.schema["schema"],
-        custom: true,
-      }
-      if (plugin.iconUrl) {
-        pluginSchemas[sourceId].iconUrl = plugin.iconUrl
+module.exports = {
+  getDefinitions: async () => {
+    const pluginSchemas: { [key: string]: Integration } = {}
+    if (environment.SELF_HOSTED) {
+      const plugins = await getPlugins(PluginType.DATASOURCE)
+      // extract the actual schema from each custom
+      for (let plugin of plugins) {
+        const sourceId = plugin.name
+        pluginSchemas[sourceId] = {
+          ...plugin.schema["schema"],
+          custom: true,
+        }
+        if (plugin.iconUrl) {
+          pluginSchemas[sourceId].iconUrl = plugin.iconUrl
+        }
       }
     }
-  }
-  return {
-    ...cloneDeep(DEFINITIONS),
-    ...pluginSchemas,
-  }
-}
-
-export async function getIntegration(integration: string) {
-  if (INTEGRATIONS[integration]) {
-    return INTEGRATIONS[integration]
-  }
-  if (environment.SELF_HOSTED) {
-    const plugins = await getPlugins(PluginType.DATASOURCE)
-    for (let plugin of plugins) {
-      if (plugin.name === integration) {
-        // need to use commonJS require due to its dynamic runtime nature
-        const retrieved: any = await getDatasourcePlugin(
-          plugin.name,
-          plugin.jsUrl,
-          plugin.schema?.hash
-        )
-        if (retrieved.integration) {
-          return retrieved.integration
-        } else {
-          return retrieved
+    return {
+      ...cloneDeep(DEFINITIONS),
+      ...pluginSchemas,
+    }
+  },
+  getIntegration: async (integration: string) => {
+    if (INTEGRATIONS[integration]) {
+      return INTEGRATIONS[integration]
+    }
+    if (environment.SELF_HOSTED) {
+      const plugins = await getPlugins(PluginType.DATASOURCE)
+      for (let plugin of plugins) {
+        if (plugin.name === integration) {
+          // need to use commonJS require due to its dynamic runtime nature
+          const retrieved: any = await getDatasourcePlugin(
+            plugin.name,
+            plugin.jsUrl,
+            plugin.schema?.hash
+          )
+          if (retrieved.integration) {
+            return retrieved.integration
+          } else {
+            return retrieved
+          }
         }
       }
     }
-  }
-  throw new Error("No datasource implementation found.")
-}
-
-export default {
-  getDefinitions,
-  getIntegration,
+    throw new Error("No datasource implementation found.")
+  },
 }