From a461c25cefdb72959d4f35bc0d1cce755bbcd8dc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 22 Sep 2022 14:59:28 +0100
Subject: [PATCH] Some updates, typescripting some more APIs, as well as fixing
 a lot of Router creation which did not specify the 'new' operator.

---
 packages/bbui/README.md                       |  2 +-
 packages/bbui/rollup.config.js                |  2 +-
 packages/builder/cypress/plugins/index.js     |  2 +-
 packages/builder/cypress/support/index.js     |  2 +-
 packages/client/README.md                     |  2 +-
 packages/client/rollup.config.js              |  2 +-
 .../DevToolsComponentContextTab.svelte        |  2 +-
 .../DevToolsComponentSettingsTab.svelte       |  2 +-
 packages/server/pm2.config.js                 |  2 +-
 .../src/api/controllers/{auth.js => auth.ts}  | 21 ++++++-----
 packages/server/src/api/routes/analytics.js   |  2 +-
 packages/server/src/api/routes/apikeys.js     |  2 +-
 packages/server/src/api/routes/auth.js        |  8 -----
 packages/server/src/api/routes/auth.ts        |  8 +++++
 packages/server/src/api/routes/automation.js  |  2 +-
 packages/server/src/api/routes/backup.js      |  2 +-
 packages/server/src/api/routes/cloud.js       |  2 +-
 packages/server/src/api/routes/component.js   |  2 +-
 packages/server/src/api/routes/datasource.js  |  2 +-
 packages/server/src/api/routes/deploy.js      |  2 +-
 packages/server/src/api/routes/dev.js         |  2 +-
 packages/server/src/api/routes/integration.js |  2 +-
 packages/server/src/api/routes/layout.js      |  2 +-
 packages/server/src/api/routes/metadata.js    |  2 +-
 packages/server/src/api/routes/migrations.js  |  2 +-
 packages/server/src/api/routes/permission.js  |  2 +-
 packages/server/src/api/routes/query.js       |  2 +-
 packages/server/src/api/routes/role.js        |  2 +-
 packages/server/src/api/routes/routing.js     |  2 +-
 packages/server/src/api/routes/screen.js      |  2 +-
 packages/server/src/api/routes/script.js      |  2 +-
 packages/server/src/api/routes/table.js       |  2 +-
 packages/server/src/api/routes/templates.js   |  2 +-
 packages/server/src/api/routes/user.js        |  2 +-
 packages/server/src/api/routes/view.js        |  2 +-
 packages/server/src/api/routes/webhook.js     |  2 +-
 packages/worker/pm2.config.js                 |  2 +-
 .../worker/src/api/controllers/global/self.ts |  8 ++---
 .../global/{templates.js => templates.ts}     | 36 ++++++++++---------
 packages/worker/src/api/routes/global/auth.js |  2 +-
 .../worker/src/api/routes/global/configs.js   |  2 +-
 .../worker/src/api/routes/global/email.js     |  2 +-
 .../worker/src/api/routes/global/roles.js     |  2 +-
 packages/worker/src/api/routes/global/self.ts | 16 ++++-----
 .../global/{templates.js => templates.ts}     |  6 ++--
 .../worker/src/api/routes/global/users.js     |  2 +-
 .../src/api/routes/global/workspaces.js       |  2 +-
 packages/worker/src/api/routes/index.js       | 34 ------------------
 packages/worker/src/api/routes/index.ts       | 34 ++++++++++++++++++
 .../src/api/routes/system/environment.js      |  2 +-
 .../worker/src/api/routes/system/status.js    |  2 +-
 .../worker/src/api/routes/system/tenants.js   |  2 +-
 52 files changed, 129 insertions(+), 128 deletions(-)
 rename packages/server/src/api/controllers/{auth.js => auth.ts} (73%)
 delete mode 100644 packages/server/src/api/routes/auth.js
 create mode 100644 packages/server/src/api/routes/auth.ts
 rename packages/worker/src/api/controllers/global/{templates.js => templates.ts} (59%)
 rename packages/worker/src/api/routes/global/{templates.js => templates.ts} (91%)
 delete mode 100644 packages/worker/src/api/routes/index.js
 create mode 100644 packages/worker/src/api/routes/index.ts

