@budibase/server 2.1.40-alpha.5 → 2.1.41

package/src/db/views/{staticViews.ts → staticViews.js}

@@ -1,6 +1,5 @@
-import { context } from "@budibase/backend-core"
-import { DocumentType, SEPARATOR, ViewName, SearchIndexes } from "../utils"
-import { LinkDocument, Row } from "@budibase/types"
+const { getAppDB } = require("@budibase/backend-core/context")
+const { DocumentType, SEPARATOR, ViewName, SearchIndexes } = require("../utils")
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
 
 /**************************************************
@@ -20,17 +19,16 @@ const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
  * @returns {Promise<void>} The view now exists, please note that the next view of this query will actually build it,
  * so it may be slow.
  */
-export async function createLinkView() {
-  const db = context.getAppDB()
+exports.createLinkView = async () => {
+  const db = getAppDB()
   const designDoc = await db.get("_design/database")
   const view = {
-    map: function (doc: LinkDocument) {
+    map: function (doc) {
       // everything in this must remain constant as its going to Pouch, no external variables
       if (doc.type === "link") {
         let doc1 = doc.doc1
         let doc2 = doc.doc2
         // eslint-disable-next-line no-undef
-        // @ts-ignore
         emit([doc1.tableId, doc1.rowId], {
           id: doc2.rowId,
           thisId: doc1.rowId,
@@ -39,7 +37,6 @@ export async function createLinkView() {
         // if linking to same table can't emit twice
         if (doc1.tableId !== doc2.tableId) {
           // eslint-disable-next-line no-undef
-          // @ts-ignore
           emit([doc2.tableId, doc2.rowId], {
             id: doc1.rowId,
             thisId: doc2.rowId,
@@ -56,8 +53,8 @@ export async function createLinkView() {
   await db.put(designDoc)
 }
 
-export async function createRoutingView() {
-  const db = context.getAppDB()
+exports.createRoutingView = async () => {
+  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
@@ -77,8 +74,8 @@ export async function createRoutingView() {
   await db.put(designDoc)
 }
 
-async function searchIndex(indexName: string, fnString: string) {
-  const db = context.getAppDB()
+async function searchIndex(indexName, fnString) {
+  const db = getAppDB()
   const designDoc = await db.get("_design/database")
   designDoc.indexes = {
     [indexName]: {
@@ -89,11 +86,11 @@ async function searchIndex(indexName: string, fnString: string) {
   await db.put(designDoc)
 }
 
-export async function createAllSearchIndex() {
+exports.createAllSearchIndex = async () => {
   await searchIndex(
     SearchIndexes.ROWS,
-    function (doc: Row) {
-      function idx(input: Row, prev?: string) {
+    function (doc) {
+      function idx(input, prev) {
         for (let key of Object.keys(input)) {
           let idxKey = prev != null ? `${prev}.${key}` : key
           idxKey = idxKey.replace(/ /g, "_")
@@ -101,7 +98,6 @@ export async function createAllSearchIndex() {
             for (let val of input[key]) {
               if (typeof val !== "object") {
                 // eslint-disable-next-line no-undef
-                // @ts-ignore
                 index(idxKey, val, { store: true })
               }
             }
@@ -110,20 +106,17 @@ export async function createAllSearchIndex() {
           }
           if (typeof input[key] === "string") {
             // eslint-disable-next-line no-undef
-            // @ts-ignore
             index(idxKey, input[key].toLowerCase(), { store: true })
           } else if (typeof input[key] !== "object") {
             // eslint-disable-next-line no-undef
-            // @ts-ignore
             index(idxKey, input[key], { store: true })
           } else {
             idx(input[key], idxKey)
           }
         }
       }
-      if (doc._id!.startsWith("ro_")) {
+      if (doc._id.startsWith("ro_")) {
         // eslint-disable-next-line no-undef
-        // @ts-ignore
         index("default", doc._id)
         idx(doc)
       }

package/src/{environment.ts → environment.js}

@@ -1,4 +1,4 @@
-import { join } from "path"
+const { join } = require("path")
 
 function isTest() {
   return isCypress() || isJest()
@@ -28,7 +28,7 @@ if (!LOADED && isDev() && !isTest()) {
   LOADED = true
 }
 
-function parseIntSafe(number?: string) {
+function parseIntSafe(number) {
   if (number) {
     return parseInt(number)
   }
@@ -36,7 +36,7 @@ function parseIntSafe(number?: string) {
 
 let inThread = false
 
-const environment = {
+module.exports = {
   // important - prefer app port to generic port
   PORT: process.env.APP_PORT || process.env.PORT,
   JWT_SECRET: process.env.JWT_SECRET,
@@ -86,10 +86,9 @@ const environment = {
   SELF_HOSTED: process.env.SELF_HOSTED,
   // old
   CLIENT_ID: process.env.CLIENT_ID,
-  _set(key: string, value: any) {
+  _set(key, value) {
     process.env[key] = value
-    // @ts-ignore
-    environment[key] = value
+    module.exports[key] = value
   },
   isTest,
   isJest,
@@ -109,16 +108,13 @@ const environment = {
 
 // threading can cause memory issues with node-ts in development
 if (isDev() && module.exports.DISABLE_THREADING == null) {
-  environment._set("DISABLE_THREADING", "1")
+  module.exports._set("DISABLE_THREADING", "1")
 }
 
 // clean up any environment variable edge cases
 for (let [key, value] of Object.entries(module.exports)) {
   // handle the edge case of "0" to disable an environment variable
   if (value === "0") {
-    // @ts-ignore
-    environment[key] = 0
+    module.exports[key] = 0
   }
 }
-
-export = environment

package/src/events/{AutomationEmitter.ts → AutomationEmitter.js}

@@ -1,7 +1,6 @@
-import { rowEmission, tableEmission } from "./utils"
-import mainEmitter from "./index"
-import env from "../environment"
-import { Table, Row } from "@budibase/types"
+const { rowEmission, tableEmission } = require("./utils")
+const mainEmitter = require("./index")
+const env = require("../environment")
 
 // max number of automations that can chain on top of each other
 // TODO: in future make this configurable at the automation level
@@ -14,17 +13,14 @@ const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0
  * from getting stuck endlessly chaining.
  */
 class AutomationEmitter {
-  chainCount: number
-  metadata: { automationChainCount: number }
-
-  constructor(chainCount: number) {
+  constructor(chainCount) {
     this.chainCount = chainCount
     this.metadata = {
       automationChainCount: chainCount,
     }
   }
 
-  emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+  emitRow(eventName, appId, row, table = null) {
     // don't emit even if we've reached max automation chain
     if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
       return
@@ -39,12 +35,11 @@ class AutomationEmitter {
     })
   }
 
-  emitTable(eventName: string, appId: string, table?: Table) {
+  emitTable(eventName, appId, table = null) {
     // don't emit even if we've reached max automation chain
     if (this.chainCount > MAX_AUTOMATION_CHAIN) {
       return
     }
-
     tableEmission({
       emitter: mainEmitter,
       eventName,
@@ -55,4 +50,4 @@ class AutomationEmitter {
   }
 }
 
-export = AutomationEmitter
+module.exports = AutomationEmitter

package/src/events/{BudibaseEmitter.ts → index.js}

@@ -1,6 +1,5 @@
-import { EventEmitter } from "events"
-import { rowEmission, tableEmission } from "./utils"
-import { Table, Row } from "@budibase/types"
+const EventEmitter = require("events").EventEmitter
+const { rowEmission, tableEmission } = require("./utils")
 
 /**
  * keeping event emitter in one central location as it might be used for things other than
@@ -13,17 +12,19 @@ import { Table, Row } from "@budibase/types"
  * This is specifically quite important for template strings used in automations.
  */
 class BudibaseEmitter extends EventEmitter {
-  emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+  emitRow(eventName, appId, row, table = null) {
     rowEmission({ emitter: this, eventName, appId, row, table })
   }
 
-  emitTable(eventName: string, appId: string, table?: Table) {
+  emitTable(eventName, appId, table = null) {
     tableEmission({ emitter: this, eventName, appId, table })
   }
 
-  emitPort(portNumber?: number | string) {
+  emitPort(portNumber) {
     this.emit("internal:port", portNumber)
   }
 }
 
-export = BudibaseEmitter
+const emitter = new BudibaseEmitter()
+
+module.exports = emitter

package/src/events/utils.js

@@ -0,0 +1,38 @@
+exports.rowEmission = ({ emitter, eventName, appId, row, table, metadata }) => {
+  let event = {
+    row,
+    appId,
+    tableId: row.tableId,
+  }
+  if (table) {
+    event.table = table
+  }
+  event.id = row._id
+  if (row._rev) {
+    event.revision = row._rev
+  }
+  if (metadata) {
+    event.metadata = metadata
+  }
+  emitter.emit(eventName, event)
+}
+
+exports.tableEmission = ({ emitter, eventName, appId, table, metadata }) => {
+  const tableId = table._id
+  let event = {
+    table: {
+      ...table,
+      tableId: tableId,
+    },
+    appId,
+    tableId: tableId,
+  }
+  event.id = tableId
+  if (table._rev) {
+    event.revision = table._rev
+  }
+  if (metadata) {
+    event.metadata = metadata
+  }
+  emitter.emit(eventName, event)
+}

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) {
@@ -266,7 +269,6 @@ class GoogleSheetsIntegration implements DatasourcePlus {
         this.deleteTable(json?.table?.name),
     }
 
-    // @ts-ignore
     const internalQueryMethod = handlers[json.endpoint.operation]
 
     return await internalQueryMethod()

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.")
+  },
 }