@budibase/server 2.1.43-alpha.2 → 2.1.43

package/src/module.d.ts

@@ -0,0 +1,14 @@
+declare module "@budibase/backend-core/tenancy"
+declare module "@budibase/backend-core/db"
+declare module "@budibase/backend-core/context"
+declare module "@budibase/backend-core/cache"
+declare module "@budibase/backend-core/permissions"
+declare module "@budibase/backend-core/roles"
+declare module "@budibase/backend-core/constants"
+declare module "@budibase/backend-core/auth"
+declare module "@budibase/backend-core/sessions"
+declare module "@budibase/backend-core/encryption"
+declare module "@budibase/backend-core/utils"
+declare module "@budibase/backend-core/redis"
+declare module "@budibase/backend-core/objectStore"
+declare module "@budibase/backend-core/plugins"

package/src/sdk/app/backups/exports.ts

@@ -1,5 +1,6 @@
-import { db as dbCore, objectStore } from "@budibase/backend-core"
+import { db as dbCore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
+import { retrieveDirectory } from "../../../utilities/fileSystem/utilities"
 import { streamFile, createTempFolder } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
 import {
@@ -87,10 +88,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // export bucket contents
   let tmpPath
   if (!env.isTest()) {
-    tmpPath = await objectStore.retrieveDirectory(
-      ObjectStoreBuckets.APPS,
-      appPath
-    )
+    tmpPath = await retrieveDirectory(ObjectStoreBuckets.APPS, appPath)
   } else {
     tmpPath = createTempFolder(uuid())
   }

package/src/sdk/app/backups/imports.ts

@@ -1,8 +1,11 @@
-import { db as dbCore, objectStore } from "@budibase/backend-core"
-import { Database } from "@budibase/types"
+import { db as dbCore } from "@budibase/backend-core"
 import { getAutomationParams, TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
+import {
+  upload,
+  uploadDirectory,
+} from "../../../utilities/fileSystem/utilities"
 import { downloadTemplate } from "../../../utilities/fileSystem"
 import { FieldTypes, ObjectStoreBuckets } from "../../../constants"
 import { join } from "path"
@@ -14,6 +17,7 @@ import {
   CouchFindOptions,
   RowAttachment,
 } from "@budibase/types"
+import PouchDB from "pouchdb"
 const uuid = require("uuid/v4")
 const tar = require("tar")
 
@@ -25,7 +29,10 @@ type TemplateType = {
   key?: string
 }
 
-async function updateAttachmentColumns(prodAppId: string, db: Database) {
+async function updateAttachmentColumns(
+  prodAppId: string,
+  db: PouchDB.Database
+) {
   // iterate through attachment documents and update them
   const tables = await sdk.tables.getAllInternalTables(db)
   for (let table of tables) {
@@ -79,7 +86,7 @@ async function updateAttachmentColumns(prodAppId: string, db: Database) {
   }
 }
 
-async function updateAutomations(prodAppId: string, db: Database) {
+async function updateAutomations(prodAppId: string, db: PouchDB.Database) {
   const automations = (
     await db.allDocs(
       getAutomationParams(null, {
@@ -147,7 +154,7 @@ export function getListOfAppsInMulti(tmpPath: string) {
 
 export async function importApp(
   appId: string,
-  db: Database,
+  db: PouchDB.Database,
   template: TemplateType
 ) {
   let prodAppId = dbCore.getProdAppID(appId)
@@ -170,11 +177,11 @@ export async function importApp(
         filename = join(prodAppId, filename)
         if (fs.lstatSync(path).isDirectory()) {
           promises.push(
-            objectStore.uploadDirectory(ObjectStoreBuckets.APPS, path, filename)
+            uploadDirectory(ObjectStoreBuckets.APPS, path, filename)
           )
         } else {
           promises.push(
-            objectStore.upload({
+            upload({
               bucket: ObjectStoreBuckets.APPS,
               path,
               filename,

package/src/sdk/app/backups/statistics.ts

@@ -1,13 +1,13 @@
 import { context, db as dbCore } from "@budibase/backend-core"
-import { Database } from "@budibase/types"
 import {
   getDatasourceParams,
   getTableParams,
   getAutomationParams,
   getScreenParams,
 } from "../../../db/utils"
+import PouchDB from "pouchdb"
 
-async function runInContext(appId: string, cb: any, db?: Database) {
+async function runInContext(appId: string, cb: any, db?: PouchDB.Database) {
   if (db) {
     return cb(db)
   } else {
@@ -19,10 +19,13 @@ async function runInContext(appId: string, cb: any, db?: Database) {
   }
 }
 
-export async function calculateDatasourceCount(appId: string, db?: Database) {
+export async function calculateDatasourceCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
   return runInContext(
     appId,
-    async (db: Database) => {
+    async (db: PouchDB.Database) => {
       const datasourceList = await db.allDocs(getDatasourceParams())
       const tableList = await db.allDocs(getTableParams())
       return datasourceList.rows.length + tableList.rows.length
@@ -31,10 +34,13 @@ export async function calculateDatasourceCount(appId: string, db?: Database) {
   )
 }
 
-export async function calculateAutomationCount(appId: string, db?: Database) {
+export async function calculateAutomationCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
   return runInContext(
     appId,
-    async (db: Database) => {
+    async (db: PouchDB.Database) => {
       const automationList = await db.allDocs(getAutomationParams())
       return automationList.rows.length
     },
@@ -42,10 +48,13 @@ export async function calculateAutomationCount(appId: string, db?: Database) {
   )
 }
 
-export async function calculateScreenCount(appId: string, db?: Database) {
+export async function calculateScreenCount(
+  appId: string,
+  db?: PouchDB.Database
+) {
   return runInContext(
     appId,
-    async (db: Database) => {
+    async (db: PouchDB.Database) => {
       const screenList = await db.allDocs(getScreenParams())
       return screenList.rows.length
     },
@@ -54,7 +63,7 @@ export async function calculateScreenCount(appId: string, db?: Database) {
 }
 
 export async function calculateBackupStats(appId: string) {
-  return runInContext(appId, async (db: Database) => {
+  return runInContext(appId, async (db: PouchDB.Database) => {
     const promises = []
     promises.push(calculateDatasourceCount(appId, db))
     promises.push(calculateAutomationCount(appId, db))

package/src/sdk/app/tables/index.ts

@@ -1,15 +1,16 @@
-import { context } from "@budibase/backend-core"
+import { getAppDB } from "@budibase/backend-core/context"
 import { BudibaseInternalDB, getTableParams } from "../../../db/utils"
 import {
   breakExternalTableId,
   isExternalTable,
   isSQL,
 } from "../../../integrations/utils"
-import { Table, Database } from "@budibase/types"
+import { Table } from "@budibase/types"
+import PouchDB from "pouchdb"
 
-async function getAllInternalTables(db?: Database): Promise<Table[]> {
+async function getAllInternalTables(db?: PouchDB.Database): Promise<Table[]> {
   if (!db) {
-    db = context.getAppDB()
+    db = getAppDB() as PouchDB.Database
   }
   const internalTables = await db.allDocs(
     getTableParams(null, {
@@ -19,12 +20,12 @@ async function getAllInternalTables(db?: Database): Promise<Table[]> {
   return internalTables.rows.map((tableDoc: any) => ({
     ...tableDoc.doc,
     type: "internal",
-    sourceId: tableDoc.doc.sourceId || BudibaseInternalDB._id,
+    sourceId: BudibaseInternalDB._id,
   }))
 }
 
 async function getAllExternalTables(datasourceId: any): Promise<Table[]> {
-  const db = context.getAppDB()
+  const db = getAppDB()
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     throw "Datasource is not configured fully."
@@ -41,7 +42,7 @@ async function getExternalTable(
 }
 
 async function getTable(tableId: any): Promise<Table> {
-  const db = context.getAppDB()
+  const db = getAppDB()
   if (isExternalTable(tableId)) {
     let { datasourceId, tableName } = breakExternalTableId(tableId)
     const datasource = await db.get(datasourceId)

package/src/startup.ts

@@ -1,5 +1,5 @@
 import * as env from "./environment"
-import * as redis from "./utilities/redis"
+import redis from "./utilities/redis"
 import {
   createAdminUser,
   generateApiKey,
@@ -13,13 +13,13 @@ import {
 } from "@budibase/backend-core"
 import fs from "fs"
 import { watch } from "./watch"
-import * as automations from "./automations"
-import * as fileSystem from "./utilities/fileSystem"
+import automations from "./automations"
+import fileSystem from "./utilities/fileSystem"
 import eventEmitter from "./events"
 import * as migrations from "./migrations"
-import * as bullboard from "./automations/bullboard"
+import bullboard from "./automations/bullboard"
 import * as pro from "@budibase/pro"
-import * as api from "./api"
+import api from "./api"
 import sdk from "./sdk"
 const pino = require("koa-pino-logger")