diff --git a/packages/bbui/README.md b/packages/bbui/README.md
index 9b71a86cab..3920626d99 100644
--- a/packages/bbui/README.md
+++ b/packages/bbui/README.md
@@ -15,7 +15,7 @@ A package that handles all common components across the Budibase organisation. Y
 1. Create a file: `Headline.svelte`
 2. Create a Svench file: `Headline.svench`
 3. Build component and add variants to the Svench file.
-4. Once done, re-export the file in `src/index.js`.
+4. Once done, re-export the file in `src/index.ts`.
 5. Publish, update the package in the main project and profit. 
 
 ## Guidelines
diff --git a/packages/bbui/rollup.config.js b/packages/bbui/rollup.config.js
index e285d548d6..1645339014 100644
--- a/packages/bbui/rollup.config.js
+++ b/packages/bbui/rollup.config.js
@@ -6,7 +6,7 @@ import { terser } from "rollup-plugin-terser"
 import postcss from "rollup-plugin-postcss"
 
 export default {
-  input: "src/index.js",
+  input: "src/index.ts",
   output: {
     sourcemap: true,
     format: "esm",
diff --git a/packages/builder/cypress/plugins/index.js b/packages/builder/cypress/plugins/index.js
index 771ba886b5..0b38f6351a 100644
--- a/packages/builder/cypress/plugins/index.js
+++ b/packages/builder/cypress/plugins/index.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 // ***********************************************************
-// This example plugins/index.js can be used to load plugins
+// This example plugins/index.ts can be used to load plugins
 //
 // You can change the location of this file or turn off loading
 // the plugins file with the 'pluginsFile' configuration option.
diff --git a/packages/builder/cypress/support/index.js b/packages/builder/cypress/support/index.js
index acd53a1592..c916520a30 100644
--- a/packages/builder/cypress/support/index.js
+++ b/packages/builder/cypress/support/index.js
@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.js is processed and
+// This example support/index.ts is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
diff --git a/packages/client/README.md b/packages/client/README.md
index 335dcbd3e6..5c9ba977cd 100644
--- a/packages/client/README.md
+++ b/packages/client/README.md
@@ -8,7 +8,7 @@ their settings, and know how to correctly interact with them.
 
 ### Component Definitions
 
-The object key is the name of the component, as exported by `index.js`.
+The object key is the name of the component, as exported by `index.ts`.
 
 - **name** - the name displayed in the builder
 - **description** - not currently used
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
index 5206b63884..98bcfb77f0 100644
--- a/packages/client/rollup.config.js
+++ b/packages/client/rollup.config.js
@@ -19,7 +19,7 @@ const ignoredWarnings = [
 ]
 
 export default {
-  input: "src/index.js",
+  input: "src/index.ts",
   output: [
     {
       sourcemap: false,
diff --git a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
index 3b4c426851..6e020c06f4 100644
--- a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Layout, Select, Body } from "@budibase/bbui"
-  import { componentStore } from "stores/index.js"
+  import { componentStore } from "stores/index.ts"
   import DevToolsStat from "./DevToolsStat.svelte"
 
   const ReadableBindingMap = {
diff --git a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
index 63cecab7ef..9f8c0b9761 100644
--- a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Layout, Toggle } from "@budibase/bbui"
   import DevToolsStat from "./DevToolsStat.svelte"
-  import { componentStore } from "stores/index.js"
+  import { componentStore } from "stores/index.ts"
   import { getSettingsDefinition } from "utils/componentProps.js"
 
   let showEnrichedSettings = true
diff --git a/packages/server/pm2.config.js b/packages/server/pm2.config.js
index 33829f327c..8645b86b88 100644
--- a/packages/server/pm2.config.js
+++ b/packages/server/pm2.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      script: "dist/index.js",
+      script: "dist/index.ts",
       instances: "max",
       exec_mode: "cluster",
     },
diff --git a/packages/server/src/api/controllers/auth.js b/packages/server/src/api/controllers/auth.ts
similarity index 73%
rename from packages/server/src/api/controllers/auth.js
rename to packages/server/src/api/controllers/auth.ts
index 51ce737c41..4512d228b9 100644
--- a/packages/server/src/api/controllers/auth.js
+++ b/packages/server/src/api/controllers/auth.ts
@@ -1,19 +1,18 @@
-const { outputProcessing } = require("../../utilities/rowProcessor")
-const { InternalTables } = require("../../db/utils")
-const { getFullUser } = require("../../utilities/users")
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { getAppDB, getAppId } = require("@budibase/backend-core/context")
+import { outputProcessing } from "../../utilities/rowProcessor"
+import { InternalTables } from "../../db/utils"
+import { getFullUser } from "../../utilities/users"
+import { roles, context } from "@budibase/backend-core"
 
 /**
  * Add the attributes that are session based to the current user.
  */
-const addSessionAttributesToUser = ctx => {
+const addSessionAttributesToUser = (ctx: any) => {
   if (ctx.user) {
     ctx.body.license = ctx.user.license
   }
 }
 
-exports.fetchSelf = async ctx => {
+export async function fetchSelf(ctx: any) {
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
   if (!userId || !ctx.isAuthenticated) {
@@ -27,8 +26,8 @@ exports.fetchSelf = async ctx => {
   // forward the csrf token from the session
   user.csrfToken = ctx.user.csrfToken
 
-  if (getAppId()) {
-    const db = getAppDB()
+  if (context.getAppId()) {
+    const db = context.getAppDB()
     // remove the full roles structure
     delete user.roles
     try {
@@ -41,10 +40,10 @@ exports.fetchSelf = async ctx => {
         ...user,
         ...metadata,
       })
-    } catch (err) {
+    } catch (err: any) {
       let response
       // user didn't exist in app, don't pretend they do
-      if (user.roleId === BUILTIN_ROLE_IDS.PUBLIC) {
+      if (user.roleId === roles.BUILTIN_ROLE_IDS.PUBLIC) {
         response = {}
       }
       // user has a role of some sort, return them
diff --git a/packages/server/src/api/routes/analytics.js b/packages/server/src/api/routes/analytics.js
index d13ace12d1..610d6d0c7f 100644
--- a/packages/server/src/api/routes/analytics.js
+++ b/packages/server/src/api/routes/analytics.js
@@ -1,7 +1,7 @@
 const Router = require("@koa/router")
 const controller = require("../controllers/analytics")
 
-const router = Router()
+const router = new Router()
 
 router.get("/api/bbtel", controller.isEnabled)
 router.post("/api/bbtel/ping", controller.ping)
diff --git a/packages/server/src/api/routes/apikeys.js b/packages/server/src/api/routes/apikeys.js
index 315cffb41a..ddbd35c23c 100644
--- a/packages/server/src/api/routes/apikeys.js
+++ b/packages/server/src/api/routes/apikeys.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/apikeys")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/keys", authorized(BUILDER), controller.fetch)
diff --git a/packages/server/src/api/routes/auth.js b/packages/server/src/api/routes/auth.js
deleted file mode 100644
index 153c86a62d..0000000000
--- a/packages/server/src/api/routes/auth.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const Router = require("@koa/router")
-const controller = require("../controllers/auth")
-
-const router = Router()
-
-router.get("/api/self", controller.fetchSelf)
-
-module.exports = router
diff --git a/packages/server/src/api/routes/auth.ts b/packages/server/src/api/routes/auth.ts
new file mode 100644
index 0000000000..8a9d11fb27
--- /dev/null
+++ b/packages/server/src/api/routes/auth.ts
@@ -0,0 +1,8 @@
+import Router from "@koa/router"
+import * as controller from "../controllers/auth"
+
+const router = new Router()
+
+router.get("/api/self", controller.fetchSelf)
+
+export default router
diff --git a/packages/server/src/api/routes/automation.js b/packages/server/src/api/routes/automation.js
index e0f4744e1e..e30a0c1113 100644
--- a/packages/server/src/api/routes/automation.js
+++ b/packages/server/src/api/routes/automation.js
@@ -13,7 +13,7 @@ const {
 } = require("../../middleware/appInfo")
 const { automationValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .get(
diff --git a/packages/server/src/api/routes/backup.js b/packages/server/src/api/routes/backup.js
index 83387ea75a..9f3b27e95a 100644
--- a/packages/server/src/api/routes/backup.js
+++ b/packages/server/src/api/routes/backup.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/backup")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump)
 
diff --git a/packages/server/src/api/routes/cloud.js b/packages/server/src/api/routes/cloud.js
index 3cee889abf..c183ffb5ba 100644
--- a/packages/server/src/api/routes/cloud.js
+++ b/packages/server/src/api/routes/cloud.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/cloud")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/cloud/export", authorized(BUILDER), controller.exportApps)
diff --git a/packages/server/src/api/routes/component.js b/packages/server/src/api/routes/component.js
index 0f122169aa..275f58bd6c 100644
--- a/packages/server/src/api/routes/component.js
+++ b/packages/server/src/api/routes/component.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/component")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router.get(
   "/api/:appId/components/definitions",
diff --git a/packages/server/src/api/routes/datasource.js b/packages/server/src/api/routes/datasource.js
index 21df11b55c..23a3ea9fb0 100644
--- a/packages/server/src/api/routes/datasource.js
+++ b/packages/server/src/api/routes/datasource.js
@@ -11,7 +11,7 @@ const {
   datasourceQueryValidator,
 } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/datasources", authorized(BUILDER), datasourceController.fetch)
diff --git a/packages/server/src/api/routes/deploy.js b/packages/server/src/api/routes/deploy.js
index 762646435a..1f6b07c6f3 100644
--- a/packages/server/src/api/routes/deploy.js
+++ b/packages/server/src/api/routes/deploy.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/deploy")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/deployments", authorized(BUILDER), controller.fetchDeployments)
diff --git a/packages/server/src/api/routes/dev.js b/packages/server/src/api/routes/dev.js
index 165149ca8b..0103219246 100644
--- a/packages/server/src/api/routes/dev.js
+++ b/packages/server/src/api/routes/dev.js
@@ -4,7 +4,7 @@ const env = require("../../environment")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 function redirectPath(path) {
   router
diff --git a/packages/server/src/api/routes/integration.js b/packages/server/src/api/routes/integration.js
index ebe79d978e..5469aaa27d 100644
--- a/packages/server/src/api/routes/integration.js
+++ b/packages/server/src/api/routes/integration.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/integration")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/integrations", authorized(BUILDER), controller.fetch)
diff --git a/packages/server/src/api/routes/layout.js b/packages/server/src/api/routes/layout.js
index fa04b63402..76103f9cfc 100644
--- a/packages/server/src/api/routes/layout.js
+++ b/packages/server/src/api/routes/layout.js
@@ -3,7 +3,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const controller = require("../controllers/layout")
 
-const router = Router()
+const router = new Router()
 
 router
   .post("/api/layouts", authorized(BUILDER), controller.save)
diff --git a/packages/server/src/api/routes/metadata.js b/packages/server/src/api/routes/metadata.js
index 129e72b5e7..0c2867c45a 100644
--- a/packages/server/src/api/routes/metadata.js
+++ b/packages/server/src/api/routes/metadata.js
@@ -7,7 +7,7 @@ const {
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .post(
diff --git a/packages/server/src/api/routes/migrations.js b/packages/server/src/api/routes/migrations.js
index 01e573edb3..a40111cf25 100644
--- a/packages/server/src/api/routes/migrations.js
+++ b/packages/server/src/api/routes/migrations.js
@@ -1,6 +1,6 @@
 const Router = require("@koa/router")
 const migrationsController = require("../controllers/migrations")
-const router = Router()
+const router = new Router()
 const { internalApi } = require("@budibase/backend-core/auth")
 
 router
diff --git a/packages/server/src/api/routes/permission.js b/packages/server/src/api/routes/permission.js
index 831b6dd004..4736769f61 100644
--- a/packages/server/src/api/routes/permission.js
+++ b/packages/server/src/api/routes/permission.js
@@ -4,7 +4,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const { permissionValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/permission/builtin", authorized(BUILDER), controller.fetchBuiltin)
diff --git a/packages/server/src/api/routes/query.js b/packages/server/src/api/routes/query.js
index 37a26f6808..14434a45c7 100644
--- a/packages/server/src/api/routes/query.js
+++ b/packages/server/src/api/routes/query.js
@@ -16,7 +16,7 @@ const {
   generateQueryValidation,
 } = require("../controllers/query/validation")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/queries", authorized(BUILDER), queryController.fetch)
diff --git a/packages/server/src/api/routes/role.js b/packages/server/src/api/routes/role.js
index 107d9ec583..a6e04e81fa 100644
--- a/packages/server/src/api/routes/role.js
+++ b/packages/server/src/api/routes/role.js
@@ -4,7 +4,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const { roleValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .post("/api/roles", authorized(BUILDER), roleValidator(), controller.save)
diff --git a/packages/server/src/api/routes/routing.js b/packages/server/src/api/routes/routing.js
index 45ccb7bb64..d7e971d507 100644
--- a/packages/server/src/api/routes/routing.js
+++ b/packages/server/src/api/routes/routing.js
@@ -3,7 +3,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const controller = require("../controllers/routing")
 
-const router = Router()
+const router = new Router()
 
 router
   // gets correct structure for user role
diff --git a/packages/server/src/api/routes/screen.js b/packages/server/src/api/routes/screen.js
index e33a026126..426b89fd0f 100644
--- a/packages/server/src/api/routes/screen.js
+++ b/packages/server/src/api/routes/screen.js
@@ -4,7 +4,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const { screenValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/screens", authorized(BUILDER), controller.fetch)
diff --git a/packages/server/src/api/routes/script.js b/packages/server/src/api/routes/script.js
index d0d3214db3..a4b4e4a7f5 100644
--- a/packages/server/src/api/routes/script.js
+++ b/packages/server/src/api/routes/script.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/script")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router.post("/api/script", authorized(BUILDER), controller.save)
 
diff --git a/packages/server/src/api/routes/table.js b/packages/server/src/api/routes/table.js
index 9de36cac72..711312149a 100644
--- a/packages/server/src/api/routes/table.js
+++ b/packages/server/src/api/routes/table.js
@@ -9,7 +9,7 @@ const {
 } = require("@budibase/backend-core/permissions")
 const { tableValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   /**
diff --git a/packages/server/src/api/routes/templates.js b/packages/server/src/api/routes/templates.js
index 710475db84..61a185b5c8 100644
--- a/packages/server/src/api/routes/templates.js
+++ b/packages/server/src/api/routes/templates.js
@@ -3,7 +3,7 @@ const controller = require("../controllers/templates")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/templates", authorized(BUILDER), controller.fetch)
diff --git a/packages/server/src/api/routes/user.js b/packages/server/src/api/routes/user.js
index 5ac446d54e..a0eaf26ec6 100644
--- a/packages/server/src/api/routes/user.js
+++ b/packages/server/src/api/routes/user.js
@@ -6,7 +6,7 @@ const {
   PermissionTypes,
 } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get(
diff --git a/packages/server/src/api/routes/view.js b/packages/server/src/api/routes/view.js
index 9d57d722e1..a7045f0814 100644
--- a/packages/server/src/api/routes/view.js
+++ b/packages/server/src/api/routes/view.js
@@ -9,7 +9,7 @@ const {
   PermissionLevels,
 } = require("@budibase/backend-core/permissions")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/views/export", authorized(BUILDER), viewController.exportView)
diff --git a/packages/server/src/api/routes/webhook.js b/packages/server/src/api/routes/webhook.js
index 9635638700..9d60438a63 100644
--- a/packages/server/src/api/routes/webhook.js
+++ b/packages/server/src/api/routes/webhook.js
@@ -4,7 +4,7 @@ const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("@budibase/backend-core/permissions")
 const { webhookValidator } = require("./utils/validators")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/webhooks", authorized(BUILDER), controller.fetch)
diff --git a/packages/worker/pm2.config.js b/packages/worker/pm2.config.js
index b5fb1880ef..93976c082b 100644
--- a/packages/worker/pm2.config.js
+++ b/packages/worker/pm2.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      script: "./dist/index.js",
+      script: "./dist/index.ts",
       instances: "max",
       exec_mode: "cluster",
     },
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 8b7930a35d..6376e0e395 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -30,7 +30,7 @@ function cleanupDevInfo(info: any) {
   return info
 }
 
-exports.generateAPIKey = async (ctx: any) => {
+export async function generateAPIKey(ctx: any) {
   let userId
   let apiKey
   if (env.isTest() && ctx.request.body.userId) {
@@ -54,7 +54,7 @@ exports.generateAPIKey = async (ctx: any) => {
   ctx.body = cleanupDevInfo(devInfo)
 }
 
-exports.fetchAPIKey = async (ctx: any) => {
+export async function fetchAPIKey(ctx: any) {
   const db = tenancy.getGlobalDB()
   const id = dbCore.generateDevInfoID(ctx.user._id)
   let devInfo
@@ -103,7 +103,7 @@ const sanitiseUserUpdate = (ctx: any) => {
   return resp
 }
 
-exports.getSelf = async (ctx: any) => {
+export async function getSelf(ctx: any) {
   if (!ctx.user) {
     ctx.throw(403, "User not logged in")
   }
@@ -124,7 +124,7 @@ exports.getSelf = async (ctx: any) => {
   addSessionAttributesToUser(ctx)
 }
 
-exports.updateSelf = async (ctx: any) => {
+export async function updateSelf(ctx: any) {
   const db = tenancy.getGlobalDB()
   const user = await db.get(ctx.user._id)
   let passwordChange = false
diff --git a/packages/worker/src/api/controllers/global/templates.js b/packages/worker/src/api/controllers/global/templates.ts
similarity index 59%
rename from packages/worker/src/api/controllers/global/templates.js
rename to packages/worker/src/api/controllers/global/templates.ts
index b16e9423ec..0abce704c7 100644
--- a/packages/worker/src/api/controllers/global/templates.js
+++ b/packages/worker/src/api/controllers/global/templates.ts
@@ -1,20 +1,19 @@
-const { generateTemplateID } = require("@budibase/backend-core/db")
-const {
+import {
   TemplateMetadata,
   TemplateBindings,
   GLOBAL_OWNER,
-} = require("../../../constants")
-const { getTemplates } = require("../../../constants/templates")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
+} from "../../../constants"
+import { getTemplates } from "../../../constants/templates"
+import { tenancy, db as dbCore } from "@budibase/backend-core"
 
-exports.save = async ctx => {
-  const db = getGlobalDB()
+export async function save(ctx: any) {
+  const db = tenancy.getGlobalDB()
   let template = ctx.request.body
   if (!template.ownerId) {
     template.ownerId = GLOBAL_OWNER
   }
   if (!template._id) {
-    template._id = generateTemplateID(template.ownerId)
+    template._id = dbCore.generateTemplateID(template.ownerId)
   }
 
   const response = await db.put(template)
@@ -24,9 +23,9 @@ exports.save = async ctx => {
   }
 }
 
-exports.definitions = async ctx => {
-  const bindings = {}
-  const info = {}
+export async function definitions(ctx: any) {
+  const bindings: any = {}
+  const info: any = {}
   for (let template of TemplateMetadata.email) {
     bindings[template.purpose] = template.bindings
     info[template.purpose] = {
@@ -45,30 +44,33 @@ exports.definitions = async ctx => {
   }
 }
 
-exports.fetch = async ctx => {
+export async function fetch(ctx: any) {
   ctx.body = await getTemplates()
 }
 
-exports.fetchByType = async ctx => {
+export async function fetchByType(ctx: any) {
+  // @ts-ignore
   ctx.body = await getTemplates({
     type: ctx.params.type,
   })
 }
 
-exports.fetchByOwner = async ctx => {
+export async function fetchByOwner(ctx: any) {
+  // @ts-ignore
   ctx.body = await getTemplates({
     ownerId: ctx.params.ownerId,
   })
 }
 
-exports.find = async ctx => {
+export async function find(ctx: any) {
+  // @ts-ignore
   ctx.body = await getTemplates({
     id: ctx.params.id,
   })
 }
 
-exports.destroy = async ctx => {
-  const db = getGlobalDB()
+export async function destroy(ctx: any) {
+  const db = tenancy.getGlobalDB()
   await db.remove(ctx.params.id, ctx.params.rev)
   ctx.message = `Template ${ctx.params.id} deleted.`
   ctx.status = 200
diff --git a/packages/worker/src/api/routes/global/auth.js b/packages/worker/src/api/routes/global/auth.js
index 07d95f808d..1c292cdc7f 100644
--- a/packages/worker/src/api/routes/global/auth.js
+++ b/packages/worker/src/api/routes/global/auth.js
@@ -4,7 +4,7 @@ const { joiValidator } = require("@budibase/backend-core/auth")
 const Joi = require("joi")
 const { updateTenantId } = require("@budibase/backend-core/tenancy")
 
-const router = Router()
+const router = new Router()
 
 function buildAuthValidation() {
   // prettier-ignore
diff --git a/packages/worker/src/api/routes/global/configs.js b/packages/worker/src/api/routes/global/configs.js
index e08611b73a..a7cd1a38e8 100644
--- a/packages/worker/src/api/routes/global/configs.js
+++ b/packages/worker/src/api/routes/global/configs.js
@@ -5,7 +5,7 @@ const { adminOnly } = require("@budibase/backend-core/auth")
 const Joi = require("joi")
 const { Configs } = require("../../../constants")
 
-const router = Router()
+const router = new Router()
 
 function smtpValidation() {
   // prettier-ignore
diff --git a/packages/worker/src/api/routes/global/email.js b/packages/worker/src/api/routes/global/email.js
index b771728a0f..af09f978cf 100644
--- a/packages/worker/src/api/routes/global/email.js
+++ b/packages/worker/src/api/routes/global/email.js
@@ -5,7 +5,7 @@ const { joiValidator } = require("@budibase/backend-core/auth")
 const { adminOnly } = require("@budibase/backend-core/auth")
 const Joi = require("joi")
 
-const router = Router()
+const router = new Router()
 
 function buildEmailSendValidation() {
   // prettier-ignore
diff --git a/packages/worker/src/api/routes/global/roles.js b/packages/worker/src/api/routes/global/roles.js
index d99e0e5b56..da7d5405ad 100644
--- a/packages/worker/src/api/routes/global/roles.js
+++ b/packages/worker/src/api/routes/global/roles.js
@@ -2,7 +2,7 @@ const Router = require("@koa/router")
 const controller = require("../../controllers/global/roles")
 const { builderOrAdmin } = require("@budibase/backend-core/auth")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/global/roles", builderOrAdmin, controller.fetch)
diff --git a/packages/worker/src/api/routes/global/self.ts b/packages/worker/src/api/routes/global/self.ts
index 1683a94f37..4b52225783 100644
--- a/packages/worker/src/api/routes/global/self.ts
+++ b/packages/worker/src/api/routes/global/self.ts
@@ -1,13 +1,13 @@
-const Router = require("@koa/router")
-const controller = require("../../controllers/global/self")
-const { builderOnly } = require("@budibase/backend-core/auth")
-const { users } = require("../validation")
+import Router from "@koa/router"
+import * as controller from "../../controllers/global/self"
+import { auth } from "@budibase/backend-core"
+import { users } from "../validation"
 
-const router = Router()
+const router = new Router()
 
 router
-  .post("/api/global/self/api_key", builderOnly, controller.generateAPIKey)
-  .get("/api/global/self/api_key", builderOnly, controller.fetchAPIKey)
+  .post("/api/global/self/api_key", auth.builderOnly, controller.generateAPIKey)
+  .get("/api/global/self/api_key", auth.builderOnly, controller.fetchAPIKey)
   .get("/api/global/self", controller.getSelf)
   .post(
     "/api/global/self",
@@ -15,4 +15,4 @@ router
     controller.updateSelf
   )
 
-module.exports = router
+export default router as any
diff --git a/packages/worker/src/api/routes/global/templates.js b/packages/worker/src/api/routes/global/templates.ts
similarity index 91%
rename from packages/worker/src/api/routes/global/templates.js
rename to packages/worker/src/api/routes/global/templates.ts
index b8cb636d39..2db9b5009e 100644
--- a/packages/worker/src/api/routes/global/templates.js
+++ b/packages/worker/src/api/routes/global/templates.ts
@@ -1,11 +1,11 @@
 import Router from "@koa/router"
-import controller from "../../controllers/global/templates"
+import * as controller from "../../controllers/global/templates"
 import { TemplatePurpose, TemplateTypes } from "../../../constants"
 import { auth as authCore } from "@budibase/backend-core"
 import Joi from "joi"
 const { adminOnly, joiValidator } = authCore
 
-const router = Router()
+const router = new Router()
 
 function buildTemplateSaveValidation() {
   // prettier-ignore
@@ -34,4 +34,4 @@ router
   .get("/api/global/template/:id", controller.find)
   .delete("/api/global/template/:id/:rev", adminOnly, controller.destroy)
 
-module.exports = router
+export default router
diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js
index 3047b4096c..2d9b1d9ac9 100644
--- a/packages/worker/src/api/routes/global/users.js
+++ b/packages/worker/src/api/routes/global/users.js
@@ -8,7 +8,7 @@ const { users } = require("../validation")
 const selfController = require("../../controllers/global/self")
 const { builderOrAdmin } = require("@budibase/backend-core/auth")
 
-const router = Router()
+const router = new Router()
 
 function buildAdminInitValidation() {
   return joiValidator.body(
diff --git a/packages/worker/src/api/routes/global/workspaces.js b/packages/worker/src/api/routes/global/workspaces.js
index 0198991bfa..c0e172cd8d 100644
--- a/packages/worker/src/api/routes/global/workspaces.js
+++ b/packages/worker/src/api/routes/global/workspaces.js
@@ -4,7 +4,7 @@ const { joiValidator } = require("@budibase/backend-core/auth")
 const { adminOnly } = require("@budibase/backend-core/auth")
 const Joi = require("joi")
 
-const router = Router()
+const router = new Router()
 
 function buildWorkspaceSaveValidation() {
   // prettier-ignore
diff --git a/packages/worker/src/api/routes/index.js b/packages/worker/src/api/routes/index.js
deleted file mode 100644
index 7f5c783caa..0000000000
--- a/packages/worker/src/api/routes/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const { api } = require("@budibase/pro")
-const userRoutes = require("./global/users")
-const configRoutes = require("./global/configs")
-const workspaceRoutes = require("./global/workspaces")
-const templateRoutes = require("./global/templates")
-const emailRoutes = require("./global/email")
-const authRoutes = require("./global/auth")
-const roleRoutes = require("./global/roles")
-const environmentRoutes = require("./system/environment")
-const tenantsRoutes = require("./system/tenants")
-const statusRoutes = require("./system/status")
-const selfRoutes = require("./global/self")
-const licenseRoutes = require("./global/license")
-const migrationRoutes = require("./system/migrations")
-const accountRoutes = require("./system/accounts")
-
-let userGroupRoutes = api.groups
-exports.routes = [
-  configRoutes,
-  userRoutes,
-  workspaceRoutes,
-  authRoutes,
-  templateRoutes,
-  tenantsRoutes,
-  emailRoutes,
-  roleRoutes,
-  environmentRoutes,
-  statusRoutes,
-  selfRoutes,
-  licenseRoutes,
-  userGroupRoutes,
-  migrationRoutes,
-  accountRoutes,
-]
diff --git a/packages/worker/src/api/routes/index.ts b/packages/worker/src/api/routes/index.ts
new file mode 100644
index 0000000000..67edf5d51b
--- /dev/null
+++ b/packages/worker/src/api/routes/index.ts
@@ -0,0 +1,34 @@
+import { api } from "@budibase/pro"
+import userRoutes from "./global/users"
+import configRoutes from "./global/configs"
+import workspaceRoutes from "./global/workspaces"
+import templateRoutes from "./global/templates"
+import emailRoutes from "./global/email"
+import authRoutes from "./global/auth"
+import roleRoutes from "./global/roles"
+import environmentRoutes from "./system/environment"
+import tenantsRoutes from "./system/tenants"
+import statusRoutes from "./system/status"
+import selfRoutes from "./global/self"
+import licenseRoutes from "./global/license"
+import migrationRoutes from "./system/migrations"
+import accountRoutes from "./system/accounts"
+
+let userGroupRoutes = api.groups
+export const routes = [
+  configRoutes,
+  userRoutes,
+  workspaceRoutes,
+  authRoutes,
+  templateRoutes,
+  tenantsRoutes,
+  emailRoutes,
+  roleRoutes,
+  environmentRoutes,
+  statusRoutes,
+  selfRoutes,
+  licenseRoutes,
+  userGroupRoutes,
+  migrationRoutes,
+  accountRoutes,
+]
diff --git a/packages/worker/src/api/routes/system/environment.js b/packages/worker/src/api/routes/system/environment.js
index 9b1b85638f..3d34046317 100644
--- a/packages/worker/src/api/routes/system/environment.js
+++ b/packages/worker/src/api/routes/system/environment.js
@@ -1,7 +1,7 @@
 const Router = require("@koa/router")
 const controller = require("../../controllers/system/environment")
 
-const router = Router()
+const router = new Router()
 
 router.get("/api/system/environment", controller.fetch)
 
diff --git a/packages/worker/src/api/routes/system/status.js b/packages/worker/src/api/routes/system/status.js
index a39801375b..17d2f8a5a6 100644
--- a/packages/worker/src/api/routes/system/status.js
+++ b/packages/worker/src/api/routes/system/status.js
@@ -1,7 +1,7 @@
 const Router = require("@koa/router")
 const controller = require("../../controllers/system/status")
 
-const router = Router()
+const router = new Router()
 
 router.get("/api/system/status", controller.fetch)
 
diff --git a/packages/worker/src/api/routes/system/tenants.js b/packages/worker/src/api/routes/system/tenants.js
index 451f09f773..6247e76058 100644
--- a/packages/worker/src/api/routes/system/tenants.js
+++ b/packages/worker/src/api/routes/system/tenants.js
@@ -2,7 +2,7 @@ const Router = require("@koa/router")
 const controller = require("../../controllers/system/tenants")
 const { adminOnly } = require("@budibase/backend-core/auth")
 
-const router = Router()
+const router = new Router()
 
 router
   .get("/api/system/tenants/:tenantId/exists", controller.exists)